From fc2b886c5df8b57767abb9c12bd7773d01e3d1bd Mon Sep 17 00:00:00 2001 From: John Coffey Date: Wed, 18 Nov 2026 20:27:21 -0700 Subject: [PATCH] Passkeys: sign in with a passkey (#334) Third part of passkeys (docs/spec/features/passkeys.md, PK-8 to PK-12). The login page offers passkeys in the authorization-code flow: the browser's autofill on the username field where it supports conditional mediation, and a "Sign in with a passkey" button. Each try asks POST /api/auth/passkey for a challenge (anonymous and limited like the login request), kept in the in-memory store for two minutes and good once, so any node can answer the next step. The login request then carries the browser's assertion in a new passkey field in place of the name and password. The server finds the passkey by credential id and the account by user handle, and both must agree. It checks the signature, the origin, user verification, that the passkey was made for the current relying-party id, and the counter: one that didn't go up fails and is logged as a possibly cloned passkey. Then the same checks run as for a password: a locked account fails the same way, and the client, redirect URI and PKCE checks are unchanged. A passkey signs in on its own, with no TOTP code after it. Failures count toward the same sign-in blocking as wrong passwords. A successful sign-in keeps the new counter and lastUsedAt, raises auth.success with type passkey, and is recorded in the audit log with via passkey where sign-ins are recorded. The registration page now takes one of the account's active passkeys instead of the password, and refuses an app password. The device flow, the settings and the external-directory rule follow in the last part. --- crates/features/src/audit/record.rs | 2 + crates/http/src/api/mod.rs | 6 + crates/http/src/auth/oauth/auth.rs | 39 +- crates/http/src/auth/passkey.rs | 306 +++++++++++- docs/spec/features/passkeys.md | 13 +- resources/html-templates/login.html | 121 ++++- resources/html-templates/login.html.min | 2 +- resources/html-templates/login.html.min.gz | Bin 11386 -> 12285 bytes resources/html-templates/passkey.html | 97 +++- resources/html-templates/passkey.html.min | 482 +------------------ resources/html-templates/passkey.html.min.gz | Bin 11877 -> 11422 bytes tests/src/system/oidc.rs | 7 + tests/src/system/passkeys.rs | 169 ++++++- 13 files changed, 707 insertions(+), 537 deletions(-) diff --git a/crates/features/src/audit/record.rs b/crates/features/src/audit/record.rs index bdbc47cb..d8a8b758 100644 --- a/crates/features/src/audit/record.rs +++ b/crates/features/src/audit/record.rs @@ -99,6 +99,8 @@ pub enum Via { }, /// The recovery administrator from the server's own configuration. Recovery, + /// A passkey (passkeys spec, PK-11). + Passkey, /// A migration's run, acting for the administrator who started it /// (migrations spec, MG-10). Migration { diff --git a/crates/http/src/api/mod.rs b/crates/http/src/api/mod.rs index 8acf8548..e2d4f02e 100644 --- a/crates/http/src/api/mod.rs +++ b/crates/http/src/api/mod.rs @@ -66,6 +66,12 @@ impl ManagementApi for Server { let path = req.uri().path().split('/').skip(2).collect::>(); match path.first().copied().unwrap_or_default() { + // inbuxa: passkeys spec, PK-10: a sign-in challenge + "auth" if is_post && path.get(1).copied() == Some("passkey") => { + self.is_http_anonymous_request_allowed(session.remote_ip) + .await?; + crate::auth::passkey::challenge(self).await + } "auth" if is_post => { self.is_http_anonymous_request_allowed(session.remote_ip) .await?; diff --git a/crates/http/src/auth/oauth/auth.rs b/crates/http/src/auth/oauth/auth.rs index 453bea5d..679da598 100644 --- a/crates/http/src/auth/oauth/auth.rs +++ b/crates/http/src/auth/oauth/auth.rs @@ -100,7 +100,10 @@ pub trait OAuthApiHandler: Sync + Send { pub enum LoginRequest { #[serde(rename_all = "camelCase")] AuthCode { + // inbuxa: empty when a passkey signs in + #[serde(default)] account_name: String, + #[serde(default)] account_secret: String, #[serde(skip_serializing_if = "Option::is_none")] #[serde(default)] @@ -120,6 +123,9 @@ pub enum LoginRequest { state: Option, #[serde(default)] resource: Vec, + // inbuxa: passkeys spec, PK-11: an assertion in place of the password + #[serde(default, skip_serializing_if = "Option::is_none")] + passkey: Option, }, #[serde(rename_all = "camelCase")] AuthDevice { @@ -191,6 +197,7 @@ impl OAuthApiHandler for Server { code_challenge, code_challenge_method, resource, + passkey, .. } => { // Validate clientId @@ -306,19 +313,25 @@ impl OAuthApiHandler for Server { } }; - // Authenticate - match self - .authenticate(&AuthRequest { - credentials: Credentials::Basic { - username: account_name, - secret: account_secret, - mfa_token, - }, - session_id: session.session_id, - remote_ip: session.remote_ip, - }) - .await - { + // Authenticate (inbuxa: or a passkey, PK-11) + let authenticated = match &passkey { + Some(assertion) => { + crate::auth::passkey::sign_in(self, session, assertion).await + } + None => { + self.authenticate(&AuthRequest { + credentials: Credentials::Basic { + username: account_name, + secret: account_secret, + mfa_token, + }, + session_id: session.session_id, + remote_ip: session.remote_ip, + }) + .await + } + }; + match authenticated { Ok(access_token) => { // Registry-backed clients are validated once the account is known if stateless_client.is_none() diff --git a/crates/http/src/auth/passkey.rs b/crates/http/src/auth/passkey.rs index 0b2ecea0..61d7a344 100644 --- a/crates/http/src/auth/passkey.rs +++ b/crates/http/src/auth/passkey.rs @@ -4,7 +4,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -//! inbuxa: passkey registration (passkeys spec, PK-6 to PK-8). +//! inbuxa: passkeys (passkeys spec): registration (PK-6 to PK-8) and +//! sign-in (PK-9 to PK-12). +//! +//! Registration: //! //! `inbuxa:Passkey/set` create hands back a URL to `/passkey/register` with //! a single-use ticket. That page posts here twice: @@ -18,6 +21,12 @@ //! //! What `start` began waits in the in-memory store under the ticket, so any //! node can answer `finish`, and it's deleted as it's read: it's good once. +//! Instead of the password, `start` takes one of the account's active +//! passkeys. +//! +//! Sign-in: `POST /api/auth/passkey` hands out a challenge (PK-10), kept in +//! the in-memory store for two minutes and good once; the login request then +//! carries the browser's assertion in place of a name and password (PK-11). use common::{ KV_PASSKEY_CEREMONY, Server, @@ -25,22 +34,36 @@ use common::{ }; use directory::Credentials; use http_proto::{HttpResponse, HttpSessionData, JsonResponse, ToHttpResponse}; +use inbuxa_features::audit::Via; use inbuxa_features::passkey::{self, Activated, HANDLE_LEN, Passkey}; +use registry::schema::enums::Permission; use serde::{Deserialize, Serialize}; use store::{ dispatch::lookup::KeyValue, - rand::{RngExt, rng}, + rand::{RngExt, distr::Alphanumeric, rng}, write::now, }; use trc::AddContext; use webauthn_rs::prelude::{ - CreationChallengeResponse, Credential, CredentialID, PasskeyRegistration, - RegisterPublicKeyCredential, Url, Uuid, Webauthn, WebauthnBuilder, + CreationChallengeResponse, Credential, CredentialID, DiscoverableAuthentication, + PasskeyRegistration, PublicKeyCredential, RegisterPublicKeyCredential, + RequestChallengeResponse, Url, Uuid, Webauthn, WebauthnBuilder, WebauthnError, }; use webauthn_rs_proto::ResidentKeyRequirement; /// How long the browser has between `start` and `finish`. const CEREMONY_SECONDS: u64 = 300; +/// How long a sign-in challenge lasts (PK-10). +const CHALLENGE_SECONDS: u64 = 120; +const CHALLENGE_ID_LEN: usize = 32; + +/// What the browser answered a sign-in challenge with. +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PasskeyAssertion { + pub challenge_id: String, + pub credential: Box, +} #[derive(Debug, Deserialize)] #[serde(tag = "step", rename_all = "camelCase")] @@ -48,9 +71,13 @@ pub enum RegisterRequest { #[serde(rename_all = "camelCase")] Start { ticket: String, + #[serde(default)] password: String, #[serde(default)] mfa_token: Option, + /// One of the account's passkeys, in place of the password (PK-8). + #[serde(default)] + passkey: Option, }, #[serde(rename_all = "camelCase")] Finish { @@ -117,7 +144,233 @@ pub fn relying_party(server: &Server) -> trc::Result<(Webauthn, String)> { } fn ceremony_key(ticket: &str) -> Vec { - KeyValue::<()>::build_key(KV_PASSKEY_CEREMONY, passkey::ticket_hash(ticket)) + let mut key = vec![b'r']; + key.extend_from_slice(&passkey::ticket_hash(ticket)); + KeyValue::<()>::build_key(KV_PASSKEY_CEREMONY, key) +} + +fn challenge_key(id: &str) -> Vec { + let mut key = vec![b'a']; + key.extend_from_slice(id.as_bytes()); + KeyValue::<()>::build_key(KV_PASSKEY_CEREMONY, key) +} + +/// A sign-in challenge between the two requests. +#[derive(Serialize, Deserialize)] +struct SignInCeremony { + rp_id: String, + state: DiscoverableAuthentication, +} + +#[derive(Serialize)] +#[serde(rename_all = "camelCase")] +struct ChallengeResponse { + challenge_id: String, + options: Box, +} + +/// PK-10: a challenge for the login page or the registration page. The +/// options name no credentials: the browser offers the passkeys it holds for +/// this relying party. +pub async fn challenge(server: &Server) -> trc::Result { + let (webauthn, rp_id) = relying_party(server)?; + let (options, state) = webauthn + .start_discoverable_authentication() + .map_err(|err| { + trc::AuthEvent::Error + .into_err() + .details("Failed to start a passkey sign-in") + .reason(err) + })?; + let challenge_id = rng() + .sample_iter(Alphanumeric) + .take(CHALLENGE_ID_LEN) + .map(char::from) + .collect::(); + let ceremony = serde_json::to_string(&SignInCeremony { rp_id, state }).map_err(|err| { + trc::StoreEvent::UnexpectedError + .into_err() + .details("Failed to serialize a passkey sign-in") + .reason(err) + })?; + server + .in_memory_store() + .key_set( + KeyValue::new(challenge_key(&challenge_id), ceremony.into_bytes()) + .expires(CHALLENGE_SECONDS), + ) + .await?; + Ok(JsonResponse::new(ChallengeResponse { + challenge_id, + options: Box::new(options), + }) + .no_cache() + .into_http_response()) +} + +fn refused(reason: &'static str) -> trc::Error { + trc::AuthEvent::Failed + .into_err() + .details("Passkey sign-in refused") + .reason(reason) +} + +/// PK-11, PK-12: signs in with a passkey. Failures count toward the same +/// limits and blocking as a wrong password, and a passkey needs no TOTP code. +pub async fn sign_in( + server: &Server, + session: &HttpSessionData, + assertion: &PasskeyAssertion, +) -> trc::Result { + let result = check_assertion(server, session, assertion) + .await + .and_then(|token| { + // AL-2: a locked account fails as a wrong passkey does + if token.is_locked() { + Err(refused("Account is locked").ctx(trc::Key::AccountId, token.account_id())) + } else { + token.assert_has_permission(Permission::Authenticate) + } + }); + let request = AuthRequest { + credentials: Credentials::Bearer { + username: None, + token: String::new(), + }, + session_id: session.session_id, + remote_ip: session.remote_ip, + }; + match result { + Ok(token) => { + trc::event!( + Auth(trc::AuthEvent::Success), + AccountId = token.account_id(), + SpanId = session.session_id, + Type = "passkey", + ); + // AU-1.4, AU-1.5 + server.audit_sign_in(&request, &token).await; + Ok(token) + } + Err(err) => { + if matches!(err.as_ref(), trc::EventType::Auth(trc::AuthEvent::Failed)) + && server.has_auth_fail2ban() + && server.is_auth_fail2banned(session.remote_ip, None).await? + { + Err(trc::SecurityEvent::AuthenticationBan + .into_err() + .ctx(trc::Key::RemoteIp, session.remote_ip)) + } else { + Err(err.ctx(trc::Key::RemoteIp, session.remote_ip)) + } + } + } +} + +async fn check_assertion( + server: &Server, + session: &HttpSessionData, + assertion: &PasskeyAssertion, +) -> trc::Result { + // PK-10: good once + if assertion.challenge_id.len() != CHALLENGE_ID_LEN { + return Err(refused("Unknown passkey challenge")); + } + let key = challenge_key(&assertion.challenge_id); + let Some(ceremony) = server + .in_memory_store() + .key_get::(key.clone()) + .await? + else { + return Err(refused("Unknown, used or expired passkey challenge")); + }; + server.in_memory_store().key_delete(key).await?; + let ceremony = serde_json::from_str::(&ceremony).map_err(|err| { + trc::StoreEvent::DataCorruption + .into_err() + .details("Invalid passkey sign-in") + .reason(err) + })?; + let (webauthn, rp_id) = relying_party(server)?; + if rp_id != ceremony.rp_id { + return Err(refused("The relying-party id changed during sign-in")); + } + + // The account by user handle, the passkey by credential id: both must agree + let credential = &assertion.credential; + let (handle, credential_id) = webauthn + .identify_discoverable_authentication(credential) + .map_err(|_| refused("No user handle in the passkey's answer"))?; + let Some(mut record) = passkey::by_credential(server.store(), credential_id) + .await? + .filter(|p| p.state == passkey::State::Active) + else { + return Err(refused("Unknown passkey")); + }; + if passkey::account_of_handle(server.store(), handle.as_bytes()).await? + != Some(record.account_id) + { + return Err(refused("The passkey belongs to another account") + .ctx(trc::Key::AccountId, record.account_id)); + } + // PK-4: a passkey works only for the relying-party id it was made for + if record.rp_id != rp_id { + return Err( + refused("The passkey was registered for another relying-party id") + .ctx(trc::Key::AccountId, record.account_id), + ); + } + let mut stored = serde_json::from_slice::(&record.public_key) + .map_err(|err| { + trc::StoreEvent::DataCorruption + .into_err() + .details("Invalid stored passkey") + .reason(err) + })?; + + // The signature, the origin (PK-2), user verification and the counter + let result = match webauthn.finish_discoverable_authentication_v2( + credential, + ceremony.state, + Credential::from(stored.clone()), + ) { + Ok(result) => result, + Err(WebauthnError::CredentialPossibleCompromise) => { + trc::event!( + Auth(trc::AuthEvent::Failed), + AccountId = record.account_id, + Id = passkey::passkey_id(record.account_id, record.number), + SpanId = session.session_id, + Details = "Passkey counter went backwards: the passkey may be cloned", + ); + return Err(refused("Passkey counter went backwards") + .ctx(trc::Key::AccountId, record.account_id)); + } + Err(err) => { + return Err(refused("The passkey's answer didn't check out") + .ctx(trc::Key::AccountId, record.account_id) + .details(err.to_string())); + } + }; + + // Keep the new counter and flags, and when it was last used + stored.update_credential(&result); + record.sign_count = result.counter(); + record.backed_up = result.backup_state(); + record.last_used_at = Some(now()); + record.public_key = serde_json::to_vec(&stored).map_err(|err| { + trc::StoreEvent::UnexpectedError + .into_err() + .details("Failed to serialize a passkey") + .reason(err) + })?; + passkey::save(server.store(), &record).await?; + + server + .access_token(record.account_id) + .await + .and_then(|token| AccessToken::new(token, session.remote_ip)) + .map(|token| token.with_origin(Via::Passkey)) } pub trait PasskeyRegistrationHandler: Sync + Send { @@ -142,7 +395,8 @@ impl PasskeyRegistrationHandler for Server { ticket, password, mfa_token, - } => start(self, session, &ticket, password, mfa_token).await?, + passkey, + } => start(self, session, &ticket, password, mfa_token, passkey).await?, RegisterRequest::Finish { ticket, credential } => { finish(self, &ticket, &credential).await? } @@ -157,6 +411,7 @@ async fn start( ticket: &str, password: String, mfa_token: Option, + assertion: Option, ) -> trc::Result { let Some(pending) = passkey::by_ticket(server.store(), ticket, now()).await? else { return Ok(RegisterResponse::Expired); @@ -166,20 +421,26 @@ async fn start( .await .caused_by(trc::location!())?; - // PK-8: the password (and code) first. The sign-in limits and the - // failure counting are the ones every sign-in goes through. - let access_token: AccessToken = match server - .authenticate(&AuthRequest { - credentials: Credentials::Basic { - username: account.name.to_string(), - secret: password, - mfa_token, - }, - session_id: session.session_id, - remote_ip: session.remote_ip, - }) - .await - { + // PK-8: the password (and code), or an active passkey, first. The + // sign-in limits and the failure counting are the ones every sign-in + // goes through. + let signed_in = match &assertion { + Some(assertion) => sign_in(server, session, assertion).await, + None => { + server + .authenticate(&AuthRequest { + credentials: Credentials::Basic { + username: account.name.to_string(), + secret: password, + mfa_token, + }, + session_id: session.session_id, + remote_ip: session.remote_ip, + }) + .await + } + }; + let access_token: AccessToken = match signed_in { Ok(access_token) => access_token, Err(err) => { return match *err.as_ref() { @@ -195,7 +456,10 @@ async fn start( }; } }; - if access_token.account_id() != pending.account_id { + // An app password is for one app, not for adding ways to sign in + if access_token.account_id() != pending.account_id + || matches!(access_token.origin(), Some(Via::AppPassword { .. })) + { return Ok(RegisterResponse::Failure); } diff --git a/docs/spec/features/passkeys.md b/docs/spec/features/passkeys.md index 75360c96..87ffa720 100644 --- a/docs/spec/features/passkeys.md +++ b/docs/spec/features/passkeys.md @@ -268,10 +268,15 @@ Building, one PR each: `POST /api/passkey/register` with a `start` step (ticket and password, plus the TOTP code when the account has one; anonymous, limited like the other sign-in requests) and a `finish` step. What `start` began waits in - the in-memory store for up to 5 minutes and is good once. Until sign-in - with a passkey exists (step 3), the page asks for the password only; the - "or an active passkey" of PK-8 comes with it. -3. Sign-in in the authorization-code flow, with autofill. + the in-memory store for up to 5 minutes and is good once. +3. Sign-in in the authorization-code flow: `POST /api/auth/passkey` for a + challenge, the login request's `passkey` field (`challengeId` and the + browser's assertion) in place of the name and password, autofill on the + username field and a "Sign in with a passkey" button. The registration + page takes an active passkey instead of the password (PK-8), and an app + password no longer opens it. Sign-ins by passkey are recorded with + `via: passkey`, and raise `auth.success` with type `passkey`; a counter + that didn't go up fails and is logged as a possible clone. 4. The device flow, the settings and policy, and the sign-in events. Then the webmail and console pages. diff --git a/resources/html-templates/login.html b/resources/html-templates/login.html index d4b000cb..024d4fd3 100644 --- a/resources/html-templates/login.html +++ b/resources/html-templates/login.html @@ -283,6 +283,13 @@ transform: none; } + /* INBUXA (#334): the passkey button, under the main one */ + .btn.secondary { + background: transparent; + color: var(--text); + border: 1px solid var(--border); + } + [hidden] { display: none !important; } @@ -313,7 +320,7 @@
-
@@ -332,6 +339,7 @@ pattern="\d{6}" autocomplete="one-time-code">
+
@@ -538,7 +546,13 @@ ? 'Sign in to approve this device.' : 'Enter your credentials to continue'); } - showError('Invalid username or password. Please try again.'); + if (usedPasskey) { + usedPasskey = false; + showError('That passkey didn\'t sign you in. Try again, or use your password.'); + startAutofill(); + } else { + showError('Invalid username or password. Please try again.'); + } return; default: console.log('Unknown login response type:', resp); @@ -549,6 +563,7 @@ function submitLogin(e) { if (e) e.preventDefault(); clearAlert(); + usedPasskey = false; var creds; if (inMfa) { @@ -622,6 +637,108 @@ $('login-form').addEventListener('submit', submitLogin); + // INBUXA (#334): passkeys (passkeys spec PK-9 to PK-11). The + // browser's autofill offers them on the username field, and the + // button asks for one directly. Each try fetches a challenge that + // is good once, for two minutes. + var usedPasskey = false; + var autofill = null; + var canPasskey = !isDevice && window.PublicKeyCredential && navigator.credentials && + typeof navigator.credentials.get === 'function' && window.AbortController; + + function fromB64(s) { + s = s.replace(/-/g, '+').replace(/_/g, '/'); + while (s.length % 4) s += '='; + var bin = atob(s), out = new Uint8Array(bin.length); + for (var i = 0; i < bin.length; i++) out[i] = bin.charCodeAt(i); + return out.buffer; + } + function toB64(buf) { + var bytes = new Uint8Array(buf), bin = ''; + for (var i = 0; i < bytes.length; i++) bin += String.fromCharCode(bytes[i]); + return btoa(bin).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''); + } + + function getPasskey(mediation, signal) { + return fetch('/api/auth/passkey', { + method: 'POST', + credentials: 'omit', + cache: 'no-store', + headers: { 'Accept': 'application/json' } + }).then(function (res) { + if (res.status !== 200) throw new Error('http ' + res.status); + return res.json(); + }).then(function (c) { + var pk = c.options.publicKey; + pk.challenge = fromB64(pk.challenge); + (pk.allowCredentials || []).forEach(function (a) { a.id = fromB64(a.id); }); + var opts = { publicKey: pk }; + if (mediation) opts.mediation = mediation; + if (signal) opts.signal = signal; + return navigator.credentials.get(opts).then(function (cred) { + var r = cred.response; + return { + challengeId: c.challengeId, + credential: { + id: cred.id, + rawId: toB64(cred.rawId), + type: cred.type, + response: { + authenticatorData: toB64(r.authenticatorData), + clientDataJSON: toB64(r.clientDataJSON), + signature: toB64(r.signature), + userHandle: r.userHandle ? toB64(r.userHandle) : null + }, + extensions: cred.getClientExtensionResults ? cred.getClientExtensionResults() : {} + } + }; + }); + }); + } + + function signInWithPasskey(assertion) { + clearAlert(); + usedPasskey = true; + var body = buildRequest({ account_name: '', account_secret: '' }, null); + delete body.accountName; + delete body.accountSecret; + body.passkey = assertion; + postLogin(body); + } + + function startAutofill() { + if (!canPasskey || !PublicKeyCredential.isConditionalMediationAvailable) return; + PublicKeyCredential.isConditionalMediationAvailable().then(function (ok) { + if (!ok) return; + if (autofill) autofill.abort(); + var mine = new AbortController(); + autofill = mine; + // A challenge lasts two minutes: ask for a new one before then + var renew = setTimeout(function () { if (autofill === mine) startAutofill(); }, 110000); + getPasskey('conditional', mine.signal).then(function (assertion) { + clearTimeout(renew); + autofill = null; + signInWithPasskey(assertion); + }, function () { clearTimeout(renew); }); + }, function () {}); + } + + if (canPasskey) { + show($('passkey-btn')); + $('passkey-btn').addEventListener('click', function () { + if (autofill) { autofill.abort(); autofill = null; } + clearAlert(); + getPasskey(null, null).then(signInWithPasskey, function (err) { + console.log('Passkey sign-in did not finish:', err); + if (!err || (err.name !== 'NotAllowedError' && err.name !== 'AbortError')) { + showError('Passkeys aren\'t available right now. Use your password.'); + } + startAutofill(); + }); + }); + startAutofill(); + } + // Digit-only filter on OTP and auto-submit on 6 digits. $('otp').addEventListener('input', function () { this.value = this.value.replace(/\D/g, ''); diff --git a/resources/html-templates/login.html.min b/resources/html-templates/login.html.min index f0b78892..0fb39cd0 100644 --- a/resources/html-templates/login.html.min +++ b/resources/html-templates/login.html.min @@ -1 +1 @@ - Sign in · inbuxa

Sign in

Enter your credentials to continue

\ No newline at end of file + Sign in · inbuxa

Sign in

Enter your credentials to continue

\ No newline at end of file diff --git a/resources/html-templates/login.html.min.gz b/resources/html-templates/login.html.min.gz index a842b4b7665c6ed7aec2601150bed1b7ae29fa3e..4ab658baa686939545b90e9f4be9bcd9d8841a66 100644 GIT binary patch literal 12285 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 X58&xf`0)6D?(lyAeI@=Z>|p=^hBjV` literal 11386 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 + @@ -467,20 +474,45 @@ }); } - function submit(e) { - if (e) e.preventDefault(); - clearAlert(); - var password = $('password').value; - if (!password) { showError('Enter your password.'); return; } - var otp = $('otp').value.trim(); - var body = { step: 'start', ticket: ticket, password: password }; - if (!$('field-otp').hidden) { - if (!/^\d{6}$/.test(otp)) { showError('Enter the 6-digit code.'); return; } - body.mfaToken = otp; - } + function getPasskey() { + return fetch('/api/auth/passkey', { + method: 'POST', + credentials: 'omit', + cache: 'no-store', + headers: { 'Accept': 'application/json' } + }).then(function (res) { + if (res.status !== 200) throw new Error('http ' + res.status); + return res.json(); + }).then(function (c) { + var pk = c.options.publicKey; + pk.challenge = fromB64(pk.challenge); + (pk.allowCredentials || []).forEach(function (a) { a.id = fromB64(a.id); }); + return navigator.credentials.get({ publicKey: pk }).then(function (cred) { + var r = cred.response; + return { + challengeId: c.challengeId, + credential: { + id: cred.id, + rawId: toB64(cred.rawId), + type: cred.type, + response: { + authenticatorData: toB64(r.authenticatorData), + clientDataJSON: toB64(r.clientDataJSON), + signature: toB64(r.signature), + userHandle: r.userHandle ? toB64(r.userHandle) : null + }, + extensions: cred.getClientExtensionResults ? cred.getClientExtensionResults() : {} + } + }; + }); + }); + } + + function begin(body, viaPasskey) { var btn = $('submit-btn'); btn.disabled = true; - post(body).then(function (json) { + $('passkey-btn').disabled = true; + return post(body).then(function (json) { switch (json.type) { case 'options': $('account').value = json.accountName; @@ -504,7 +536,11 @@ expired(); return; default: - showError(!$('field-otp').hidden ? 'The password or code is wrong.' : 'The password is wrong.'); + if (viaPasskey) { + showError('That passkey isn\'t one of this account\'s. Use your password.'); + } else { + showError(!$('field-otp').hidden ? 'The password or code is wrong.' : 'The password is wrong.'); + } $('otp').value = ''; } }).catch(function (err) { @@ -518,7 +554,40 @@ } console.log('Passkey registration failed:', err); showError('Temporary server failure. If the problem persists, contact your administrator.'); - }).then(function () { btn.disabled = false; }); + }).then(function () { + btn.disabled = false; + $('passkey-btn').disabled = false; + }); + } + + function submit(e) { + if (e) e.preventDefault(); + clearAlert(); + var password = $('password').value; + if (!password) { showError('Enter your password.'); return; } + var otp = $('otp').value.trim(); + var body = { step: 'start', ticket: ticket, password: password }; + if (!$('field-otp').hidden) { + if (!/^\d{6}$/.test(otp)) { showError('Enter the 6-digit code.'); return; } + body.mfaToken = otp; + } + begin(body, false); + } + + // PK-8: an active passkey of the account instead of the password + if (navigator.credentials.get) { + show($('passkey-btn')); + $('passkey-btn').addEventListener('click', function () { + clearAlert(); + getPasskey().then(function (assertion) { + begin({ step: 'start', ticket: ticket, passkey: assertion }, true); + }, function (err) { + console.log('Passkey sign-in did not finish:', err); + if (!err || (err.name !== 'NotAllowedError' && err.name !== 'AbortError')) { + showError('Passkeys aren\'t available right now. Use your password.'); + } + }); + }); } $('passkey-form').addEventListener('submit', submit); diff --git a/resources/html-templates/passkey.html.min b/resources/html-templates/passkey.html.min index 752f1e3f..c10cf2c6 100644 --- a/resources/html-templates/passkey.html.min +++ b/resources/html-templates/passkey.html.min @@ -1,481 +1 @@ - - - - - - - -Add a passkey · inbuxa - - - - -
-
- -
-

