完善配置安全校验与数据库迁移处理
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-08-30 17:45:52 +08:00
1 parent 3af1fc4147
commit 29cfebd620
36 files changed
+2838 -118

No files matched your search

+41 -1
View File
@@ -93,6 +93,46 @@ func configErrorDetails(err error) (string, int, string, map[string]string) {
code = "DATABASE_MIGRATION_UNAVAILABLE"
status = http.StatusServiceUnavailable
message = "数据库迁移执行器暂未配置,请先完成服务部署"
case errors.Is(err, dbmigration.ErrSwitchUnavailable):
code = "DATABASE_MIGRATION_SWITCH_UNAVAILABLE"
status = http.StatusServiceUnavailable
message = "数据库迁移已完成校验,但配置切换通道暂不可用,当前配置未切换"
case errors.Is(err, dbmigration.ErrSwitchOutcomeUnknown):
code = "SWITCH_OUTCOME_UNKNOWN"
status = http.StatusServiceUnavailable
message = "数据库迁移配置切换结果暂不确定,请先确认当前配置和目标数据库状态"
case errors.Is(err, dbmigration.ErrTargetExists):
code = "DATABASE_MIGRATION_TARGET_EXISTS"
status = http.StatusConflict
message = "目标数据库已存在,请更换数据库名称"
case errors.Is(err, dbmigration.ErrSQLTargetExists):
code = "DATABASE_MIGRATION_TARGET_EXISTS"
status = http.StatusConflict
message = "目标数据库已存在,请更换数据库名称"
case errors.Is(err, dbmigration.ErrSQLCopyUnavailable):
code = "DATABASE_MIGRATION_COPIER_UNAVAILABLE"
status = http.StatusServiceUnavailable
message = "数据库迁移复制器暂不可用,请先完成服务部署"
case errors.Is(err, dbmigration.ErrSQLConnectionUnavailable):
code = "DATABASE_MIGRATION_CONNECTION_UNAVAILABLE"
status = http.StatusServiceUnavailable
message = "数据库连接暂不可用,请检查数据库配置和服务状态"
case errors.Is(err, dbmigration.ErrSQLUnsupportedObject):
code = "DATABASE_MIGRATION_UNSUPPORTED_OBJECT"
status = http.StatusUnprocessableEntity
message = "源数据库包含暂不支持迁移的对象,请先处理后重试"
case errors.Is(err, dbmigration.ErrSQLDataVerification):
code = "SQL_DATA_VERIFICATION_FAILED"
status = http.StatusConflict
message = "数据库迁移数据校验未通过,源数据库可能在迁移期间发生变化"
case errors.Is(err, dbmigration.ErrSQLSourceBusy):
code = "SQL_SOURCE_BUSY"
status = http.StatusConflict
message = "源数据库存在活动连接,请停止相关连接后重试迁移"
case errors.Is(err, dbmigration.ErrUnsupportedDatabase):
code = "DATABASE_MIGRATION_UNSUPPORTED"
status = http.StatusUnprocessableEntity
message = "当前数据库类型暂不支持在线迁移"
case errors.Is(err, dbmigration.ErrMigrationState):
code = "DATABASE_MIGRATION_STATE_INVALID"
status = http.StatusConflict
@@ -101,7 +141,7 @@ func configErrorDetails(err error) (string, int, string, map[string]string) {
code = "DATABASE_MIGRATION_PREVIEW_INVALID"
status = http.StatusForbidden
message = "数据库迁移预览票据无效"
case errors.Is(err, dbmigration.ErrInvalidRequest), errors.Is(err, dbmigration.ErrInvalidTargetName), errors.Is(err, dbmigration.ErrImmutableSetting), errors.Is(err, dbmigration.ErrSourceDatabase):
case errors.Is(err, config.ErrDatabaseMigrationTarget), errors.Is(err, dbmigration.ErrInvalidRequest), errors.Is(err, dbmigration.ErrInvalidTargetName), errors.Is(err, dbmigration.ErrImmutableSetting), errors.Is(err, dbmigration.ErrSourceDatabase):
code = "DATABASE_MIGRATION_VALIDATION_FAILED"
status = http.StatusUnprocessableEntity
message = "数据库迁移参数校验未通过"
+77
View File
@@ -10,6 +10,7 @@ import (
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/access"
"git.pcux.cn/xuans/Smail/services/dbmigration"
)
func TestWriteConfigErrorKeepsStableAuthorizationCode(t *testing.T) {
@@ -90,3 +91,79 @@ func TestWriteConfigErrorUsesStableCodeAndHTTPStatus(t *testing.T) {
t.Fatalf("configuration error message is not a Chinese public message: %q", payload.ErrorMsg)
}
}
func TestConfigErrorDetailsMapsDatabaseMigrationFailures(t *testing.T) {
tests := []struct {
name string
err error
code string
status int
message string
}{
{
name: "invalid target",
err: config.ErrDatabaseMigrationTarget,
code: "DATABASE_MIGRATION_VALIDATION_FAILED",
status: 422,
message: "数据库迁移参数校验未通过",
},
{
name: "structured target exists",
err: dbmigration.ErrSQLTargetExists,
code: "DATABASE_MIGRATION_TARGET_EXISTS",
status: 409,
message: "目标数据库已存在,请更换数据库名称",
},
{
name: "copier unavailable",
err: dbmigration.ErrSQLCopyUnavailable,
code: "DATABASE_MIGRATION_COPIER_UNAVAILABLE",
status: 503,
message: "数据库迁移复制器暂不可用,请先完成服务部署",
},
{
name: "connection unavailable",
err: dbmigration.ErrSQLConnectionUnavailable,
code: "DATABASE_MIGRATION_CONNECTION_UNAVAILABLE",
status: 503,
message: "数据库连接暂不可用,请检查数据库配置和服务状态",
},
{
name: "unsupported object",
err: dbmigration.ErrSQLUnsupportedObject,
code: "DATABASE_MIGRATION_UNSUPPORTED_OBJECT",
status: 422,
message: "源数据库包含暂不支持迁移的对象,请先处理后重试",
},
{
name: "data verification failed",
err: dbmigration.ErrSQLDataVerification,
code: "SQL_DATA_VERIFICATION_FAILED",
status: 409,
message: "数据库迁移数据校验未通过,源数据库可能在迁移期间发生变化",
},
{
name: "source busy",
err: dbmigration.ErrSQLSourceBusy,
code: "SQL_SOURCE_BUSY",
status: 409,
message: "源数据库存在活动连接,请停止相关连接后重试迁移",
},
{
name: "switch outcome unknown",
err: dbmigration.ErrSwitchOutcomeUnknown,
code: "SWITCH_OUTCOME_UNKNOWN",
status: 503,
message: "数据库迁移配置切换结果暂不确定,请先确认当前配置和目标数据库状态",
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
code, status, message, fields := configErrorDetails(test.err)
if code != test.code || status != test.status || message != test.message || fields != nil {
t.Fatalf("config error details = (%q, %d, %q, %#v), want (%q, %d, %q, nil)", code, status, message, fields, test.code, test.status, test.message)
}
})
}
}
+1 -1
View File
@@ -69,7 +69,7 @@ func ExecuteDatabaseMigration(ctx *appcontext.Context, w http.ResponseWriter, re
writeConfigError(w, dbmigration.ErrInvalidRequest)
return
}
record, err := dbmigration.Current().Execute(req.Context(), input.ID, input.Token)
record, err := dbmigration.Current().ExecuteAuthorized(req.Context(), input.ID, input.Token, configActor(ctx, req))
if err != nil {
writeConfigError(w, err)
return