实现全新部署数据清理保护
Security Checks / security (push) Waiting to run

部署脚本、外部数据库初始化保护及统一证书域名配置已完成;不保留旧运行数据。
This commit is contained in:
xuans committed 2026-10-01 13:13:12 +08:00
1 parent 04ca0e422b
commit 3ba7252948
9 files changed
+161 -119

No files matched your search

+15 -3
View File
@@ -88,7 +88,7 @@ func TestInstallerManagesProtectedEnvironmentFile(t *testing.T) {
"if [ ! -e /etc/smail/smail.env ]; then",
"'SMAIL_ROOT=/opt/smail'",
"chmod 0600 /etc/smail/smail.env",
"cp -p -- /etc/smail/smail.env \"$backup_dir/smail.env\"",
"每次部署都重新创建服务环境文件,不继承旧的凭据或代理配置。",
} {
if !strings.Contains(content, required) {
t.Fatalf("installer is missing protected environment-file behavior %q", required)
@@ -104,9 +104,10 @@ func TestInstallerRequiresExplicitFreshReset(t *testing.T) {
}
content := string(installer)
for _, required := range []string{
"--fresh",
"fresh=true",
"确认全新部署 Smail",
"cp -a -- \"$runtime_dir/.\" \"$backup_dir/runtime/\"",
"for legacy_backup in /var/backups/smail-deploy-*",
"rm -rf -- \"$legacy_backup\"",
"find \"$runtime_dir\" -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +",
"systemctl disable smail smail-admin",
} {
@@ -114,6 +115,17 @@ func TestInstallerRequiresExplicitFreshReset(t *testing.T) {
t.Fatalf("installer is missing explicit fresh-reset behavior %q", required)
}
}
forbidden := []string{
"默认模式保留配置、数据库、证书、日志和插件",
"cp -a -- \"$runtime_dir/.\" \"$backup_dir/runtime/\"",
"cp -p -- /etc/smail/smail.env \"$backup_dir/smail.env\"",
"配置、数据库和证书未覆盖",
}
for _, value := range forbidden {
if strings.Contains(content, value) {
t.Fatalf("installer retains forbidden legacy-data behavior %q", value)
}
}
if strings.Contains(content, "全新部署已停止:$target 非空") {
t.Fatal("installer must not reject existing data without an explicit fresh-reset request")
}
@@ -22,9 +22,6 @@ func TestWindowsDeploymentScriptsKeepAdminChannelManual(t *testing.T) {
"$PackageRoot = $null",
"$PackageRoot = Split-Path -Parent $PSScriptRoot",
"NT SERVICE\\Smail:(F)",
".backup-",
"$mainBackup",
"$adminBackup",
"不会自动注册或启动服务",
} {
if !strings.Contains(content, required) {
@@ -61,13 +58,23 @@ func TestWindowsInstallerRequiresExplicitFreshReset(t *testing.T) {
"[switch]$Fresh",
"确认全新部署 Smail",
".smail-fresh-backup-",
"Copy-Item -LiteralPath $item.FullName -Destination (Join-Path $backupRoot $item.Name) -Recurse -Force",
"不会保留旧配置、数据库、证书、日志、插件或绑定信息。",
"Remove-Item -LiteralPath $item.FullName -Recurse -Force",
} {
if !strings.Contains(content, required) {
t.Fatalf("Windows installer is missing explicit fresh-reset behavior %q", required)
}
}
forbidden := []string{
"Copy-Item -LiteralPath $item.FullName -Destination (Join-Path $backupRoot $item.Name) -Recurse -Force",
"$backupRoot = Join-Path",
"正常升级不会覆盖配置、证书或数据库",
}
for _, value := range forbidden {
if strings.Contains(content, value) {
t.Fatalf("Windows installer retains forbidden legacy-data behavior %q", value)
}
}
if strings.Contains(content, "全新部署已停止:$existing 不是空目录") {
t.Fatal("Windows installer must not reject existing data without an explicit fresh-reset request")
}
+36 -4
View File
@@ -570,12 +570,32 @@ func validMySQLIdentifier(value string) bool {
return true
}
type sqlSetupDatabase struct {
*sql.DB
}
func (database *sqlSetupDatabase) TableCountContext(ctx stdcontext.Context, query string) (int, error) {
var count int
if err := database.QueryRowContext(ctx, query).Scan(&count); err != nil {
return 0, err
}
return count, nil
}
var openMySQLSetupDatabase = func(dsn string) (setupDatabase, error) {
return sql.Open("mysql", dsn)
database, err := sql.Open("mysql", dsn)
if err != nil {
return nil, err
}
return &sqlSetupDatabase{DB: database}, nil
}
var openPostgresSetupDatabase = func(dsn string) (setupDatabase, error) {
return sql.Open("postgres", dsn)
database, err := sql.Open("postgres", dsn)
if err != nil {
return nil, err
}
return &sqlSetupDatabase{DB: database}, nil
}
func ensurePostgresDatabase(dsn string) error {
@@ -596,7 +616,7 @@ func ensurePostgresDatabase(dsn string) error {
}
defer func() { _ = target.Close() }()
if err = target.PingContext(requestContext); err == nil {
return nil
return requireEmptyExternalDatabase(target, requestContext, "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema NOT IN ('pg_catalog', 'information_schema')")
} else {
var postgresErr *pq.Error
if !stderrors.As(err, &postgresErr) || string(postgresErr.Code) != "3D000" {
@@ -631,9 +651,21 @@ func ensurePostgresDatabase(dsn string) error {
type setupDatabase interface {
PingContext(stdcontext.Context) error
ExecContext(stdcontext.Context, string, ...any) (sql.Result, error)
TableCountContext(stdcontext.Context, string) (int, error)
Close() error
}
func requireEmptyExternalDatabase(database setupDatabase, ctx stdcontext.Context, query string) error {
count, err := database.TableCountContext(ctx, query)
if err != nil {
return databaseError("检查外部数据库是否为空失败", err)
}
if count > 0 {
return databaseError("全新部署要求外部数据库为空,请使用新数据库或先清理 Smail 专属数据库", nil)
}
return nil
}
func ensureMySQLDatabase(dsn string) error {
parsed, err := mysql.ParseDSN(dsn)
if err != nil {
@@ -652,7 +684,7 @@ func ensureMySQLDatabase(dsn string) error {
}
defer func() { _ = target.Close() }()
if err = target.PingContext(requestContext); err == nil {
return nil
return requireEmptyExternalDatabase(target, requestContext, "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = DATABASE()")
} else {
var mysqlErr *mysql.MySQLError
if !errors.As(err, &mysqlErr) || mysqlErr.Number != 1049 {
+42 -5
View File
@@ -43,11 +43,14 @@ func TestMarkSetupInProgressPreservesExplicitSetupState(t *testing.T) {
}
type fakeSetupDB struct {
pingErrors []error
pingCalls int
execQueries []string
execError error
closed bool
pingErrors []error
pingCalls int
execQueries []string
execError error
tableCount int
tableCountErr error
tableQueries []string
closed bool
}
func (database *fakeSetupDB) PingContext(context.Context) error {
@@ -64,6 +67,14 @@ func (database *fakeSetupDB) ExecContext(_ context.Context, query string, _ ...a
return fakeSetupResult(0), database.execError
}
func (database *fakeSetupDB) TableCountContext(_ context.Context, query string) (int, error) {
if database.tableCountErr != nil {
return 0, database.tableCountErr
}
database.tableQueries = append(database.tableQueries, query)
return database.tableCount, nil
}
func (database *fakeSetupDB) Close() error {
database.closed = true
return nil
@@ -282,6 +293,32 @@ func TestEnsureMySQLDatabaseSkipsCreationWhenDatabaseExists(t *testing.T) {
}
}
func TestEnsureMySQLDatabaseRejectsExistingNonEmptyDatabase(t *testing.T) {
target := &fakeSetupDB{tableCount: 1}
withMySQLSetupOpener(t, func(string) (setupDatabase, error) {
return target, nil
})
if err := ensureMySQLDatabase(testMySQLDSN(t, "secret")); err == nil {
t.Fatal("non-empty MySQL database was accepted for a fresh deployment")
} else if message := DatabaseSetupErrorMessage(err); message == "" {
t.Fatal("fresh deployment error message was empty")
}
}
func TestEnsurePostgresDatabaseRejectsExistingNonEmptyDatabase(t *testing.T) {
target := &fakeSetupDB{tableCount: 1}
withPostgresSetupOpener(t, func(string) (setupDatabase, error) {
return target, nil
})
if err := ensurePostgresDatabase("postgres://smail:secret@127.0.0.1:5432/smail?sslmode=disable"); err == nil {
t.Fatal("non-empty PostgreSQL database was accepted for a fresh deployment")
} else if message := DatabaseSetupErrorMessage(err); message == "" {
t.Fatal("fresh deployment error message was empty")
}
}
func TestEnsureMySQLDatabaseCreatesMissingDatabase(t *testing.T) {
target := &fakeSetupDB{pingErrors: []error{&mysql.MySQLError{Number: 1049}, nil}}
admin := &fakeSetupDB{}