Browse Source

Prevent 2FA claims reuse

pull/7563/head
Timshel 2 months ago
parent
commit
4717406429
  1. 12
      src/auth/two_factor.rs

12
src/auth/two_factor.rs

@ -12,7 +12,7 @@ use crate::{
static JWT_2FA_AUTH_ISSUER: LazyLock<String> = LazyLock::new(|| format!("{}|api.2fa", CONFIG.domain_origin())); static JWT_2FA_AUTH_ISSUER: LazyLock<String> = LazyLock::new(|| format!("{}|api.2fa", CONFIG.domain_origin()));
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct TwopFactorClaims<T> { pub struct TwoFactorClaims<T> {
// Not before // Not before
pub nbf: i64, pub nbf: i64,
// Expiration time // Expiration time
@ -29,21 +29,25 @@ pub struct TwopFactorClaims<T> {
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct AuthenticatorClaims { pub struct AuthenticatorClaims {
#[serde(rename = "authenticator_key")]
pub key: String, pub key: String,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct DuoClaims { pub struct DuoClaims {
data: Option<DuoData>, #[serde(rename = "duo_data")]
pub data: Option<DuoData>,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct WebauthnClaims { pub struct WebauthnClaims {
#[serde(rename = "webauthn_keys")]
pub keys: Vec<i32>, pub keys: Vec<i32>,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct YubikeyClaims { pub struct YubikeyClaims {
#[serde(rename = "yubi_keys")]
pub keys: Vec<String>, pub keys: Vec<String>,
} }
@ -102,7 +106,7 @@ pub struct EmailClaims {
fn token<T: Serialize>(user_id: UserId, enabled: bool, claims: T) -> String { fn token<T: Serialize>(user_id: UserId, enabled: bool, claims: T) -> String {
let time_now = Utc::now(); let time_now = Utc::now();
let claims = TwopFactorClaims { let claims = TwoFactorClaims {
nbf: time_now.timestamp(), nbf: time_now.timestamp(),
exp: (time_now + TimeDelta::try_minutes(5).unwrap()).timestamp(), exp: (time_now + TimeDelta::try_minutes(5).unwrap()).timestamp(),
iss: JWT_2FA_AUTH_ISSUER.to_string(), iss: JWT_2FA_AUTH_ISSUER.to_string(),
@ -114,7 +118,7 @@ fn token<T: Serialize>(user_id: UserId, enabled: bool, claims: T) -> String {
} }
fn validate<T: DeserializeOwned>(token: &str, user_id: &UserId, enabled: bool) -> ApiResult<T> { fn validate<T: DeserializeOwned>(token: &str, user_id: &UserId, enabled: bool) -> ApiResult<T> {
match decode_jwt::<TwopFactorClaims<T>>(token, JWT_2FA_AUTH_ISSUER.to_string()) { match decode_jwt::<TwoFactorClaims<T>>(token, JWT_2FA_AUTH_ISSUER.to_string()) {
Ok(claims) => { Ok(claims) => {
if claims.sub != *user_id { if claims.sub != *user_id {
err!("Invalid verification token: Invalid user"); err!("Invalid verification token: Invalid user");

Loading…
Cancel
Save