保存恢复并发修复与协议回归作为前端整改检查点
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-17 12:14:59 +08:00
1 parent b4f5f51c0e
commit ce8285f7cc
7 files changed
+343 -1

No files matched your search

@@ -0,0 +1,52 @@
package credentials
import (
"testing"
"time"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/password"
)
func TestClientCodeRejectsStateChangedDuringVerification(t *testing.T) {
for _, change := range []string{"revoke", "rotate"} {
t.Run(change, func(t *testing.T) {
service := newFixture(t)
if err := service.engine.Sync2(&models.ClientCredential{}); err != nil {
t.Fatal(err)
}
code, item, err := service.CreateClientCredential(1, "撤销竞态验收")
if err != nil {
t.Fatal(err)
}
const replacement = "ABCD1234EFGH5678"
hash, err := password.Hash(replacement)
if err != nil {
t.Fatal(err)
}
now := service.now
changed := false
// 在哈希匹配之后、更新最后使用时间之前注入已完成的撤销或换码。
service.now = func() time.Time {
service.now = now
changed = true
if change == "revoke" {
if err := service.RevokeClientCredential(1, item.ID); err != nil {
t.Fatal(err)
}
} else if _, err := service.engine.ID(item.ID).Cols("code_hash", "code_version").Update(&models.ClientCredential{CodeHash: hash, CodeVersion: item.CodeVersion + 1}); err != nil {
t.Fatal(err)
}
return now()
}
if matched, err := service.CheckClientOrProtocolCode(1, ProtocolSMTP, code); matched || err != nil || !changed {
t.Fatalf("已失效授权码通过认证:匹配=%v,状态已变=%v,错误=%v", matched, changed, err)
}
if change == "rotate" {
if matched, err := service.CheckClientOrProtocolCode(1, ProtocolSMTP, replacement); !matched || err != nil {
t.Fatalf("新授权码不可用:%v", err)
}
}
})
}
}
+139
View File
@@ -3,8 +3,12 @@ package recovery
import (
"errors"
"testing"
"time"
"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/verification"
"git.pcux.cn/xuans/Smail/utils/password"
)
@@ -45,3 +49,138 @@ func TestRecoveryBusyDoesNotRestoreRevokedTicket(t *testing.T) {
t.Fatalf("撤销的票据被恢复:%v", err)
}
}
func TestEmailContinuationBusyPreservesAttemptsAndCode(t *testing.T) {
service, verify, engine, user := newRecoveryFixture(t)
user.ApplyRole(access.RoleAdmin)
if _, err := engine.ID(user.ID).Cols("role", "is_admin").Update(user); err != nil {
t.Fatal(err)
}
codes, err := service.credentials.GenerateRecoveryCodes(user.ID, 5)
if err != nil {
t.Fatal(err)
}
var code string
verify.Send = func(_ verification.Challenge, issued string) error { code = issued; return nil }
challenge, err := service.Begin(BeginRequest{Identifier: user.Account, Email: "alice@example.com", BrowserContext: "capacity-browser"}, "192.0.2.80")
if err != nil {
t.Fatal(err)
}
result, err := service.VerifyEmailStepWithContext(challenge, user.Account, "alice@example.com", code, "192.0.2.80", "capacity-browser")
if err != nil || !result.RequiresRecoveryCode || result.Continuation == "" {
t.Fatalf("管理员邮箱验证未生成中间凭证:%v", err)
}
release := passwordtest.Hold(t)
for index := 0; index < 12; index++ {
if _, err := service.ContinueEmailWithContext(result.Continuation, user.Account, "alice@example.com", codes[0], "capacity-browser"); !errors.Is(err, password.ErrBusy) {
t.Fatalf("繁忙时中间凭证不可重试:%v", err)
}
}
pending := service.emailPending[ticketKey(result.Continuation)]
if pending == nil || pending.Busy || pending.Attempts != 0 {
t.Fatal("繁忙误计失败次数或未释放中间凭证")
}
release()
ticketID, err := service.ContinueEmailWithContext(result.Continuation, user.Account, "alice@example.com", codes[0], "capacity-browser")
if err != nil || ticketID == "" {
t.Fatalf("繁忙结束后无法继续恢复:%v", err)
}
if _, err := service.ContinueEmailWithContext(result.Continuation, user.Account, "alice@example.com", codes[0], "capacity-browser"); !errors.Is(err, ErrRecoveryExpired) {
t.Fatalf("中间凭证被重复使用:%v", err)
}
if err := service.CompleteWithContext(ticketID, "NewPass123", "capacity-browser"); err != nil {
t.Fatal(err)
}
}
func TestPublicLinkBusyPreservesAttemptsAndSingleUse(t *testing.T) {
for _, role := range []access.Role{access.RoleUser, access.RoleAdmin} {
t.Run(string(role), func(t *testing.T) {
service, _, engine, user := newRecoveryFixture(t)
user.ApplyRole(role)
if _, err := engine.ID(user.ID).Cols("role", "is_admin").Update(user); err != nil {
t.Fatal(err)
}
var recoveryCode string
if role == access.RoleAdmin {
codes, err := service.credentials.GenerateRecoveryCodes(user.ID, 5)
if err != nil {
t.Fatal(err)
}
recoveryCode = codes[0]
}
var token string
service.SetPublicLinkDelivery(func(_ string, issued string) error { token = issued; return nil })
if err := service.BeginPublicLink(user.Account); err != nil || token == "" {
t.Fatalf("未生成恢复链接:%v", err)
}
release := passwordtest.Hold(t)
for index := 0; index < 12; index++ {
if err := service.CompletePublicLink(token, "NewPass123", recoveryCode); !errors.Is(err, password.ErrBusy) {
t.Fatalf("繁忙时链接不可重试:%v", err)
}
}
pending := service.publicTickets[ticketKey(token)]
if pending == nil || pending.Busy || pending.Attempts != 0 {
t.Fatal("繁忙误计失败次数或未释放链接")
}
release()
if err := service.CompletePublicLink(token, "NewPass123", recoveryCode); err != nil {
t.Fatal(err)
}
if err := service.CompletePublicLink(token, "NextPass12", recoveryCode); !errors.Is(err, ErrRecoveryExpired) {
t.Fatalf("恢复链接被重复使用:%v", err)
}
var stored models.User
if found, err := engine.ID(user.ID).Get(&stored); err != nil || !found || stored.SessionVersion != user.SessionVersion+1 {
t.Fatalf("重置未撤销旧会话版本:%v", err)
}
if matched, err := password.Check(stored.Password, "NewPass123"); !matched || err != nil {
t.Fatalf("新密码不可用:%v", err)
}
})
}
}
func TestPublicLinkBusyDuringCodeCheckRollsBack(t *testing.T) {
service, _, engine, user := newRecoveryFixture(t)
user.ApplyRole(access.RoleAdmin)
if _, err := engine.ID(user.ID).Cols("role", "is_admin").Update(user); err != nil {
t.Fatal(err)
}
codes, err := service.credentials.GenerateRecoveryCodes(user.ID, 5)
if err != nil {
t.Fatal(err)
}
var token string
service.SetPublicLinkDelivery(func(_ string, issued string) error { token = issued; return nil })
if err := service.BeginPublicLink(user.Account); err != nil {
t.Fatal(err)
}
now, calls := service.now, 0
var release func()
// 第二次读取时钟位于新密码哈希之后、恢复码事务之前。
service.now = func() time.Time {
calls++
if calls == 2 {
release = passwordtest.Hold(t)
}
return now()
}
if err := service.CompletePublicLink(token, "NewPass123", codes[0]); !errors.Is(err, password.ErrBusy) || release == nil {
t.Fatalf("未覆盖事务内恢复码繁忙分支:%v", err)
}
service.now = now
release()
pending := service.publicTickets[ticketKey(token)]
if pending == nil || pending.Busy || pending.Attempts != 0 {
t.Fatal("恢复码繁忙错误地消耗了链接尝试次数")
}
var stored models.User
if found, err := engine.ID(user.ID).Get(&stored); err != nil || !found || stored.Password != user.Password || stored.SessionVersion != user.SessionVersion {
t.Fatalf("繁忙事务未保持原密码和会话版本:%v", err)
}
if err := service.CompletePublicLink(token, "NewPass123", codes[0]); err != nil {
t.Fatalf("事务繁忙后同一链接及恢复码不可用:%v", err)
}
}
+1 -1
View File
@@ -360,7 +360,7 @@ func (s *Service) CompleteWithContext(ticketID, newPassword, browserContext stri
}
if item.Busy {
s.mu.Unlock()
return ErrRecoveryDenied
return ErrRecoveryExpired
}
if item.HasBrowserContextDigest {
providedDigest := sha256.Sum256([]byte(strings.TrimSpace(browserContext)))