diff --git a/playwright/tests/setups/user.ts b/playwright/tests/setups/user.ts index aa5d1e7e..11b39763 100644 --- a/playwright/tests/setups/user.ts +++ b/playwright/tests/setups/user.ts @@ -69,7 +69,7 @@ export async function logUser( timestamp = timestamp + (totp.period - (Math.floor(timestamp / 1000) % totp.period) + 1) * 1000; code = totp.generate({timestamp}); } else if( options.mail2fa ){ - code = await retrieveEmailCode(test, page, mailBuffer); + code = await retrieveEmailCode(test, page, options.mailBuffer); } await page.getByLabel(/Verification code/).fill(code); diff --git a/src/auth/two_factor.rs b/src/auth/two_factor.rs index 9eedf98b..533c0cf4 100644 --- a/src/auth/two_factor.rs +++ b/src/auth/two_factor.rs @@ -28,24 +28,28 @@ pub struct TwoFactorClaims { } #[derive(Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct AuthenticatorClaims { #[serde(rename = "authenticator_key")] pub key: String, } #[derive(Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct DuoClaims { #[serde(rename = "duo_data")] pub data: Option, } #[derive(Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct WebauthnClaims { #[serde(rename = "webauthn_keys")] pub keys: Vec, } #[derive(Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct YubikeyClaims { #[serde(rename = "yubi_keys")] pub keys: Vec, @@ -100,6 +104,7 @@ impl DuoData { } #[derive(Serialize, Deserialize)] +#[serde(deny_unknown_fields)] pub struct EmailClaims { pub email: Option, } @@ -223,3 +228,54 @@ pub fn validate_yubikey(token: &str, user_id: &UserId, keys: &Vec, enabl } Ok(()) } + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::{Value, from_value, to_value}; + + fn token(claims: T) -> Value { + to_value(TwoFactorClaims { + nbf: 0, + exp: 0, + iss: String::new(), + sub: UserId::from(String::from("4ff0f0a4-0aa4-4c1d-9d43-1f2bd4d5e8b1")), + enabled: false, + claims, + }) + .unwrap() + } + + #[test] + fn claims_only_parse_as_their_own_provider() { + let tokens = [ + token(AuthenticatorClaims { + key: String::from("JBSWY3DPEHPK3PXP"), + }), + token(DuoClaims { + data: None, + }), + token(WebauthnClaims { + keys: vec![1], + }), + token(YubikeyClaims { + keys: Vec::new(), + }), + token(EmailClaims { + email: None, + }), + ]; + for (issued, token) in tokens.iter().enumerate() { + let parsed = [ + from_value::>(token.clone()).is_ok(), + from_value::>(token.clone()).is_ok(), + from_value::>(token.clone()).is_ok(), + from_value::>(token.clone()).is_ok(), + from_value::>(token.clone()).is_ok(), + ]; + for (checked, ok) in parsed.into_iter().enumerate() { + assert_eq!(ok, issued == checked, "token {issued} parsed as {checked}"); + } + } + } +}