1 parent
a4e2857cee
commit
7fc0e1ca8f
10 files changed
+299
-45
No files matched your search
+20
-16
@@ -670,19 +670,15 @@ func parseLegacyMySQLDSN(value string) (DatabaseConfig, string, bool) {
|
||||
if matches == nil {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
port := int(DefaultMySQLPort)
|
||||
if matches[4] != "" {
|
||||
parsed, err := strconv.Atoi(matches[4])
|
||||
if err != nil || !validPort(parsed) {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
port = parsed
|
||||
port, valid := parseLegacyDatabasePort(matches[4], DefaultMySQLPort)
|
||||
if !valid {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
host, ok := normalizeLegacyDatabaseHost(matches[3])
|
||||
if !ok || !validLegacyDatabaseUser(matches[1]) || !validLegacyDatabasePassword(matches[2]) {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
return DatabaseConfig{Type: DatabaseTypeMySQL, Host: host, Port: uint16(port), Username: matches[1], Name: matches[5]}, matches[2], true
|
||||
return DatabaseConfig{Type: DatabaseTypeMySQL, Host: host, Port: port, Username: matches[1], Name: matches[5]}, matches[2], true
|
||||
}
|
||||
|
||||
func parseLegacyPostgreSQLDSN(value string) (DatabaseConfig, string, bool) {
|
||||
@@ -699,19 +695,27 @@ func parseLegacyPostgreSQLDSN(value string) (DatabaseConfig, string, bool) {
|
||||
if !ok {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
port := int(DefaultPostgreSQLPort)
|
||||
if rawPort := parsed.Port(); rawPort != "" {
|
||||
parsedPort, parseErr := strconv.Atoi(rawPort)
|
||||
if parseErr != nil || !validPort(parsedPort) {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
port = parsedPort
|
||||
port, valid := parseLegacyDatabasePort(parsed.Port(), DefaultPostgreSQLPort)
|
||||
if !valid {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
name := strings.TrimPrefix(parsed.EscapedPath(), "/")
|
||||
if name == "" || strings.Contains(name, "/") || !databaseLocalRefPattern.MatchString(name) {
|
||||
return DatabaseConfig{}, "", false
|
||||
}
|
||||
return DatabaseConfig{Type: DatabaseTypePostgreSQL, Host: host, Port: uint16(port), Username: username, Name: name}, password, true
|
||||
return DatabaseConfig{Type: DatabaseTypePostgreSQL, Host: host, Port: port, Username: username, Name: name}, password, true
|
||||
}
|
||||
|
||||
// 直接按端口位宽解析,避免先解析为平台整数再缩窄。
|
||||
func parseLegacyDatabasePort(value string, fallback uint16) (uint16, bool) {
|
||||
if value == "" {
|
||||
return fallback, fallback != 0
|
||||
}
|
||||
port, err := strconv.ParseUint(value, 10, 16)
|
||||
if err != nil || port == 0 {
|
||||
return 0, false
|
||||
}
|
||||
return uint16(port), true
|
||||
}
|
||||
|
||||
func normalizeLegacyDatabaseHost(value string) (string, bool) {
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package config
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestLegacyDatabasePortBoundaries(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
value string
|
||||
want uint16
|
||||
valid bool
|
||||
}{
|
||||
{value: "", want: 3306, valid: true},
|
||||
{value: "1", want: 1, valid: true},
|
||||
{value: "65535", want: 65535, valid: true},
|
||||
{value: "0"},
|
||||
{value: "-1"},
|
||||
{value: "65536"},
|
||||
{value: "18446744073709551616"},
|
||||
{value: " 3306"},
|
||||
} {
|
||||
port, valid := parseLegacyDatabasePort(test.value, DefaultMySQLPort)
|
||||
if port != test.want || valid != test.valid {
|
||||
t.Fatalf("端口 %q 的解析结果错误:%d %t", test.value, port, valid)
|
||||
}
|
||||
}
|
||||
for _, value := range []string{"0", "65536", "18446744073709551616"} {
|
||||
if _, _, valid := parseLegacyMySQLDSN("smail:sample@tcp(db.example.test:" + value + ")/smail"); valid {
|
||||
t.Fatal("MySQL 连接串接受了越界端口")
|
||||
}
|
||||
if _, _, valid := parseLegacyPostgreSQLDSN("postgres://smail:sample@db.example.test:" + value + "/smail"); valid {
|
||||
t.Fatal("PostgreSQL 连接串接受了越界端口")
|
||||
}
|
||||
}
|
||||
if _, valid := parseLegacyDatabasePort("", 0); valid {
|
||||
t.Fatal("默认端口不能为零")
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user