Round 2 Loop A fresh money/security/dup-mod review. 23 findings fixed: MONEY: - CRITICAL: B1 duplicate auto-refund gains an attempt cap (b1_attempts col, cap 3) — a rejected auto-refund no longer re-replays the expired key every sweep run (which minted a stacking unauthorized charge each time); FAILED-webhook demotion respects the cap; never re-replay a key whose B1 refund failed - HIGH: A6 deposit_covered_by_discount skip path now APPLIES the eligible campaign discount rows immediately (capped) instead of skipping with no discount recorded — no more promised-discount-not-recorded overcharge - MEDIUM: 2FA code burned by the SAVE gate is re-issued on failed new-card+save_card charges (re-issue guard now covers req.SaveCard) - LOW: GetBookingPaymentSummary excludes tip rows from paidAmount (remaining now matches the authoritative tip-excluded balance) SECURITY: - MEDIUM: unacknowledged CRITICAL admin-notification flood capped (global cap on critical_payment_log + refresh_token_reuse rows) - MEDIUM: 2FA reissue no longer bypasses the mint cooldown (Check no longer clears LastMintAt on gate-verify; cleared on terminal charge success) - MEDIUM: twofa.StateFor map-saturation returns a shared permanently-locked state instead of a fresh 5-guess budget per request - MEDIUM: ProgressiveRateLimit rejects 429 past maxProgressiveSleepDelayMs instead of sleeping unboundedly; login bcrypt concurrency semaphore added - LOW: loginInProgress 409->429; webhook key-set/URL-unset startup check; email-verification per-user attempt counter DUP/MOD: - formatCurrency single source (frontend format.ts, 7 files consolidated); SquareRefundStatusToLocal single source (errors.go, all sites); admin audit-log helper dedup; SCA retry model unified (proactive on all 6 surfaces); buyDailyTotal/daily-cap mirror via backend; lock TTL from backend; generateUUID at all card-form sites; magic numbers named (defaultPostgresHost, epsilon, fee constants); admin CASH + gift-card terminal charges now audited; DAV_SKIP_INIT documented in manuals Verified: 26/26 dev + 24/24 prod (GO_TESTING=1, the CI condition), both vet tags, frontend tests+build, env-docs 42/42.
226 lines
9.8 KiB
Go
226 lines
9.8 KiB
Go
//go:build test
|
|
|
|
package twofa
|
|
|
|
// Tests for the shared 2FA verification core (the package the payments
|
|
// card-access gate — B6/B10 — imports for real-challenge verification).
|
|
// The pepper provider is never registered here (handlers/user's build-tagged
|
|
// files register it), so Hash falls back to the legacy plain SHA-256 digest —
|
|
// which is exactly what the seeded pending-code hashes use.
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"testing"
|
|
"time"
|
|
|
|
"crussell/clock"
|
|
"crussell/db"
|
|
"crussell/testutils"
|
|
"crussell/testutils/fixtures"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func seedPending(t *testing.T, ctx context.Context, tx db.Querier, userID, code string) {
|
|
t.Helper()
|
|
_, err := tx.Exec(ctx, `UPDATE users
|
|
SET two_factor_method = 'email',
|
|
two_factor_pending_code_hash = $2,
|
|
two_factor_pending_code_expires = $3
|
|
WHERE id = $1`, userID, Hash(code), clock.Now().Add(10*time.Minute))
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
func TestVerifyForUser_CorrectAndWrongCode(t *testing.T) {
|
|
ctx, tx := testutils.SetupTestTx(t)
|
|
|
|
// consume=false (interactive setup/disable path): a success keeps the
|
|
// pending code valid, so a wrong follow-up code reports ErrIncorrect.
|
|
userID, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID, "123456")
|
|
require.NoError(t, VerifyForUser(ctx, userID, "123456", DeferredConsume), "correct code must verify")
|
|
require.ErrorIs(t, VerifyForUser(ctx, userID, "999999", DeferredConsume), ErrIncorrect)
|
|
|
|
// consume=true (payments saved-card gate path): a success DESTROYS the
|
|
// pending code, so re-verifying the same code reports ErrMissingOrExpired
|
|
// — a verified code is single-use and cannot authorize a second charge.
|
|
userID2, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID2, "123456")
|
|
require.NoError(t, VerifyForUser(ctx, userID2, "123456", ConsumeOnVerify), "correct code must verify")
|
|
require.ErrorIs(t, VerifyForUser(ctx, userID2, "123456", ConsumeOnVerify), ErrMissingOrExpired, "a consumed code must be single-use")
|
|
var pendingHash sql.NullString
|
|
require.NoError(t, tx.QueryRow(ctx, "SELECT two_factor_pending_code_hash FROM users WHERE id = $1", userID2).Scan(&pendingHash))
|
|
require.False(t, pendingHash.Valid, "a consumed code must be NULLed in the DB")
|
|
}
|
|
|
|
func TestVerifyForUser_LockoutAndMissing(t *testing.T) {
|
|
ctx, tx := testutils.SetupTestTx(t)
|
|
userID, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID, "123456")
|
|
|
|
// Wrong code #1 → ErrIncorrect; four more reach the 5-attempt cap.
|
|
require.ErrorIs(t, VerifyForUser(ctx, userID, "999999", ConsumeOnVerify), ErrIncorrect)
|
|
for i := 0; i < 4; i++ {
|
|
_ = VerifyForUser(ctx, userID, "999999", ConsumeOnVerify)
|
|
}
|
|
require.ErrorIs(t, VerifyForUser(ctx, userID, "999999", ConsumeOnVerify), ErrLockedOut)
|
|
|
|
// A fresh user with no pending code → ErrMissingOrExpired.
|
|
userID2, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
require.ErrorIs(t, VerifyForUser(ctx, userID2, "123456", ConsumeOnVerify), ErrMissingOrExpired)
|
|
}
|
|
|
|
// TestVerifyForUser_ConsumeOnVerifyConcurrency pins the finding-1 contract: a
|
|
// code verified with ConsumeOnVerify authorizes exactly ONE operation. Even
|
|
// though the per-user mutex serializes the critical section (so no test can
|
|
// actually race it), the observable guarantee is that the first verify burns the
|
|
// code and any subsequent verify of the same code fails with
|
|
// ErrMissingOrExpired — two concurrent charge gates can never both pass.
|
|
func TestVerifyForUser_ConsumeOnVerifyConcurrency(t *testing.T) {
|
|
ctx, tx := testutils.SetupTestTx(t)
|
|
userID, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID, "424242")
|
|
|
|
// Two "concurrent" charge-gate verifies of the same code, serialized by
|
|
// StateFor's per-user mutex exactly as the payments gate would experience
|
|
// them. Only the first may succeed.
|
|
require.NoError(t, VerifyForUser(ctx, userID, "424242", ConsumeOnVerify), "first charge gate must verify")
|
|
require.ErrorIs(t, VerifyForUser(ctx, userID, "424242", ConsumeOnVerify), ErrMissingOrExpired,
|
|
"second charge gate with the same code must fail — one code, one charge")
|
|
}
|
|
|
|
// TestVerifyForUser_SuccessClearsLoginLockout pins LOW 6b: a successful 2FA
|
|
// verify lifts any password-guessing login lockout (users.failed_attempts /
|
|
// locked_until) because a correct code proves control of the second factor.
|
|
func TestVerifyForUser_SuccessClearsLoginLockout(t *testing.T) {
|
|
ctx, tx := testutils.SetupTestTx(t)
|
|
userID, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID, "123456")
|
|
|
|
_, err = tx.Exec(ctx, `UPDATE users SET failed_attempts = 9, locked_until = NOW() + INTERVAL '30 minutes' WHERE id = $1`, userID)
|
|
require.NoError(t, err)
|
|
|
|
require.NoError(t, VerifyForUser(ctx, userID, "123456", ConsumeOnVerify))
|
|
|
|
var failedAttempts int
|
|
var lockedUntil *time.Time
|
|
require.NoError(t, tx.QueryRow(ctx, `SELECT failed_attempts, locked_until FROM users WHERE id = $1`, userID).Scan(&failedAttempts, &lockedUntil))
|
|
require.Zero(t, failedAttempts, "successful 2FA verify must reset the login lockout counter")
|
|
require.Nil(t, lockedUntil, "successful 2FA verify must clear locked_until")
|
|
}
|
|
|
|
// TestConsumePendingCode pins the MEDIUM-2 contract: ConsumePendingCode NULLs
|
|
// the stored pending-code digest and expiry (idempotently), and is the ONLY
|
|
// place a verified-but-unconsumed code dies on the saved-card charge path.
|
|
func TestConsumePendingCode(t *testing.T) {
|
|
ctx, tx := testutils.SetupTestTx(t)
|
|
userID, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID, "123456")
|
|
|
|
// A code verified WITHOUT consuming stays valid (the saved-card charge gate
|
|
// path, MEDIUM-2) — re-verification must keep working until consumption.
|
|
require.NoError(t, VerifyForUser(ctx, userID, "123456", false), "verify-without-consume must pass")
|
|
require.NoError(t, VerifyForUser(ctx, userID, "123456", false), "an unconsumed code must still verify on a same-key retry")
|
|
|
|
require.NoError(t, ConsumePendingCode(ctx, tx, userID), "explicit consumption at charge success must succeed")
|
|
require.ErrorIs(t, VerifyForUser(ctx, userID, "123456", false), ErrMissingOrExpired, "a consumed code must no longer verify")
|
|
|
|
// Consumption is idempotent — a second call (e.g. a retried completed
|
|
// charge) is a no-op, never an error.
|
|
require.NoError(t, ConsumePendingCode(ctx, tx, userID), "consuming an already-consumed code must be a no-op")
|
|
|
|
// An unknown user is a no-op too.
|
|
require.NoError(t, ConsumePendingCode(ctx, tx, "000000000000"))
|
|
}
|
|
|
|
// TestVerifyForUser_AttemptStateMapPersists exercises the shared per-user
|
|
// attempt map directly (the state the payments gate shares with the interactive
|
|
// endpoints): the map is bounded and a locked-out record is never evicted.
|
|
// Round 2 Loop A finding 3: when the map is full of in-window locked-out
|
|
// records, a new untracked user gets the SHARED permanently-locked state —
|
|
// treated as locked out, not handed a fresh 5-guess budget per request.
|
|
func TestVerifyForUser_AttemptStateMapPersists(t *testing.T) {
|
|
t.Cleanup(func() {
|
|
MapMu.Lock()
|
|
Map = make(map[string]*AttemptState)
|
|
MaxTrackedAttempts = 10_000
|
|
MapMu.Unlock()
|
|
})
|
|
|
|
MapMu.Lock()
|
|
Map = make(map[string]*AttemptState)
|
|
MaxTrackedAttempts = 2
|
|
MapMu.Unlock()
|
|
|
|
// Fill the map with locked-out records; a new key must NOT evict one.
|
|
now := clock.Now()
|
|
for _, id := range []string{"victim_a", "victim_b"} {
|
|
st := &AttemptState{}
|
|
st.SetLastActive(now)
|
|
st.Count.Store(MaxAttempts)
|
|
Map[id] = st
|
|
}
|
|
st := StateFor("new_user") // saturated — shared permanently-locked state
|
|
require.True(t, st.LockedOut(clock.Now()), "an untracked user under map saturation must be treated as locked out")
|
|
MapMu.Lock()
|
|
defer MapMu.Unlock()
|
|
require.Len(t, Map, 2, "locked-out records must survive the cap pressure")
|
|
}
|
|
|
|
// TestVerifyForUser_SuccessPreservesMintCooldownStamp pins Round 2 Loop A
|
|
// finding 2: a successful verify must NOT clear the per-user mint-cooldown
|
|
// stamp (LastMintAt), so the payments re-issue path
|
|
// (reissueTwoFACodeAfterFailedCharge) can enforce its 60s cooldown against a
|
|
// charge-failure loop. Previously Check cleared the stamp on every verify,
|
|
// letting a fresh charge that failed at Square mint a new code per iteration
|
|
// with no cooldown. The stamp is cleared only at terminal success via
|
|
// ConsumePendingCode (see TestConsumePendingCode_ClearsMintCooldownStamp).
|
|
func TestVerifyForUser_SuccessPreservesMintCooldownStamp(t *testing.T) {
|
|
ctx, tx := testutils.SetupTestTx(t)
|
|
userID, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID, "123456")
|
|
|
|
st := StateFor(userID)
|
|
st.Mu.Lock()
|
|
st.LastMintAt = clock.Now().Add(-10 * time.Second)
|
|
st.Mu.Unlock()
|
|
|
|
require.NoError(t, VerifyForUser(ctx, userID, "123456", DeferredConsume), "correct code must verify")
|
|
|
|
st.Mu.Lock()
|
|
defer st.Mu.Unlock()
|
|
require.False(t, st.LastMintAt.IsZero(), "a successful verify must preserve the mint-cooldown stamp (finding 2)")
|
|
}
|
|
|
|
// TestConsumePendingCode_ClearsMintCooldownStamp pins the other half of finding
|
|
// 2: the mint-cooldown stamp is cleared at TERMINAL SUCCESS — the completed-
|
|
// charge consumption path — so a customer who just completed a charge can
|
|
// immediately request a fresh code. This is the only charge-path place the
|
|
// stamp dies.
|
|
func TestConsumePendingCode_ClearsMintCooldownStamp(t *testing.T) {
|
|
ctx, tx := testutils.SetupTestTx(t)
|
|
userID, err := fixtures.CreateTestUser(tx)
|
|
require.NoError(t, err)
|
|
seedPending(t, ctx, tx, userID, "123456")
|
|
|
|
st := StateFor(userID)
|
|
st.Mu.Lock()
|
|
st.LastMintAt = clock.Now().Add(-10 * time.Second)
|
|
st.Mu.Unlock()
|
|
|
|
require.NoError(t, ConsumePendingCode(ctx, tx, userID), "terminal-success consumption must succeed")
|
|
|
|
st.Mu.Lock()
|
|
defer st.Mu.Unlock()
|
|
require.True(t, st.LastMintAt.IsZero(), "terminal-success consumption must clear the mint-cooldown stamp (finding 2)")
|
|
}
|