Group B — auth-crate security hardening (post-audit Sonnet test-retest 2026-05-02).
kei-auth-apple:
- jwt.rs: full ES256 JWKS signature verification (jsonwebtoken crate);
validates iss == https://appleid.apple.com, aud == client_id, exp, iat;
decode_id_token_unverified is now cfg(test)-only.
Module docstring promised this since v0.1 — now actually implemented.
- claims.rs (new): IdTokenClaims + AudClaim extracted from jwt.rs.
- error.rs: JwtVerify, JwtDecode, MissingClaim variants.
- client.rs: client_secret_jwt: SecretString (was String); exchange_code accepts
code_verifier: Option<&str> for PKCE.
- provider.rs: verify() does CSRF expected_state ConstantTimeEq + JWT verification;
build_auth_url accepts state + verifier and emits PKCE code_challenge.
- tests/apple_smoke.rs + helpers/: 6 tests including malformed-JWT + non-Apple OAuth +
400-mapping + provider_verify_csrf_mismatch_rejected.
kei-auth-google:
- pkce.rs (new): pkce_challenge + url_encode (RFC 7636 §B.1 test vector covered).
- client.rs: client_secret: SecretString; exchange_code accepts code_verifier.
- provider.rs: verify() rejects on state mismatch; build_auth_url emits S256 challenge.
- tests/google_smoke.rs: 7 tests including CSRF mismatch.
kei-auth:
- main.rs: resolve_token() supports stdin (-) and KEI_AUTH_TOKEN env. Token positional
arg leaked via /proc/<pid>/cmdline + shell history; same fix that v0.14.1
applied to --key.
- main.rs::key(): hard fail if KEI_AUTH_KEY len < 32 bytes (mirror of magiclink).
- tokens.rs::verify(): query_row(...).optional()? instead of .ok() — DB errors now
propagate instead of being swallowed as "token unknown".
kei-runtime-core:
- secrets.rs (new, 81 LOC): SecretString newtype with redacted Debug + zeroize-on-Drop.
Required by every auth crate that holds secret material.
- traits/auth.rs: AuthChallenge::Password.password is now SecretString;
OAuthCode { state, expected_state }.
- error.rs: CsrfStateMismatch variant.
Test results: 48 passed; 0 failed across kei-auth, kei-auth-apple, kei-auth-google,
kei-auth-magiclink, kei-runtime-core. cargo check --workspace clean.
Findings consensus: Apple JWT unverified + OAuth state CSRF appeared in all 3
audit waves (Wave-1 + Wave-A + Wave-B); PKCE absence + secret-derive-Debug appeared
only in Wave-A retest, would have been missed by single-pass audit.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
169 lines
6.3 KiB
Rust
169 lines
6.3 KiB
Rust
// SPDX-License-Identifier: Apache-2.0
|
|
// Copyright 2026 <author org>
|
|
//
|
|
//! `wiremock`-driven smoke tests for [`AppleAuthClient`] +
|
|
//! [`AppleAuthProvider`]. No live calls to appleid.apple.com.
|
|
|
|
mod helpers;
|
|
use helpers::{sign_id_token, token_response_body, TEST_JWKS_JSON};
|
|
|
|
use kei_auth_apple::{AppleAuthClient, AppleAuthProvider, Error};
|
|
use kei_runtime_core::HasDna;
|
|
use kei_runtime_core::traits::auth::{AuthChallenge, AuthProvider};
|
|
use wiremock::matchers::{method, path};
|
|
use wiremock::{Mock, MockServer, ResponseTemplate};
|
|
|
|
// ── Client-level tests ────────────────────────────────────────────────────────
|
|
|
|
#[tokio::test]
|
|
async fn token_endpoint_200_returns_token_response() {
|
|
let server = MockServer::start().await;
|
|
let id_token = sign_id_token(
|
|
r#"{"sub":"001234.abc","email":"x@y.example","iss":"https://appleid.apple.com","aud":"com.example.web"}"#,
|
|
);
|
|
Mock::given(method("POST"))
|
|
.and(path("/auth/token"))
|
|
.respond_with(
|
|
ResponseTemplate::new(200).set_body_json(token_response_body(&id_token)),
|
|
)
|
|
.mount(&server)
|
|
.await;
|
|
let token_url = format!("{}/auth/token", server.uri());
|
|
let c = AppleAuthClient::with_url(
|
|
token_url, "com.example.web", "JWT-CS", "https://app.example/cb",
|
|
)
|
|
.unwrap();
|
|
let resp = c.exchange_code("auth-code-123", None).await.unwrap();
|
|
assert_eq!(resp.access_token, "at-1234");
|
|
assert_eq!(resp.expires_in, 3600);
|
|
assert_eq!(resp.id_token, id_token);
|
|
assert_eq!(resp.refresh_token.as_deref(), Some("rt-5678"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn token_endpoint_400_maps_to_api_error() {
|
|
let server = MockServer::start().await;
|
|
Mock::given(method("POST"))
|
|
.and(path("/auth/token"))
|
|
.respond_with(
|
|
ResponseTemplate::new(400)
|
|
.set_body_string("{\"error\":\"invalid_grant\"}"),
|
|
)
|
|
.mount(&server)
|
|
.await;
|
|
let token_url = format!("{}/auth/token", server.uri());
|
|
let c = AppleAuthClient::with_url(
|
|
token_url, "com.example.web", "JWT-CS", "https://app.example/cb",
|
|
)
|
|
.unwrap();
|
|
let err = c.exchange_code("bad-code", None).await.unwrap_err();
|
|
assert!(matches!(err, Error::Api(_)), "expected Api(_), got {err:?}");
|
|
}
|
|
|
|
// ── Provider-level tests ──────────────────────────────────────────────────────
|
|
|
|
#[tokio::test]
|
|
async fn provider_verify_end_to_end_returns_session_with_sub_user_id() {
|
|
let server = MockServer::start().await;
|
|
let id_token = sign_id_token(
|
|
r#"{"sub":"001999.zzz","email":"relay@privaterelay.appleid.com","iss":"https://appleid.apple.com","aud":"com.example.web"}"#,
|
|
);
|
|
Mock::given(method("POST"))
|
|
.and(path("/auth/token"))
|
|
.respond_with(
|
|
ResponseTemplate::new(200).set_body_json(token_response_body(&id_token)),
|
|
)
|
|
.mount(&server)
|
|
.await;
|
|
let token_url = format!("{}/auth/token", server.uri());
|
|
let client = AppleAuthClient::with_url(
|
|
token_url, "com.example.web", "JWT-CS", "https://app.example/cb",
|
|
)
|
|
.unwrap();
|
|
let provider = AppleAuthProvider::new(client, TEST_JWKS_JSON, None).unwrap();
|
|
let challenge = AuthChallenge::OAuthCode {
|
|
provider: "apple".into(),
|
|
code: "auth-code-123".into(),
|
|
state: "csrf-token".into(),
|
|
expected_state: "csrf-token".into(),
|
|
};
|
|
let session = provider.verify(&challenge).await.unwrap();
|
|
assert_eq!(session.user_id, "001999.zzz");
|
|
assert_eq!(session.parent_dna.as_str(), provider.dna().as_str());
|
|
assert!(session.expires_unix_ms > 0);
|
|
assert_eq!(provider.provider_name(), "apple");
|
|
assert!(provider.is_passwordless());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn provider_verify_csrf_mismatch_rejected() {
|
|
let server = MockServer::start().await;
|
|
let token_url = format!("{}/auth/token", server.uri());
|
|
let client = AppleAuthClient::with_url(
|
|
token_url, "com.example.web", "JWT-CS", "https://app.example/cb",
|
|
)
|
|
.unwrap();
|
|
let provider = AppleAuthProvider::new(client, TEST_JWKS_JSON, None).unwrap();
|
|
let challenge = AuthChallenge::OAuthCode {
|
|
provider: "apple".into(),
|
|
code: "code".into(),
|
|
state: "DIFFERENT".into(),
|
|
expected_state: "EXPECTED".into(),
|
|
};
|
|
let err = provider.verify(&challenge).await.unwrap_err();
|
|
assert!(
|
|
format!("{err}").contains("CSRF"),
|
|
"expected CSRF error, got: {err}"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn jwt_decode_rejects_malformed_id_token() {
|
|
let server = MockServer::start().await;
|
|
let bad_id_token = "header.payload"; // only two segments
|
|
Mock::given(method("POST"))
|
|
.and(path("/auth/token"))
|
|
.respond_with(
|
|
ResponseTemplate::new(200)
|
|
.set_body_json(token_response_body(bad_id_token)),
|
|
)
|
|
.mount(&server)
|
|
.await;
|
|
let token_url = format!("{}/auth/token", server.uri());
|
|
let client = AppleAuthClient::with_url(
|
|
token_url, "com.example.web", "JWT-CS", "https://app.example/cb",
|
|
)
|
|
.unwrap();
|
|
let provider = AppleAuthProvider::new(client, TEST_JWKS_JSON, None).unwrap();
|
|
let challenge = AuthChallenge::OAuthCode {
|
|
provider: "apple".into(),
|
|
code: "auth-code-123".into(),
|
|
state: "csrf".into(),
|
|
expected_state: "csrf".into(),
|
|
};
|
|
let err = provider.verify(&challenge).await.unwrap_err();
|
|
let msg = format!("{err}");
|
|
assert!(
|
|
msg.contains("jwt") || msg.contains("missing") || msg.contains("verify"),
|
|
"expected jwt-related error, got: {msg}"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn provider_rejects_non_apple_oauth_code() {
|
|
let server = MockServer::start().await;
|
|
let token_url = format!("{}/auth/token", server.uri());
|
|
let client = AppleAuthClient::with_url(
|
|
token_url, "com.example.web", "JWT-CS", "https://app.example/cb",
|
|
)
|
|
.unwrap();
|
|
let provider = AppleAuthProvider::new(client, TEST_JWKS_JSON, None).unwrap();
|
|
let challenge = AuthChallenge::OAuthCode {
|
|
provider: "github".into(),
|
|
code: "x".into(),
|
|
state: "y".into(),
|
|
expected_state: "y".into(),
|
|
};
|
|
let err = provider.verify(&challenge).await.unwrap_err();
|
|
assert!(format!("{err}").contains("wrong provider"));
|
|
}
|