feat(database): support configurable SSL mode for PostgreSQL and MySQL
Add ssl_mode configuration option to allow users to customize SSL/TLS policy for database connections instead of hardcoding sslmode=disable for PostgreSQL and having no TLS support for MySQL. Changes: - database.Config, DatabaseConfig: add SSLMode field - PostgreSQL DSN: replace hardcoded sslmode=disable with configurable value - MySQL DSN: append &tls=<SSLMode> parameter when SSLMode is set - Full config pipeline: INI/env -> DatabaseConfig -> Config -> DSN -> subprocess - New env var BH_DB_SSL_MODE and ini key [database] ssl_mode - Updated config example and documentation
This commit is contained in:
@@ -28,6 +28,8 @@ path = data/baihu.db
|
|||||||
dsn =
|
dsn =
|
||||||
# 表前缀
|
# 表前缀
|
||||||
table_prefix = baihu_
|
table_prefix = baihu_
|
||||||
|
# SSL 模式 (仅 mysql/postgres): postgres 支持 disable/require/verify-ca/verify-full; mysql 支持 true/skip-verify
|
||||||
|
# ssl_mode = disable
|
||||||
|
|
||||||
[security]
|
[security]
|
||||||
# JWT 密钥。留空则在首次启动时自动生成并保存到数据库设置中。
|
# JWT 密钥。留空则在首次启动时自动生成并保存到数据库设置中。
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
| `BH_DB_PATH` | database.path | SQLite 物理文件存储路径 | ./data/baihu.db |
|
| `BH_DB_PATH` | database.path | SQLite 物理文件存储路径 | ./data/baihu.db |
|
||||||
| `BH_DB_DSN` | database.dsn | 数据库 DSN (仅 mysql/postgres, 优先级高。**需对应设置 type**) | - |
|
| `BH_DB_DSN` | database.dsn | 数据库 DSN (仅 mysql/postgres, 优先级高。**需对应设置 type**) | - |
|
||||||
| `BH_DB_TABLE_PREFIX` | database.table_prefix | 数据库表前缀 | baihu_ |
|
| `BH_DB_TABLE_PREFIX` | database.table_prefix | 数据库表前缀 | baihu_ |
|
||||||
|
| `BH_DB_SSL_MODE` | database.ssl_mode | SSL 模式: postgres 支持 disable/require/verify-ca/verify-full; mysql 支持 true/skip-verify | - |
|
||||||
| `BAIHU_SECRET_KEY` | - | 系统加密秘钥,用于机密变量功能(**注:仅支持环境变量设置,不支持配置文件**) | - |
|
| `BAIHU_SECRET_KEY` | - | 系统加密秘钥,用于机密变量功能(**注:仅支持环境变量设置,不支持配置文件**) | - |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ func (a *App) initDatabase() {
|
|||||||
DBName: a.Config.Database.DBName,
|
DBName: a.Config.Database.DBName,
|
||||||
Path: a.Config.Database.Path,
|
Path: a.Config.Database.Path,
|
||||||
DSN: a.Config.Database.DSN,
|
DSN: a.Config.Database.DSN,
|
||||||
|
SSLMode: a.Config.Database.SSLMode,
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := database.Init(dbCfg); err != nil {
|
if err := database.Init(dbCfg); err != nil {
|
||||||
|
|||||||
@@ -193,6 +193,7 @@ var (
|
|||||||
RuntimeDBPath string
|
RuntimeDBPath string
|
||||||
RuntimeDBDSN string
|
RuntimeDBDSN string
|
||||||
RuntimeDBTablePrefix string
|
RuntimeDBTablePrefix string
|
||||||
|
RuntimeDBSSLMode string
|
||||||
)
|
)
|
||||||
|
|
||||||
// Secret JWT和密码salt密钥,运行中自动从数据库加载
|
// Secret JWT和密码salt密钥,运行中自动从数据库加载
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ type Config struct {
|
|||||||
DBName string
|
DBName string
|
||||||
Path string // for sqlite
|
Path string // for sqlite
|
||||||
DSN string // for mysql/mariadb unix socket or custom dsn
|
DSN string // for mysql/mariadb unix socket or custom dsn
|
||||||
|
SSLMode string // postgres: disable/require/verify-ca/verify-full; mysql: true/skip-verify
|
||||||
}
|
}
|
||||||
|
|
||||||
func Init(cfg *Config) error {
|
func Init(cfg *Config) error {
|
||||||
@@ -37,24 +38,19 @@ func Init(cfg *Config) error {
|
|||||||
loc := systime.CST
|
loc := systime.CST
|
||||||
time.Local = loc
|
time.Local = loc
|
||||||
|
|
||||||
|
dsn, err := buildDSN(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
var dialector gorm.Dialector
|
var dialector gorm.Dialector
|
||||||
|
|
||||||
switch cfg.Type {
|
switch cfg.Type {
|
||||||
case "sqlite":
|
case "sqlite":
|
||||||
dialector = sqlite.Open(cfg.Path + "?_busy_timeout=5000")
|
dialector = sqlite.Open(dsn)
|
||||||
case "mysql":
|
case "mysql":
|
||||||
dsn := cfg.DSN
|
|
||||||
if dsn == "" {
|
|
||||||
dsn = fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Asia%%2FShanghai",
|
|
||||||
cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.DBName)
|
|
||||||
}
|
|
||||||
dialector = mysql.Open(dsn)
|
dialector = mysql.Open(dsn)
|
||||||
case "postgres":
|
case "postgres":
|
||||||
dsn := cfg.DSN
|
|
||||||
if dsn == "" {
|
|
||||||
dsn = fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable TimeZone=Asia/Shanghai",
|
|
||||||
cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.DBName)
|
|
||||||
}
|
|
||||||
dialector = postgres.Open(dsn)
|
dialector = postgres.Open(dsn)
|
||||||
default:
|
default:
|
||||||
return fmt.Errorf("unsupported database type: %s", cfg.Type)
|
return fmt.Errorf("unsupported database type: %s", cfg.Type)
|
||||||
@@ -102,3 +98,33 @@ func AutoMigrate(models ...interface{}) error {
|
|||||||
func GetDB() *gorm.DB {
|
func GetDB() *gorm.DB {
|
||||||
return DB
|
return DB
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func buildDSN(cfg *Config) (string, error) {
|
||||||
|
switch cfg.Type {
|
||||||
|
case "sqlite":
|
||||||
|
return cfg.Path + "?_busy_timeout=5000", nil
|
||||||
|
case "mysql":
|
||||||
|
if cfg.DSN != "" {
|
||||||
|
return cfg.DSN, nil
|
||||||
|
}
|
||||||
|
dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Asia%%2FShanghai",
|
||||||
|
cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.DBName)
|
||||||
|
if cfg.SSLMode != "" {
|
||||||
|
dsn += "&tls=" + cfg.SSLMode
|
||||||
|
}
|
||||||
|
return dsn, nil
|
||||||
|
case "postgres":
|
||||||
|
if cfg.DSN != "" {
|
||||||
|
return cfg.DSN, nil
|
||||||
|
}
|
||||||
|
sslMode := cfg.SSLMode
|
||||||
|
if sslMode == "" {
|
||||||
|
sslMode = "disable"
|
||||||
|
}
|
||||||
|
dsn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s TimeZone=Asia/Shanghai",
|
||||||
|
cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.DBName, sslMode)
|
||||||
|
return dsn, nil
|
||||||
|
default:
|
||||||
|
return "", fmt.Errorf("unsupported database type: %s", cfg.Type)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ type DatabaseConfig struct {
|
|||||||
Path string `ini:"path"`
|
Path string `ini:"path"`
|
||||||
DSN string `ini:"dsn"`
|
DSN string `ini:"dsn"`
|
||||||
TablePrefix string `ini:"table_prefix"`
|
TablePrefix string `ini:"table_prefix"`
|
||||||
|
SSLMode string `ini:"ssl_mode"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type SecurityConfig struct {
|
type SecurityConfig struct {
|
||||||
@@ -135,6 +136,7 @@ func LoadConfig(path string) (*AppConfig, error) {
|
|||||||
constant.RuntimeDBPath = Config.Database.Path
|
constant.RuntimeDBPath = Config.Database.Path
|
||||||
constant.RuntimeDBDSN = Config.Database.DSN
|
constant.RuntimeDBDSN = Config.Database.DSN
|
||||||
constant.RuntimeDBTablePrefix = Config.Database.TablePrefix
|
constant.RuntimeDBTablePrefix = Config.Database.TablePrefix
|
||||||
|
constant.RuntimeDBSSLMode = Config.Database.SSLMode
|
||||||
|
|
||||||
// 暂存旧的 Secret,不再直接给 constant 赋值(改为到 settings 初始化时判断)
|
// 暂存旧的 Secret,不再直接给 constant 赋值(改为到 settings 初始化时判断)
|
||||||
// constant.Secret = Config.Security.Secret
|
// constant.Secret = Config.Security.Secret
|
||||||
@@ -178,6 +180,7 @@ func applyEnvOverrides() {
|
|||||||
getEnvStr("BH_DB_PATH", &Config.Database.Path)
|
getEnvStr("BH_DB_PATH", &Config.Database.Path)
|
||||||
getEnvStr("BH_DB_DSN", &Config.Database.DSN)
|
getEnvStr("BH_DB_DSN", &Config.Database.DSN)
|
||||||
getEnvStr("BH_DB_TABLE_PREFIX", &Config.Database.TablePrefix)
|
getEnvStr("BH_DB_TABLE_PREFIX", &Config.Database.TablePrefix)
|
||||||
|
getEnvStr("BH_DB_SSL_MODE", &Config.Database.SSLMode)
|
||||||
|
|
||||||
// Security
|
// Security
|
||||||
getEnvStr("BH_SECRET", &Config.Security.Secret)
|
getEnvStr("BH_SECRET", &Config.Security.Secret)
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ func BuildRuntimeProcessEnv() []string {
|
|||||||
appendEnvIfSet(&envs, "BH_DB_PATH", constant.RuntimeDBPath)
|
appendEnvIfSet(&envs, "BH_DB_PATH", constant.RuntimeDBPath)
|
||||||
appendEnvIfSet(&envs, "BH_DB_DSN", constant.RuntimeDBDSN)
|
appendEnvIfSet(&envs, "BH_DB_DSN", constant.RuntimeDBDSN)
|
||||||
appendEnvIfSet(&envs, "BH_DB_TABLE_PREFIX", constant.RuntimeDBTablePrefix)
|
appendEnvIfSet(&envs, "BH_DB_TABLE_PREFIX", constant.RuntimeDBTablePrefix)
|
||||||
|
appendEnvIfSet(&envs, "BH_DB_SSL_MODE", constant.RuntimeDBSSLMode)
|
||||||
|
|
||||||
return envs
|
return envs
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user