完善外部数据库凭据隔离与写入验证
This commit is contained in:
1 parent
2e1f654513
commit
1bb0199891
7 files changed
+472
-16
No files matched your search
@@ -478,6 +478,21 @@ func (c Config) Validate() error {
|
||||
if strings.TrimSpace(c.Database.DSN) == "" {
|
||||
return fmt.Errorf("数据库连接信息不能为空")
|
||||
}
|
||||
if c.Database.Driver == "sqlite" {
|
||||
if strings.TrimSpace(c.Database.CredentialRef) != "" {
|
||||
return fmt.Errorf("SQLite 不允许配置数据库凭据引用")
|
||||
}
|
||||
} else {
|
||||
if strings.TrimSpace(c.Database.CredentialRef) == "" {
|
||||
return fmt.Errorf("外部数据库必须配置加密凭据引用")
|
||||
}
|
||||
if !strings.HasPrefix(strings.TrimSpace(c.Database.CredentialRef), "secret://database/") {
|
||||
return fmt.Errorf("数据库凭据引用必须使用 secret://database/ 前缀")
|
||||
}
|
||||
if databaseDSNContainsPassword(c.Database.Driver, c.Database.DSN) {
|
||||
return fmt.Errorf("数据库连接信息不能包含密码,请使用加密凭据引用")
|
||||
}
|
||||
}
|
||||
if c.Database.MaxOpenConns < 1 || c.Database.MaxIdleConns < 0 || c.Database.MaxIdleConns > c.Database.MaxOpenConns {
|
||||
return fmt.Errorf("数据库连接池配置无效")
|
||||
}
|
||||
@@ -603,6 +618,38 @@ func (c Config) Validate() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func databaseDSNContainsPassword(driver, dsn string) bool {
|
||||
driver = strings.ToLower(strings.TrimSpace(driver))
|
||||
dsn = strings.TrimSpace(dsn)
|
||||
if dsn == "" {
|
||||
return false
|
||||
}
|
||||
switch driver {
|
||||
case "mysql":
|
||||
at := strings.Index(dsn, "@")
|
||||
if at < 0 {
|
||||
return false
|
||||
}
|
||||
credentials := dsn[:at]
|
||||
return strings.Contains(credentials, ":")
|
||||
case "postgres":
|
||||
if parsed, err := url.Parse(dsn); err == nil && (parsed.Scheme == "postgres" || parsed.Scheme == "postgresql") {
|
||||
if parsed.User == nil {
|
||||
return false
|
||||
}
|
||||
_, present := parsed.User.Password()
|
||||
return present
|
||||
}
|
||||
for _, field := range strings.Fields(dsn) {
|
||||
key, _, found := strings.Cut(field, "=")
|
||||
if found && strings.EqualFold(strings.TrimSpace(key), "password") {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// ResetURL 返回通过主 Web 服务访问密码重置入口的公开地址。
|
||||
func (c Config) ResetURL() string {
|
||||
rawHost := strings.TrimSpace(c.Web.Hostname)
|
||||
|
||||
@@ -78,6 +78,41 @@ func TestValidateRejectsInvalidPort(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateProtectsExternalDatabasePasswords(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
edit func(*Config)
|
||||
}{
|
||||
{
|
||||
name: "MySQL password in DSN",
|
||||
edit: func(cfg *Config) {
|
||||
cfg.Database = DatabaseConfig{Driver: "mysql", DSN: "user:password@tcp(db.example.test:3306)/scert", CredentialRef: "secret://database/mysql"}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "PostgreSQL password in DSN",
|
||||
edit: func(cfg *Config) {
|
||||
cfg.Database = DatabaseConfig{Driver: "postgres", DSN: "postgres://user:password@db.example.test:5432/scert?sslmode=verify-full", CredentialRef: "secret://database/postgres"}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "missing external database credential reference",
|
||||
edit: func(cfg *Config) {
|
||||
cfg.Database = DatabaseConfig{Driver: "mysql", DSN: "user@tcp(db.example.test:3306)/scert"}
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, item := range tests {
|
||||
t.Run(item.name, func(t *testing.T) {
|
||||
cfg := Default(t.TempDir())
|
||||
item.edit(&cfg)
|
||||
if err := cfg.Validate(); err == nil {
|
||||
t.Fatal("不安全外部数据库配置未被拒绝")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestResetURLAlwaysUsesWebHostnameWithoutPort(t *testing.T) {
|
||||
cfg := Default(t.TempDir())
|
||||
cfg.Web.Hostname = "scert.example.test"
|
||||
|
||||
Reference in new issue
Block a user