保存认证容量保护整改检查点待远程复审
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-17 12:00:45 +08:00
1 parent 0177de8a9f
commit b4f5f51c0e
27 files changed
+721 -53

No files matched your search

@@ -0,0 +1,47 @@
package recovery
import (
"errors"
"testing"
"git.pcux.cn/xuans/Smail/internal/passwordtest"
"git.pcux.cn/xuans/Smail/utils/password"
)
func TestRecoveryBusyPreservesTicket(t *testing.T) {
service, _, _, user := newRecoveryFixture(t)
ticketID, err := service.issueTicket(user.ID, user.SessionVersion)
if err != nil {
t.Fatal(err)
}
release := passwordtest.Hold(t)
for index := 0; index < 12; index++ {
if err := service.Complete(ticketID, "NewPass123"); !errors.Is(err, password.ErrBusy) {
t.Fatalf("繁忙期间票据失效或返回错误:%v", err)
}
}
release()
if err := service.Complete(ticketID, "NewPass123"); err != nil {
t.Fatalf("繁忙恢复后不能使用原票据:%v", err)
}
if err := service.Complete(ticketID, "OtherPass12"); !errors.Is(err, ErrRecoveryExpired) {
t.Fatalf("成功后票据未保持一次性:%v", err)
}
}
func TestRecoveryBusyDoesNotRestoreRevokedTicket(t *testing.T) {
service, _, _, user := newRecoveryFixture(t)
ticketID, err := service.issueTicket(user.ID, user.SessionVersion)
if err != nil {
t.Fatal(err)
}
release := passwordtest.Hold(t)
if err := service.Complete(ticketID, "NewPass123"); !errors.Is(err, password.ErrBusy) {
t.Fatal(err)
}
service.InvalidateUser(user.ID)
release()
if err := service.Complete(ticketID, "NewPass123"); !errors.Is(err, ErrRecoveryExpired) {
t.Fatalf("撤销的票据被恢复:%v", err)
}
}
+10
View File
@@ -3,10 +3,12 @@ package recovery
import (
"crypto/sha256"
"crypto/subtle"
"errors"
"strings"
"git.pcux.cn/xuans/Smail/services/access"
"git.pcux.cn/xuans/Smail/services/auth"
"git.pcux.cn/xuans/Smail/utils/password"
)
const maxEmailContinuationAttempts = 5
@@ -93,10 +95,14 @@ func (s *Service) ContinueEmailWithContext(continuation, identifier, email, reco
// 数据库和恢复码哈希验证不占用全局锁;同一凭证同时只能有一个请求验证。
invalidate := false
busy := false
defer func() {
s.mu.Lock()
defer s.mu.Unlock()
if s.emailPending[key] == pending {
if busy {
pending.Attempts--
}
if invalidate || pending.Attempts >= maxEmailContinuationAttempts {
delete(s.emailPending, key)
} else {
@@ -115,6 +121,10 @@ func (s *Service) ContinueEmailWithContext(continuation, identifier, email, reco
return "", ErrRecoveryDenied
}
if err := s.credentials.ConsumeRecoveryCode(user.ID, recoveryCode); err != nil {
if errors.Is(err, password.ErrBusy) {
busy = true
return "", err
}
return "", ErrRecoveryDenied
}
invalidate = true
+4
View File
@@ -1,6 +1,7 @@
package recovery
import (
"errors"
"fmt"
"strings"
"time"
@@ -203,6 +204,9 @@ func (s *Service) CompletePublicLink(token, newPassword, recoveryCode string) er
}()
if user.EffectiveRole() == access.RoleAdmin {
if err := s.credentials.ConsumeRecoveryCodeWithSession(session, user.ID, recoveryCode); err != nil {
if errors.Is(err, password.ErrBusy) {
return err
}
if s.recordPublicRecoveryCodeFailure(key, item) {
consume = true
}
+41 -4
View File
@@ -63,6 +63,7 @@ type Service struct {
}
type ticket struct {
Busy bool
UserID int
SessionVersion int
Method string
@@ -249,6 +250,9 @@ func (s *Service) VerifyWithContext(challengeID, account, email, code, recoveryC
return "", ErrRecoveryDenied
}
if err := s.credentials.ConsumeRecoveryCode(user.ID, recoveryCode); err != nil {
if errors.Is(err, password.ErrBusy) {
return "", err
}
return "", ErrRecoveryDenied
}
method = "email_admin"
@@ -297,17 +301,26 @@ func (s *Service) VerifyOfflineWithContext(identifier, question, answer, recover
}
user, err := s.loadRecoverableUser(identifier)
if err != nil {
password.VerifyDummy(answer)
password.VerifyDummy(recoveryCode)
if err := password.CheckDummy(answer); err != nil {
return "", err
}
if err := password.CheckDummy(recoveryCode); err != nil {
return "", err
}
return "", ErrRecoveryDenied
}
storedQuestion, configured, questionErr := s.credentials.GetSecurityQuestion(user.ID)
answerVerified, answerErr := s.credentials.VerifySecurityQuestion(user.ID, answer)
if errors.Is(answerErr, password.ErrBusy) {
return "", answerErr
}
providedQuestionDigest := sha256.Sum256([]byte(strings.TrimSpace(question)))
storedQuestionDigest := sha256.Sum256([]byte(strings.TrimSpace(storedQuestion)))
questionVerified := configured && subtle.ConstantTimeCompare(providedQuestionDigest[:], storedQuestionDigest[:]) == 1
if questionErr != nil || answerErr != nil || !questionVerified || !answerVerified {
password.VerifyDummy(recoveryCode)
if err := password.CheckDummy(recoveryCode); err != nil {
return "", err
}
return "", ErrRecoveryDenied
}
ticketID, err := s.issueTicketFor(user.ID, user.SessionVersion, "offline", 0, 0, browserContext)
@@ -316,6 +329,9 @@ func (s *Service) VerifyOfflineWithContext(identifier, question, answer, recover
}
if err := s.credentials.ConsumeRecoveryCode(user.ID, recoveryCode); err != nil {
s.invalidateTicket(ticketID)
if errors.Is(err, password.ErrBusy) {
return "", err
}
return "", ErrRecoveryDenied
}
return ticketID, nil
@@ -342,6 +358,10 @@ func (s *Service) CompleteWithContext(ticketID, newPassword, browserContext stri
s.mu.Unlock()
return ErrRecoveryExpired
}
if item.Busy {
s.mu.Unlock()
return ErrRecoveryDenied
}
if item.HasBrowserContextDigest {
providedDigest := sha256.Sum256([]byte(strings.TrimSpace(browserContext)))
if strings.TrimSpace(browserContext) == "" || subtle.ConstantTimeCompare(providedDigest[:], item.BrowserContextDigest[:]) != 1 {
@@ -349,11 +369,28 @@ func (s *Service) CompleteWithContext(ticketID, newPassword, browserContext stri
return ErrRecoveryDenied
}
}
delete(s.tickets, ticketDigest)
item.Busy = true
s.tickets[ticketDigest] = item
s.mu.Unlock()
// 过载时保留同一张有效票据,已失效或已被撤销的票据不得恢复。
retry := false
defer func() {
s.mu.Lock()
defer s.mu.Unlock()
if current, exists := s.tickets[ticketDigest]; exists && current == item {
if retry && s.now().Before(item.ExpiresAt) {
item.Busy = false
s.tickets[ticketDigest] = item
} else {
delete(s.tickets, ticketDigest)
}
}
}()
hash, err := auth.HashPassword(newPassword)
if err != nil {
retry = errors.Is(err, password.ErrBusy)
return err
}
defer clearString(&hash)