fix(passkey): 断言时按凭据校验 UV,并把存储的 BE/BS 标志交给校验器,云同步 passkey 可以登录 (#9)

This commit is contained in:
Lemon-miaow committed 2026-09-26 07:12:20 +08:00
1 parent 6a4c30b3f1
commit 9ab7b27a30
13 files changed
+319 -96

No files matched your search

+19 -6
View File
@@ -210,11 +210,7 @@ func (v *Verifier) FinishLogin(user api.PasskeyUser, sessionData []byte, asserti
if err != nil {
return api.VerifiedAssertion{}, err
}
return api.VerifiedAssertion{
CredentialID: base64.RawURLEncoding.EncodeToString(cred.ID),
SignCount: cred.Authenticator.SignCount,
CloneWarning: cred.Authenticator.CloneWarning,
}, nil
return verifiedAssertion(cred), nil
}
// BeginDiscoverableLogin starts a USERNAMELESS assertion ceremony (task #40): the caller is
@@ -273,11 +269,19 @@ func (v *Verifier) FinishDiscoverableLogin(resolveUser func(userHandle []byte) (
if err != nil {
return api.VerifiedAssertion{}, err
}
return verifiedAssertion(cred), nil
}
// verifiedAssertion reports a validated login. go-webauthn has replaced cred.Flags with
// the flags of this assertion, so UserVerified says whether the user was verified now,
// which the handler checks alongside the credential's stored bind-time flag.
func verifiedAssertion(cred *webauthn.Credential) api.VerifiedAssertion {
return api.VerifiedAssertion{
CredentialID: base64.RawURLEncoding.EncodeToString(cred.ID),
SignCount: cred.Authenticator.SignCount,
CloneWarning: cred.Authenticator.CloneWarning,
}, nil
UserVerified: cred.Flags.UserVerified,
}
}
// excludeDescriptors turns the principal's already-bound passkeys into the
@@ -353,6 +357,15 @@ func (w webauthnUser) WebAuthnCredentials() []webauthn.Credential {
cred.PublicKey = key
}
cred.Authenticator.SignCount = c.SignCount
// ValidateLogin refuses an assertion whose backup-eligible flag differs from the
// stored credential's. A synced passkey reports BE on every ceremony, so without
// the stored flags it would enroll and then never log in.
cred.Flags = webauthn.CredentialFlags{
UserPresent: true,
UserVerified: c.UserVerified,
BackupEligible: c.BackupEligible,
BackupState: c.BackupState,
}
out = append(out, cred)
}
return out
+58 -1
View File
@@ -227,7 +227,10 @@ func enrollCredential(t *testing.T, v *Verifier, rp virtualwebauthn.RelyingParty
if err != nil {
t.Fatalf("FinishRegistration: %v", err)
}
return api.PasskeyCredential{CredentialID: vc.CredentialID, PublicKey: vc.PublicKey, SignCount: vc.SignCount}
// The ceremony flags travel with the row exactly as PGRepo stores and reloads them
// (migration 0009), so a login test validates against what production would hold.
return api.PasskeyCredential{CredentialID: vc.CredentialID, PublicKey: vc.PublicKey, SignCount: vc.SignCount,
UserVerified: vc.UserVerified, BackupEligible: vc.BackupEligible, BackupState: vc.BackupState}
}
// TestLoginRoundTrip is the PARITY check for the assertion (login) half, deliberately
@@ -583,3 +586,57 @@ func TestEnrollmentRequestsResidentKey(t *testing.T) {
t.Errorf("authenticatorSelection.residentKey = %q, want %q", got, "preferred")
}
}
// TestSyncedPasskeyLogsIn covers a passkey kept in a cloud keychain (iCloud Keychain,
// Google Password Manager), which reports backup-eligible on every ceremony. go-webauthn
// refuses an assertion whose BE flag differs from the stored credential's, so the stored
// flags must reach it: dropped, every synced passkey would enroll and then never log in.
// The asserted UV flag must come back too, for the handler's per-credential check.
func TestSyncedPasskeyLogsIn(t *testing.T) {
for _, door := range []string{"username-first", "discoverable"} {
t.Run(door, func(t *testing.T) {
v := newTestVerifier(t)
rp := virtualRP()
authenticator := virtualwebauthn.NewAuthenticatorWithOptions(virtualwebauthn.AuthenticatorOptions{BackupEligible: true, BackupState: true})
cred := virtualwebauthn.NewCredential(virtualwebauthn.KeyTypeEC2)
stored := enrollCredential(t, v, rp, authenticator, cred)
if !stored.BackupEligible || !stored.BackupState {
t.Fatalf("enrollment recorded BE=%v BS=%v, want both true", stored.BackupEligible, stored.BackupState)
}
var va api.VerifiedAssertion
var err error
if door == "username-first" {
options, sessionData, berr := v.BeginLogin(testUser(stored))
if berr != nil {
t.Fatalf("BeginLogin: %v", berr)
}
opts, perr := virtualwebauthn.ParseAssertionOptions(string(options))
if perr != nil {
t.Fatalf("ParseAssertionOptions: %v", perr)
}
resp := virtualwebauthn.CreateAssertionResponse(rp, authenticator, cred, *opts)
va, err = v.FinishLogin(testUser(stored), sessionData, strings.NewReader(resp))
} else {
authenticator.Options.UserHandle = []byte(testUserID)
options, sessionData, berr := v.BeginDiscoverableLogin()
if berr != nil {
t.Fatalf("BeginDiscoverableLogin: %v", berr)
}
opts, perr := virtualwebauthn.ParseAssertionOptions(string(options))
if perr != nil {
t.Fatalf("ParseAssertionOptions: %v", perr)
}
resp := virtualwebauthn.CreateAssertionResponse(rp, authenticator, cred, *opts)
va, err = v.FinishDiscoverableLogin(func([]byte) (api.PasskeyUser, error) { return testUser(stored), nil },
sessionData, strings.NewReader(resp))
}
if err != nil {
t.Fatalf("finish: %v (a synced passkey must log in)", err)
}
if !va.UserVerified {
t.Error("va.UserVerified = false, want true (the authenticator verified the user)")
}
})
}
}