完善三数据库初始化验证与凭据隔离
This commit is contained in:
1 parent
3fdcb7efe7
commit
8cb1921d4a
4 files changed
+587
-5
No files matched your search
@@ -57,17 +57,34 @@ func ValidateConfig(cfg config.DatabaseConfig) error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("解析 MySQL 连接信息失败:%w", err)
|
||||
}
|
||||
if strings.TrimSpace(parsed.User) == "" {
|
||||
return fmt.Errorf("MySQL 连接信息必须包含用户名")
|
||||
if strings.TrimSpace(parsed.User) != "" {
|
||||
return fmt.Errorf("MySQL 用户名只能保存到加密凭据中")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if _, err := normalizePostgresDSN(dsn); err != nil {
|
||||
if err := validatePersistedPostgresDSN(dsn); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func validatePersistedPostgresDSN(dsn string) error {
|
||||
parsed, err := url.Parse(strings.TrimSpace(dsn))
|
||||
if err != nil || (parsed.Scheme != "postgres" && parsed.Scheme != "postgresql") {
|
||||
return fmt.Errorf("PostgreSQL 数据库连接信息必须使用不含账号密码的 postgres:// URL")
|
||||
}
|
||||
if strings.TrimSpace(parsed.Hostname()) == "" || strings.Trim(strings.TrimSpace(parsed.Path), "/") == "" {
|
||||
return fmt.Errorf("PostgreSQL 连接信息必须包含主机和数据库")
|
||||
}
|
||||
if parsed.User != nil {
|
||||
return fmt.Errorf("PostgreSQL 用户名和密码只能保存到加密凭据中")
|
||||
}
|
||||
if postgresSSLMode(dsn) != "verify-full" {
|
||||
return fmt.Errorf("PostgreSQL 连接必须使用 sslmode=verify-full")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ResolveConfig 从凭据存储中读取外部数据库账号,在内存中构造连接配置。
|
||||
// 返回值绝不能保存或记录到日志。
|
||||
func ResolveConfig(ctx context.Context, cfg config.DatabaseConfig, reader CredentialReader) (config.DatabaseConfig, error) {
|
||||
|
||||
@@ -46,12 +46,12 @@ func TestResolveConfigBuildsRuntimeDSNWithoutChangingPersistedConfig(t *testing.
|
||||
}{
|
||||
{
|
||||
name: "MySQL",
|
||||
cfg: config.DatabaseConfig{Driver: "mysql", DSN: "user@tcp(db.example.test:3306)/scert?charset=utf8mb4", CredentialRef: "secret://database/mysql"},
|
||||
cfg: config.DatabaseConfig{Driver: "mysql", DSN: "tcp(db.example.test:3306)/scert?charset=utf8mb4&tls=true", CredentialRef: "secret://database/mysql"},
|
||||
wantSecret: "mysql-password",
|
||||
},
|
||||
{
|
||||
name: "PostgreSQL",
|
||||
cfg: config.DatabaseConfig{Driver: "postgres", DSN: "postgres://user@db.example.test:5432/scert?sslmode=verify-full", CredentialRef: "secret://database/postgres"},
|
||||
cfg: config.DatabaseConfig{Driver: "postgres", DSN: "postgres://db.example.test:5432/scert?sslmode=verify-full", CredentialRef: "secret://database/postgres"},
|
||||
wantSecret: "postgres-password",
|
||||
},
|
||||
}
|
||||
@@ -74,6 +74,17 @@ func TestResolveConfigBuildsRuntimeDSNWithoutChangingPersistedConfig(t *testing.
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidateConfigKeepsExternalDatabaseUsernameOutOfPersistedDSN(t *testing.T) {
|
||||
for _, cfg := range []config.DatabaseConfig{
|
||||
{Driver: "mysql", DSN: "user@tcp(db.example.test:3306)/scert?tls=true", CredentialRef: "secret://database/mysql"},
|
||||
{Driver: "postgres", DSN: "postgres://user@db.example.test:5432/scert?sslmode=verify-full", CredentialRef: "secret://database/postgres"},
|
||||
} {
|
||||
if err := ValidateConfig(cfg); err == nil {
|
||||
t.Fatalf("持久化配置中的数据库用户名未被拒绝:%s", cfg.Driver)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestVerifyWritableSQLiteCleansTemporaryTable(t *testing.T) {
|
||||
cfg := config.Default(t.TempDir()).Database
|
||||
if err := VerifyWritable(t.Context(), cfg); err != nil {
|
||||
|
||||
Reference in new issue
Block a user