An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
Merge remote-tracking branch 'origin/next' into fix/url-validator-underscore-hostnames
Andras Bacsaib50839d4515b
diff --cc app/Support/ValidationPatterns.phpindex bdb8654b91,f88f78c34a..af75098b5c--- a/app/Support/ValidationPatterns.php+++ b/app/Support/ValidationPatterns.php@@@ -486,6 -517,156 +517,156 @@@ class ValidationPatternreturn ['nullable', 'string', 'max:'.$maxLength, 'regex:'.self::SHELL_SAFE_COMMAND_PATTERN];}+ /**+ * Get validation rules for comma-separated application URL fields.+ */+ public static function applicationDomainRules(int $maxLength = 2048): array+ {+ return [+ 'nullable',+ 'string',+ 'max:'.$maxLength,+ function (string $attribute, mixed $value, \Closure $fail): void {+ foreach (self::validateApplicationDomains($value) as $error) {+ $fail($error);+ }+ },+ ];+ }++ /**+ * Validate a comma-separated list of application URLs.+ *+ * @return array<int, string>+ */+ public static function validateApplicationDomains(mixed $value): array+ {+ if (blank($value)) {+ return [];+ }++ if (! is_string($value)) {+ return ['The domains field must be a string.'];+ }++ $errors = [];+ foreach (self::applicationDomainList($value) as $url) {+ if (preg_match(self::APPLICATION_DOMAIN_FORBIDDEN_PATTERN, $url) === 1) {+ $errors[] = "Invalid URL: {$url}";++ continue;+ }+- if (! filter_var($url, FILTER_VALIDATE_URL)) {++ if (! isValidDomainUrl($url)) {+ $errors[] = "Invalid URL: {$url}";++ continue;+ }++ $scheme = parse_url($url, PHP_URL_SCHEME) ?? '';+ if (! in_array(strtolower($scheme), ['http', 'https'], true)) {+ $errors[] = "Invalid URL scheme: {$scheme} for URL: {$url}. Only http and https are supported.";++ continue;+ }++ if (blank(parse_url($url, PHP_URL_HOST))) {+ $errors[] = "Invalid URL: {$url}";+ }+ }++ return $errors;+ }++ /**+ * Normalize a comma-separated application URL list for storage.+ */+ public static function normalizeApplicationDomains(?string $value): ?string+ {+ $urls = self::applicationDomainList($value);++ if ($urls === []) {+ return null;+ }++ return collect($urls)+ ->map(fn (string $url) => self::normalizeApplicationDomainUrl($url))+ ->implode(',');+ }++ /**+ * Normalize URL components that are case-insensitive while preserving+ * case-sensitive path, query, and fragment components.+ */+ private static function normalizeApplicationDomainUrl(string $url): string+ {+ $components = parse_url($url);++ if ($components === false) {+ return $url;+ }++ $normalized = '';++ if (isset($components['scheme'])) {+ $normalized .= strtolower($components['scheme']).'://';+ }++ if (isset($components['user'])) {+ $normalized .= $components['user'];++ if (isset($components['pass'])) {+ $normalized .= ':'.$components['pass'];+ }++ $normalized .= '@';+ }++ if (isset($components['host'])) {+ $normalized .= strtolower($components['host']);+ }++ if (isset($components['port'])) {+ $normalized .= ':'.$components['port'];+ }++ if (isset($components['path'])) {+ $normalized .= $components['path'];+ }++ if (array_key_exists('query', $components)) {+ $normalized .= '?'.$components['query'];+ }++ if (array_key_exists('fragment', $components)) {+ $normalized .= '#'.$components['fragment'];+ }++ return $normalized;+ }++ /**+ * Split a comma-separated application URL list into trimmed URL strings.+ *+ * @return array<int, string>+ */+ public static function applicationDomainList(?string $value): array+ {+ if (blank($value)) {+ return [];+ }++ return str($value)+ ->replaceStart(',', '')+ ->replaceEnd(',', '')+ ->trim()+ ->explode(',')+ ->map(fn (string $url) => trim($url))+ ->filter(fn (string $url) => filled($url))+ ->values()+ ->all();+ }+/*** Get validation rules for Docker volume name fields*/diff --cc openapi.jsonindex ca445ade00,816cdb5354..cdb7e736e0--- a/openapi.json+++ b/openapi.json@@@ -2553,6 -2553,6 +2553,10 @@@"is_preserve_repository_enabled": {"type": "boolean","description": "Preserve git repository during application update. If false, the existing repository will be removed and replaced with the new one. If true, the existing repository will be kept and the new one will be ignored. Default is false."++ },++ "include_source_commit_in_build": {++ "type": "boolean",++ "description": "Include source commit information in the build. Default is false."}},"type": "object"diff --cc openapi.yamlindex 6182cacd37,dacacece15..f2775c8d72--- a/openapi.yaml+++ b/openapi.yaml@@@ -1663,6 -1663,6 +1663,9 @@@ pathsis_preserve_repository_enabled:type: booleandescription: 'Preserve git repository during application update. If false, the existing repository will be removed and replaced with the new one. If true, the existing repository will be kept and the new one will be ignored. Default is false.'++ include_source_commit_in_build:++ type: boolean++ description: 'Include source commit information in the build. Default is false.'type: objectresponses:'200':diff --cc templates/service-templates-latest.jsonindex 6dbb4d311c,0a2dfda9d7..8d1a3369bc--- a/templates/service-templates-latest.json+++ b/templates/service-templates-latest.json@@@ -2346,6 -2346,24 +2346,24 @@@"template_last_updated_at": "2025-12-15T17:56:33+01:00","port": "8080"},+ "inngest": {+ "documentation": "https://www.inngest.com/docs/self-hosting?utm_source=coolify.io",+ "slogan": "Durable workflow engine for background jobs, queues and scheduled tasks.",+ "compose": "c2VydmljZXM6CiAgaW5uZ2VzdDoKICAgIGltYWdlOiAnaW5uZ2VzdC9pbm5nZXN0OnYxLjI3LjAnCiAgICBjb21tYW5kOiAnaW5uZ2VzdCBzdGFydCAtLWhvc3QgMC4wLjAuMCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0lOTkdFU1RfODI4OAogICAgICAtICdJTk5HRVNUX0VWRU5UX0tFWT0ke1NFUlZJQ0VfSEVYXzMyX0VWRU5US0VZfScKICAgICAgLSAnSU5OR0VTVF9TSUdOSU5HX0tFWT0ke1NFUlZJQ0VfSEVYXzMyX1NJR05JTkdLRVl9JwogICAgICAtICdJTk5HRVNUX1BPU1RHUkVTX1VSST1wb3N0Z3JlczovL2lubmdlc3Q6JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfUBwb3N0Z3Jlczo1NDMyL2lubmdlc3QnCiAgICAgIC0gJ0lOTkdFU1RfUkVESVNfVVJJPXJlZGlzOi8vcmVkaXM6NjM3OScKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gaW5uZ2VzdAogICAgICAgIC0gYWxwaGEKICAgICAgICAtIGRvY3RvcgogICAgICAgIC0gaGVhbHRoY2hlY2sKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDQwcwogICAgcmVzdGFydDogdW5sZXNzLXN0b3BwZWQKICBwb3N0Z3JlczoKICAgIGltYWdlOiAncG9zdGdyZXM6MTcnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19EQj1pbm5nZXN0CiAgICAgIC0gUE9TVEdSRVNfVVNFUj1pbm5nZXN0CiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlcy1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSBpbm5nZXN0IC1kIGlubmdlc3QnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1CiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogIHJlZGlzOgogICAgaW1hZ2U6ICdyZWRpczo3LWFscGluZScKICAgIGNvbW1hbmQ6ICdyZWRpcy1zZXJ2ZXIgLS1hcHBlbmRvbmx5IHllcycKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAzcwogICAgICByZXRyaWVzOiA1CiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAo=",+ "tags": [+ "queue",+ "workflow",+ "jobs",+ "events",+ "background",+ "automation"+ ],+ "category": "automation",+ "logo": "svgs/inngest.png",+ "minversion": "0.0.0",- "template_last_updated_at": "2026-07-02T13:25:47+02:00",++ "template_last_updated_at": null,+ "port": "8288"+ },"invoice-ninja": {"documentation": "https://invoiceninja.github.io/selfhost.html?utm_source=coolify.io","slogan": "The leading open-source invoicing platform",diff --cc templates/service-templates.jsonindex 6a8966352e,4d97d8d5e2..2ad3008f51--- a/templates/service-templates.json+++ b/templates/service-templates.json@@@ -2346,6 -2346,24 +2346,24 @@@"template_last_updated_at": "2025-12-15T17:56:33+01:00","port": "8080"},+ "inngest": {+ "documentation": "https://www.inngest.com/docs/self-hosting?utm_source=coolify.io",+ "slogan": "Durable workflow engine for background jobs, queues and scheduled tasks.",+ "compose": "c2VydmljZXM6CiAgaW5uZ2VzdDoKICAgIGltYWdlOiAnaW5uZ2VzdC9pbm5nZXN0OnYxLjI3LjAnCiAgICBjb21tYW5kOiAnaW5uZ2VzdCBzdGFydCAtLWhvc3QgMC4wLjAuMCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9JTk5HRVNUXzgyODgKICAgICAgLSAnSU5OR0VTVF9FVkVOVF9LRVk9JHtTRVJWSUNFX0hFWF8zMl9FVkVOVEtFWX0nCiAgICAgIC0gJ0lOTkdFU1RfU0lHTklOR19LRVk9JHtTRVJWSUNFX0hFWF8zMl9TSUdOSU5HS0VZfScKICAgICAgLSAnSU5OR0VTVF9QT1NUR1JFU19VUkk9cG9zdGdyZXM6Ly9pbm5nZXN0OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AcG9zdGdyZXM6NTQzMi9pbm5nZXN0JwogICAgICAtICdJTk5HRVNUX1JFRElTX1VSST1yZWRpczovL3JlZGlzOjYzNzknCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3JlczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGlubmdlc3QKICAgICAgICAtIGFscGhhCiAgICAgICAgLSBkb2N0b3IKICAgICAgICAtIGhlYWx0aGNoZWNrCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiA0MHMKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE3JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfREI9aW5uZ2VzdAogICAgICAtIFBPU1RHUkVTX1VTRVI9aW5uZ2VzdAogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXMtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgaW5uZ2VzdCAtZCBpbm5nZXN0JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogNQogICAgcmVzdGFydDogdW5sZXNzLXN0b3BwZWQKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6Ny1hbHBpbmUnCiAgICBjb21tYW5kOiAncmVkaXMtc2VydmVyIC0tYXBwZW5kb25seSB5ZXMnCiAgICB2b2x1bWVzOgogICAgICAtICdyZWRpcy1kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHJlZGlzLWNsaQogICAgICAgIC0gcGluZwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogM3MKICAgICAgcmV0cmllczogNQogICAgcmVzdGFydDogdW5sZXNzLXN0b3BwZWQK",+ "tags": [+ "queue",+ "workflow",+ "jobs",+ "events",+ "background",+ "automation"+ ],+ "category": "automation",+ "logo": "svgs/inngest.png",+ "minversion": "0.0.0",- "template_last_updated_at": "2026-07-02T13:25:47+02:00",++ "template_last_updated_at": null,+ "port": "8288"+ },"invoice-ninja": {"documentation": "https://invoiceninja.github.io/selfhost.html?utm_source=coolify.io","slogan": "The leading open-source invoicing platform",diff --cc tests/Unit/ValidationPatternsTest.phpindex a959b18d57,cb9d0144da..cfcceac381--- a/tests/Unit/ValidationPatternsTest.php+++ b/tests/Unit/ValidationPatternsTest.php@@@ -173,3 -180,10 +180,14 @@@ it('normalizes environment variable keyexpect($environmentVariable->key)->toBe('APP_ENV');});++ it('normalizes application domain scheme and host without lowercasing path query or fragment', function () {+ $domains = ' HTTPS://EXAMPLE.COM/MixedCase/Path?Token=ABC#Fragment, http://Sub.EXAMPLE.com/Api/V1 ';++ expect(ValidationPatterns::normalizeApplicationDomains($domains))+ ->toBe('https://example.com/MixedCase/Path?Token=ABC#Fragment,http://sub.example.com/Api/V1');+ });++++it('validates application domains with underscores in the hostname', function () {++ expect(ValidationPatterns::validateApplicationDomains('https://myapp_service.example.com'))->toBeEmpty();++});