mirror of
https://github.com/tiennm99/coolify.git
synced 2026-10-15 00:17:16 +00:00
fix(database): skip credential pattern validation for unchanged values
Pattern enforcement now conditional on field being dirty (changed vs saved value). Prevents false validation failures when existing records hold legacy credential formats that pre-date the stricter regex rules.
This commit is contained in:
1 parent
03313e54cc
commit
40a9881ef2
10 files changed
+165
-24
No files matched your search
@@ -76,8 +76,12 @@ class General extends Component
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
'clickhouseAdminUser' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'clickhouseAdminPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'clickhouseAdminUser' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->clickhouseAdminUser !== $this->database->clickhouse_admin_user,
|
||||
),
|
||||
'clickhouseAdminPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->clickhouseAdminPassword !== $this->database->clickhouse_admin_password,
|
||||
),
|
||||
'image' => 'required|string',
|
||||
'portsMappings' => ValidationPatterns::portMappingRules(),
|
||||
'isPublic' => 'nullable|boolean',
|
||||
|
||||
@@ -89,7 +89,9 @@ class General extends Component
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
'dragonflyPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'dragonflyPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->dragonflyPassword !== $this->database->dragonfly_password,
|
||||
),
|
||||
'image' => 'required|string',
|
||||
'portsMappings' => ValidationPatterns::portMappingRules(),
|
||||
'isPublic' => 'nullable|boolean',
|
||||
|
||||
@@ -92,7 +92,9 @@ class General extends Component
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
'keydbConf' => 'nullable|string',
|
||||
'keydbPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'keydbPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->keydbPassword !== $this->database->keydb_password,
|
||||
),
|
||||
'image' => 'required|string',
|
||||
'portsMappings' => ValidationPatterns::portMappingRules(),
|
||||
'isPublic' => 'nullable|boolean',
|
||||
|
||||
@@ -74,10 +74,18 @@ class General extends Component
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
'mariadbRootPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'mariadbUser' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'mariadbPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'mariadbDatabase' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'mariadbRootPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->mariadbRootPassword !== $this->database->mariadb_root_password,
|
||||
),
|
||||
'mariadbUser' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->mariadbUser !== $this->database->mariadb_user,
|
||||
),
|
||||
'mariadbPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->mariadbPassword !== $this->database->mariadb_password,
|
||||
),
|
||||
'mariadbDatabase' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->mariadbDatabase !== $this->database->mariadb_database,
|
||||
),
|
||||
'mariadbConf' => 'nullable',
|
||||
'image' => 'required',
|
||||
'portsMappings' => ValidationPatterns::portMappingRules(),
|
||||
|
||||
@@ -75,9 +75,15 @@ class General extends Component
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
'mongoConf' => 'nullable',
|
||||
'mongoInitdbRootUsername' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'mongoInitdbRootPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'mongoInitdbDatabase' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'mongoInitdbRootUsername' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->mongoInitdbRootUsername !== $this->database->mongo_initdb_root_username,
|
||||
),
|
||||
'mongoInitdbRootPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->mongoInitdbRootPassword !== $this->database->mongo_initdb_root_password,
|
||||
),
|
||||
'mongoInitdbDatabase' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->mongoInitdbDatabase !== $this->database->mongo_initdb_database,
|
||||
),
|
||||
'image' => 'required',
|
||||
'portsMappings' => ValidationPatterns::portMappingRules(),
|
||||
'isPublic' => 'nullable|boolean',
|
||||
|
||||
@@ -76,10 +76,18 @@ class General extends Component
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
'mysqlRootPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'mysqlUser' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'mysqlPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'mysqlDatabase' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'mysqlRootPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->mysqlRootPassword !== $this->database->mysql_root_password,
|
||||
),
|
||||
'mysqlUser' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->mysqlUser !== $this->database->mysql_user,
|
||||
),
|
||||
'mysqlPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->mysqlPassword !== $this->database->mysql_password,
|
||||
),
|
||||
'mysqlDatabase' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->mysqlDatabase !== $this->database->mysql_database,
|
||||
),
|
||||
'mysqlConf' => 'nullable',
|
||||
'image' => 'required',
|
||||
'portsMappings' => ValidationPatterns::portMappingRules(),
|
||||
|
||||
@@ -86,9 +86,15 @@ class General extends Component
|
||||
return [
|
||||
'name' => ValidationPatterns::nameRules(),
|
||||
'description' => ValidationPatterns::descriptionRules(),
|
||||
'postgresUser' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'postgresPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'postgresDb' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'postgresUser' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->postgresUser !== $this->database->postgres_user,
|
||||
),
|
||||
'postgresPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->postgresPassword !== $this->database->postgres_password,
|
||||
),
|
||||
'postgresDb' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->postgresDb !== $this->database->postgres_db,
|
||||
),
|
||||
'postgresInitdbArgs' => 'nullable',
|
||||
'postgresHostAuthMethod' => 'nullable',
|
||||
'postgresConf' => 'nullable',
|
||||
|
||||
@@ -81,8 +81,12 @@ class General extends Component
|
||||
'publicPortTimeout' => 'nullable|integer|min:1',
|
||||
'isLogDrainEnabled' => 'nullable|boolean',
|
||||
'customDockerRunOptions' => 'nullable',
|
||||
'redisUsername' => ValidationPatterns::databaseIdentifierRules(),
|
||||
'redisPassword' => ValidationPatterns::databasePasswordRules(),
|
||||
'redisUsername' => ValidationPatterns::databaseIdentifierRules(
|
||||
enforcePattern: $this->redisUsername !== $this->database->redis_username,
|
||||
),
|
||||
'redisPassword' => ValidationPatterns::databasePasswordRules(
|
||||
enforcePattern: $this->redisPassword !== $this->database->redis_password,
|
||||
),
|
||||
'enableSsl' => 'boolean',
|
||||
];
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user