Add a passkey

-

Confirm it's you, then create the passkey on this device.

- -
- -
- - -
- - -
-
- - - + Add a passkey · inbuxa

Add a passkey

Confirm it's you, then create the passkey on this device.

\ No newline at end of file diff --git a/resources/html-templates/passkey.html.min.gz b/resources/html-templates/passkey.html.min.gz index c1e8fb06e2d1f1e31b9da55a17b1b95a74ddd545..926ec363a11c706be153ea21ef9c803dd93bdfb8 100644 GIT binary patch delta 10990 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 delta 11483 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 BMaTdE diff --git a/tests/src/system/oidc.rs b/tests/src/system/oidc.rs index ed5b102e..e8d2d0d9 100644 --- a/tests/src/system/oidc.rs +++ b/tests/src/system/oidc.rs @@ -352,6 +352,7 @@ pub async fn test(test: &mut TestServer) { code_challenge_method: Some("S256".to_string()), state: None, resource: vec![], + passkey: None, }) .await; assert_ne!( @@ -372,6 +373,7 @@ pub async fn test(test: &mut TestServer) { code_challenge_method: Some("S256".to_string()), state: None, resource: vec!["https://evil.example.com/jmap".to_string()], + passkey: None, }) .await; assert_ne!( @@ -394,6 +396,7 @@ pub async fn test(test: &mut TestServer) { code_challenge_method: method.map(str::to_string), state: None, resource: vec![], + passkey: None, }) .await; assert_ne!(status, 200, "PKCE method {method:?} must not be authorized"); @@ -432,6 +435,7 @@ pub async fn test(test: &mut TestServer) { code_challenge_method: challenge.map(|_| "S256".to_string()), state: None, resource: vec![], + passkey: None, }) .await; assert_eq!( @@ -459,6 +463,7 @@ pub async fn test(test: &mut TestServer) { code_challenge_method: Some("S256".to_string()), state: None, resource: vec!["https://mail.example.org/jmap/session".to_string()], + passkey: None, }, ) .await @@ -627,6 +632,7 @@ pub async fn test(test: &mut TestServer) { code_challenge_method: Some("S256".to_string()), state: None, resource: vec![], + passkey: None, }, ) .await @@ -1356,6 +1362,7 @@ async fn obtain_auth_code(http: &HttpRequest, client_id: &str, redirect_uri: &st code_challenge_method: None, state: None, resource: vec![], + passkey: None, }, ) .await diff --git a/tests/src/system/passkeys.rs b/tests/src/system/passkeys.rs index eb2fe750..622258a8 100644 --- a/tests/src/system/passkeys.rs +++ b/tests/src/system/passkeys.rs @@ -7,7 +7,8 @@ //! Passkeys (passkeys spec): `inbuxa:Passkey` management (PK-5, PK-14 to //! PK-17): starting a registration, the limit per account, renaming, //! removing, who reaches whose passkeys, and the audit log. Registration on -//! the server's page (PK-6 to PK-8), with a software authenticator. +//! the server's page (PK-6 to PK-8) and sign-in (PK-9 to PK-12), with a +//! software authenticator. use crate::utils::{ account::Account, @@ -251,6 +252,8 @@ pub async fn test(test: &mut TestServer) { pub struct SoftKey { pub key: EcdsaKeyPair, pub credential_id: Vec, + /// The account's user handle, as registration gave it (base64url). + pub user_handle: std::sync::Mutex, } impl SoftKey { @@ -261,11 +264,50 @@ impl SoftKey { key: EcdsaKeyPair::from_pkcs8(&ECDSA_P256_SHA256_ASN1_SIGNING, pkcs8.as_ref(), &rng) .unwrap(), credential_id: credential_id.to_vec(), + user_handle: Default::default(), } } + /// What `navigator.credentials.get` hands the page for a sign-in + /// challenge, with the given counter and origin. + pub fn get(&self, challenge: &Value, counter: u32, origin: &str) -> Value { + let client_data = json!({ + "type": "webauthn.get", + "challenge": challenge["options"]["publicKey"]["challenge"], + "origin": origin, + "crossOrigin": false + }) + .to_string(); + let mut auth_data = Sha256::digest(RP_ID.as_bytes()).to_vec(); + // UP, UV, backup eligible, backed up + auth_data.push(0x01 | 0x04 | 0x08 | 0x10); + auth_data.extend_from_slice(&counter.to_be_bytes()); + let mut signed = auth_data.clone(); + signed.extend_from_slice(&Sha256::digest(client_data.as_bytes())); + let signature = self.key.sign(&SystemRandom::new(), &signed).unwrap(); + let id = URL_SAFE_NO_PAD.encode(&self.credential_id); + json!({ + "challengeId": challenge["challengeId"], + "credential": { + "id": id, + "rawId": id, + "type": "public-key", + "response": { + "authenticatorData": URL_SAFE_NO_PAD.encode(&auth_data), + "clientDataJSON": URL_SAFE_NO_PAD.encode(client_data.as_bytes()), + "signature": URL_SAFE_NO_PAD.encode(signature.as_ref()), + "userHandle": self.user_handle.lock().unwrap().clone() + }, + "extensions": {} + } + }) + } + /// What `navigator.credentials.create` hands the page, for `options`. pub fn create(&self, options: &Value) -> Value { + if let Some(handle) = options["publicKey"]["user"]["id"].as_str() { + *self.user_handle.lock().unwrap() = handle.to_string(); + } let challenge = options["publicKey"]["challenge"].as_str().unwrap(); let client_data = json!({ "type": "webauthn.create", @@ -499,6 +541,131 @@ async fn registration(user: &Account) { })) .await; assert_eq!(response["type"], "refused", "{response}"); + + sign_in(user, &key).await; +} + +async fn new_challenge() -> Value { + let challenge = register_at("/api/auth/passkey", json!({})).await; + assert_eq!( + challenge["options"]["publicKey"]["rpId"], RP_ID, + "{challenge}" + ); + assert_eq!( + challenge["options"]["publicKey"]["userVerification"], "required", + "{challenge}" + ); + challenge +} + +async fn register_at(path: &str, body: Value) -> Value { + HttpRequest::new() + .post::(path, &body) + .await + .unwrap_or_else(|err| panic!("{path} {body}: {err}")) +} + +const PKCE_VERIFIER: &str = "dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"; +const PKCE_CHALLENGE: &str = "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM"; +const REDIRECT: &str = "com.example.app:/cb"; + +async fn login(client_id: &str, assertion: Value) -> Value { + register_at( + "/api/auth", + json!({ + "type": "authCode", + "clientId": client_id, + "redirectUri": REDIRECT, + "codeChallenge": PKCE_CHALLENGE, + "codeChallengeMethod": "S256", + "passkey": assertion + }), + ) + .await +} + +/// PK-9 to PK-12: sign-in in the authorization-code flow. +async fn sign_in(user: &Account, key: &SoftKey) { + let client = HttpRequest::with_credentials( + 8899, + "admin@example.com", + "these_pretzels_are_making_me_thirsty", + ) + .post::("/auth/register", &json!({"redirect_uris": [REDIRECT]})) + .await + .unwrap(); + let client_id = client["client_id"] + .as_str() + .unwrap_or_else(|| panic!("{client}")) + .to_string(); + + // A passkey signs in on its own and the code works + let challenge = new_challenge().await; + let assertion = key.get(&challenge, 5, ORIGIN); + let response = login(&client_id, assertion.clone()).await; + assert_eq!(response["type"], "authenticated", "{response}"); + let code = response["client_code"].as_str().unwrap().to_string(); + let token = reqwest::Client::builder() + .danger_accept_invalid_certs(true) + .build() + .unwrap() + .post("https://127.0.0.1:8899/auth/token") + .form(&[ + ("grant_type", "authorization_code"), + ("code", code.as_str()), + ("client_id", client_id.as_str()), + ("redirect_uri", REDIRECT), + ("code_verifier", PKCE_VERIFIER), + ]) + .send() + .await + .unwrap() + .json::() + .await + .unwrap(); + assert!(token["access_token"].is_string(), "{token}"); + let laptop = list(user, user) + .await + .into_iter() + .find(|p| p["name"] == "Laptop") + .unwrap(); + assert!(laptop["lastUsedAt"].is_string(), "{laptop}"); + + // PK-10: a challenge is good once + let response = login(&client_id, assertion).await; + assert_eq!(response["type"], "failure", "{response}"); + + // PK-11: a counter that didn't go up fails + let challenge = new_challenge().await; + let response = login(&client_id, key.get(&challenge, 5, ORIGIN)).await; + assert_eq!(response["type"], "failure", "{response}"); + + // PK-2: another origin fails + let challenge = new_challenge().await; + let response = login(&client_id, key.get(&challenge, 9, "https://evil.example")).await; + assert_eq!(response["type"], "failure", "{response}"); + + // An unknown passkey fails + let stranger = SoftKey::new(b"soft-key-stranger-01"); + *stranger.user_handle.lock().unwrap() = key.user_handle.lock().unwrap().clone(); + let challenge = new_challenge().await; + let response = login(&client_id, stranger.get(&challenge, 1, ORIGIN)).await; + assert_eq!(response["type"], "failure", "{response}"); + + // Still signs in with a higher counter + let challenge = new_challenge().await; + let response = login(&client_id, key.get(&challenge, 6, ORIGIN)).await; + assert_eq!(response["type"], "authenticated", "{response}"); + + // PK-8: the registration page takes the account's passkey instead of + // the password, and not someone else's + let (_, ticket) = start_registration(user, "Second").await; + let challenge = new_challenge().await; + let response = register(json!({ + "step": "start", "ticket": ticket, "passkey": key.get(&challenge, 7, ORIGIN) + })) + .await; + assert_eq!(response["type"], "options", "{response}"); } #[ignore] -- 2.54.0