修复PostgreSQL首次安装连接选项与配置迁移不一致
This commit is contained in:
1 parent
b8a4801533
commit
d4282f654b
4 files changed
+67
-3
No files matched your search
@@ -683,9 +683,21 @@ func parseLegacyMySQLDSN(value string) (DatabaseConfig, string, bool) {
|
||||
|
||||
func parseLegacyPostgreSQLDSN(value string) (DatabaseConfig, string, bool) {
|
||||
parsed, err := url.ParseRequestURI(value)
|
||||
if err != nil || (parsed.Scheme != "postgres" && parsed.Scheme != "postgresql") || parsed.RawQuery != "" || parsed.Fragment != "" || parsed.User == nil || parsed.Host == "" {
|
||||
if err != nil || (parsed.Scheme != "postgres" && parsed.Scheme != "postgresql") || parsed.Fragment != "" || parsed.User == nil || parsed.Host == "" {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
// 仅接受正式运行能够原样表达的选项;未知、重复和降级 TLS 的选项仍需人工迁移。
|
||||
query, err := url.ParseQuery(parsed.RawQuery)
|
||||
if err != nil {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
supported := map[string]string{"sslmode": "require", "timezone": "UTC", "search_path": "public"}
|
||||
for key, values := range query {
|
||||
expected, known := supported[key]
|
||||
if !known || len(values) != 1 || values[0] != expected {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
}
|
||||
username := parsed.User.Username()
|
||||
password, ok := parsed.User.Password()
|
||||
if !ok || !validLegacyDatabaseUser(username) || !validLegacyDatabasePassword(password) {
|
||||
|
||||
Reference in new issue
Block a user