修复恢复码请求取消并完成最终迁移补充验收
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-21 20:26:50 +08:00
1 parent 586f2bca19
commit 7114e9ed4a
13 files changed
+587 -10

No files matched your search

+14
View File
@@ -0,0 +1,14 @@
package controllers
import (
"context"
"net/http"
)
// recoveryRequestContext 保留请求的取消信号;兼容无 HTTP 请求的内部调用。
func recoveryRequestContext(req *http.Request) context.Context {
if req == nil {
return context.Background()
}
return req.Context()
}
@@ -0,0 +1,94 @@
package controllers
import (
"context"
"encoding/json"
"net/http"
"net/http/httptest"
"path/filepath"
"strconv"
"strings"
"testing"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/internal/passwordtest"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/access"
"git.pcux.cn/xuans/Smail/services/credentials"
appcontext "git.pcux.cn/xuans/Smail/utils/context"
"xorm.io/xorm"
)
func TestRecoveryGenerationHandlersForwardRequestCancellation(t *testing.T) {
engine, err := xorm.NewEngine("sqlite", filepath.Join(t.TempDir(), "cancel.db"))
if err != nil {
t.Fatal(err)
}
oldDB, oldSecurity := db.Instance, securityRuntime
t.Cleanup(func() { db.Instance = oldDB; securityRuntime = oldSecurity; _ = engine.Close() })
if err := engine.Sync2(&models.User{}, &models.RecoveryCode{}); err != nil {
t.Fatal(err)
}
user := models.User{Account: "cancel-user", Role: string(access.RoleUser)}
if _, err := engine.Insert(&user); err != nil {
t.Fatal(err)
}
if _, err := engine.Insert(&models.RecoveryCode{UserID: user.ID, CodeHash: "original-hash", CodeVersion: 1}); err != nil {
t.Fatal(err)
}
service, err := credentials.NewService(engine)
if err != nil {
t.Fatal(err)
}
db.Instance = engine
ConfigureSecurityRuntime(nil, nil, nil, service)
actor := &appcontext.Context{UserID: user.ID, Role: access.RoleSuperAdmin, RecentAuth: true, RecoveryCodeConfigured: true}
for _, item := range []struct {
name string
handler func(*appcontext.Context, http.ResponseWriter, *http.Request)
}{{"self", GenerateRecoveryCodes}, {"managed", GenerateManagedRecoveryCodes}} {
t.Run(item.name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
cancel()
request := httptest.NewRequest(http.MethodPost, "/api/security", strings.NewReader(`{"user_id":`+strconv.Itoa(user.ID)+`,"count":10}`)).WithContext(ctx)
recorder := httptest.NewRecorder()
item.handler(actor, recorder, request)
var result response.Response
if err := json.Unmarshal(recorder.Body.Bytes(), &result); err != nil {
t.Fatal(err)
}
if result.ErrorNo == 0 {
t.Fatal("已取消的请求返回了成功")
}
var rows []models.RecoveryCode
if err := engine.Find(&rows); err != nil {
t.Fatal(err)
}
if len(rows) != 1 || rows[0].CodeHash != "original-hash" || rows[0].UsedAt != nil {
t.Fatal("已取消请求轮换了恢复码")
}
})
}
// 资源繁忙必须返回可重试状态,不能把它当作凭据错误。
release := passwordtest.Hold(t)
defer release()
request := httptest.NewRequest(http.MethodPost, "/api/security", strings.NewReader(`{"user_id":`+strconv.Itoa(user.ID)+`,"count":10}`))
recorder := httptest.NewRecorder()
GenerateManagedRecoveryCodes(actor, recorder, request)
if recorder.Code != http.StatusServiceUnavailable || recorder.Header().Get("Retry-After") != "1" || !strings.Contains(recorder.Body.String(), "AUTH_BUSY") {
t.Fatal("管理恢复码入口没有传递可重试繁忙状态")
}
}
func TestRecoveryRequestContextPreservesDeadline(t *testing.T) {
if recoveryRequestContext(nil).Err() != nil {
t.Fatal("无请求的兼容上下文不可用")
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
request := httptest.NewRequest(http.MethodPost, "/", nil).WithContext(ctx)
if recoveryRequestContext(request) != ctx {
t.Fatal("HTTP 上下文被替换")
}
}
+1 -1
View File
@@ -321,7 +321,7 @@ func GenerateRecoveryCodes(ctx *context.Context, w http.ResponseWriter, req *htt
writeSecurityError(w, response.ServerError, "安全凭据服务不可用")
return
}
codes, err := service.GenerateRecoveryCodes(ctx.UserID, input.Count)
codes, err := service.GenerateRecoveryCodesContext(recoveryRequestContext(req), ctx.UserID, input.Count)
if err != nil {
if writePasswordBusy(w, err) {
return
+4 -1
View File
@@ -109,8 +109,11 @@ func GenerateManagedRecoveryCodes(ctx *context.Context, w http.ResponseWriter, r
writeSecurityError(w, response.ServerError, "安全凭据服务不可用")
return
}
codes, err := service.GenerateRecoveryCodes(target.ID, input.Count)
codes, err := service.GenerateRecoveryCodesContext(recoveryRequestContext(req), target.ID, input.Count)
if err != nil {
if writePasswordBusy(w, err) {
return
}
log.WithContext(ctx).WithError(err).Error("generate managed recovery codes failed")
writeSecurityError(w, response.ParamsError, "安全码生成失败")
return