1 parent
29cfebd620
commit
0b10489728
7 files changed
+175
-32
No files matched your search
@@ -212,6 +212,10 @@ func SetDatabaseSettingsWithOptions(ctx *context.Context, settings DatabaseSetti
|
||||
return errors.New("dbtype error")
|
||||
}
|
||||
|
||||
// 兼容未携带模式字段的旧调用:只要提交了结构化数据库字段,就按字段模式处理。
|
||||
if strings.TrimSpace(settings.Mode) == "" && (dbType == config.DBTypeMySQL || dbType == config.DBTypePostgres) {
|
||||
settings.Mode = "fields"
|
||||
}
|
||||
dbDSN := strings.TrimSpace(settings.DSN)
|
||||
if settings.Mode == "fields" {
|
||||
switch dbType {
|
||||
@@ -278,11 +282,17 @@ func buildPostgresDSN(settings DatabaseSettings, previousDSN string) (string, er
|
||||
if user == "" {
|
||||
return "", errors.New("PostgreSQL 用户不能为空")
|
||||
}
|
||||
if !validDatabaseField(user, 128) {
|
||||
return "", errors.New("PostgreSQL 用户格式无效")
|
||||
}
|
||||
host := strings.TrimSpace(settings.Host)
|
||||
if host == "" {
|
||||
host = "127.0.0.1"
|
||||
}
|
||||
host = normalizeDatabaseHost(host)
|
||||
if !validDatabaseHost(host) {
|
||||
return "", errors.New("PostgreSQL 主机地址格式无效")
|
||||
}
|
||||
portText := strings.TrimSpace(settings.Port)
|
||||
if portText == "" {
|
||||
portText = "5432"
|
||||
@@ -392,11 +402,17 @@ func buildMySQLDSN(settings DatabaseSettings, previousDSN string) (string, error
|
||||
if user == "" {
|
||||
return "", errors.New("MySQL 用户不能为空")
|
||||
}
|
||||
if !validDatabaseField(user, 128) {
|
||||
return "", errors.New("MySQL 用户格式无效")
|
||||
}
|
||||
host := strings.TrimSpace(settings.Host)
|
||||
if host == "" {
|
||||
host = "127.0.0.1"
|
||||
}
|
||||
host = normalizeMySQLHost(host)
|
||||
if !validDatabaseHost(host) {
|
||||
return "", errors.New("MySQL 主机地址格式无效")
|
||||
}
|
||||
portText := strings.TrimSpace(settings.Port)
|
||||
if portText == "" {
|
||||
portText = "3306"
|
||||
@@ -424,7 +440,8 @@ func buildMySQLDSN(settings DatabaseSettings, previousDSN string) (string, error
|
||||
dsnConfig.Addr = net.JoinHostPort(host, strconv.Itoa(port))
|
||||
dsnConfig.DBName = databaseName
|
||||
dsnConfig.ParseTime = true
|
||||
dsnConfig.Loc = time.Local
|
||||
// 使用跨平台稳定的时区,避免 Windows 交叉编译后的 CST 在 Linux 上无法解析。
|
||||
dsnConfig.Loc = time.UTC
|
||||
dsnConfig.Params = map[string]string{"charset": "utf8mb4"}
|
||||
return dsnConfig.FormatDSN(), nil
|
||||
}
|
||||
@@ -460,6 +477,44 @@ func normalizeMySQLHost(host string) string {
|
||||
return host
|
||||
}
|
||||
|
||||
func validDatabaseField(value string, maxLength int) bool {
|
||||
if value == "" || len(value) > maxLength {
|
||||
return false
|
||||
}
|
||||
for _, char := range value {
|
||||
if char == '\r' || char == '\n' || char == '\t' || char == ' ' {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func validDatabaseHost(host string) bool {
|
||||
if host == "" || len(host) > 253 {
|
||||
return false
|
||||
}
|
||||
if strings.ContainsAny(host, "\r\n\t /\\?@#") {
|
||||
return false
|
||||
}
|
||||
if net.ParseIP(host) != nil {
|
||||
return true
|
||||
}
|
||||
if strings.Contains(host, ":") {
|
||||
return false
|
||||
}
|
||||
for _, label := range strings.Split(host, ".") {
|
||||
if label == "" || len(label) > 63 || strings.HasPrefix(label, "-") || strings.HasSuffix(label, "-") {
|
||||
return false
|
||||
}
|
||||
for _, char := range label {
|
||||
if (char < 'a' || char > 'z') && (char < 'A' || char > 'Z') && (char < '0' || char > '9') && char != '-' {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func validMySQLIdentifier(value string) bool {
|
||||
if len(value) == 0 || len(value) > 64 {
|
||||
return false
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/go-sql-driver/mysql"
|
||||
"github.com/lib/pq"
|
||||
@@ -75,6 +76,9 @@ func TestBuildMySQLDSNUsesStructuredFields(t *testing.T) {
|
||||
if parsed.DBName != "smail_1" || !parsed.ParseTime {
|
||||
t.Fatalf("unexpected database options: name=%q parseTime=%v", parsed.DBName, parsed.ParseTime)
|
||||
}
|
||||
if parsed.Loc != time.UTC {
|
||||
t.Fatalf("unexpected database location: %v", parsed.Loc)
|
||||
}
|
||||
if !strings.Contains(dsn, "charset=utf8mb4") {
|
||||
t.Fatalf("charset option is missing from DSN: %q", dsn)
|
||||
}
|
||||
@@ -210,6 +214,7 @@ func TestBuildMySQLDSNRejectsInvalidInput(t *testing.T) {
|
||||
{User: "root", Port: "0", Name: "smail"},
|
||||
{User: "root", Port: "65536", Name: "smail"},
|
||||
{User: "root", Port: "3306", Name: "smail-test"},
|
||||
{User: "root", Host: "mysql server", Port: "3306", Name: "smail"},
|
||||
{Port: "3306", Name: "smail"},
|
||||
}
|
||||
for _, settings := range tests {
|
||||
@@ -219,6 +224,17 @@ func TestBuildMySQLDSNRejectsInvalidInput(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildMySQLDSNAcceptsDatabaseServiceHost(t *testing.T) {
|
||||
if _, err := buildMySQLDSN(DatabaseSettings{
|
||||
User: "root",
|
||||
Host: "mysql",
|
||||
Port: "3306",
|
||||
Name: "smail",
|
||||
}, ""); err != nil {
|
||||
t.Fatalf("database service host was rejected: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureMySQLDatabaseSkipsCreationWhenDatabaseExists(t *testing.T) {
|
||||
target := &fakeSetupDB{}
|
||||
openCalls := 0
|
||||
|
||||
Reference in new issue
Block a user