Skip to content
This repository has been archived by the owner on Sep 4, 2024. It is now read-only.

Add a check for MFA in the amr of User Tokens #53

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Add a check for MFA in the amr of User Tokens #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "msal"
description = "Microsoft Authentication Library for Rust"
version = "0.1.18"
version = "0.1.19"
edition = "2021"
authors = [
"David Mulder <dmulder@suse.com>"
Expand Down
65 changes: 41 additions & 24 deletions src/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,13 @@ where
}
}

#[derive(Deserialize, Zeroize, ZeroizeOnDrop)]
pub struct AccessTokenPayload {
amr: Vec<String>,
tid: String,
upn: String,
}

#[derive(Clone, Deserialize, Zeroize, ZeroizeOnDrop)]
pub struct UserToken {
pub token_type: String,
Expand Down Expand Up @@ -355,7 +362,7 @@ impl UserToken {
} else if let Some(access_token) = &self.access_token {
let mut siter = access_token.splitn(3, '.');
siter.next(); // Ignore the header
let payload: Value = json_from_str(
let payload: AccessTokenPayload = json_from_str(
&String::from_utf8(
URL_SAFE_NO_PAD
.decode(siter.next().ok_or_else(|| {
Expand All @@ -366,17 +373,7 @@ impl UserToken {
.map_err(|e| MsalError::InvalidParse(format!("{}", e)))?,
)
.map_err(|e| MsalError::InvalidJson(format!("{}", e)))?;
match payload.get("tid") {
Some(tid) => match tid.as_str() {
Some(tid) => Ok(tid.to_string()),
None => Err(MsalError::GeneralFailure(
"No tid available for UserToken".to_string(),
)),
},
None => Err(MsalError::GeneralFailure(
"No tid available for UserToken".to_string(),
)),
}
Ok(payload.tid.clone())
} else {
Err(MsalError::GeneralFailure(
"No tid available for UserToken".to_string(),
Expand Down Expand Up @@ -408,7 +405,7 @@ impl UserToken {
Some(access_token) => {
let mut siter = access_token.splitn(3, '.');
siter.next(); // Ignore the header
let payload: Value = json_from_str(
let payload: AccessTokenPayload = json_from_str(
&String::from_utf8(
URL_SAFE_NO_PAD
.decode(siter.next().ok_or_else(|| {
Expand All @@ -419,24 +416,44 @@ impl UserToken {
.map_err(|e| MsalError::InvalidParse(format!("{}", e)))?,
)
.map_err(|e| MsalError::InvalidJson(format!("{}", e)))?;
match payload.get("upn") {
Some(upn) => match upn.as_str() {
Some(upn) => Ok(upn.to_string()),
None => Err(MsalError::GeneralFailure(
"No spn available for UserToken".to_string(),
)),
},
None => Err(MsalError::GeneralFailure(
"No spn available for UserToken".to_string(),
)),
}
Ok(payload.upn.clone())
}
None => Err(MsalError::GeneralFailure(
"No spn available for UserToken".to_string(),
)),
},
}
}

/// Check if the access token amr contains an MFA authorization
///
/// # Returns
///
/// * Success: Whether or not the token has MFA authorization.
/// * Failure: An MsalError, indicating the failure.
pub fn amr_mfa(&self) -> Result<bool, MsalError> {
match &self.access_token {
Some(access_token) => {
let mut siter = access_token.splitn(3, '.');
siter.next(); // Ignore the header
let payload: AccessTokenPayload = json_from_str(
&String::from_utf8(
URL_SAFE_NO_PAD
.decode(siter.next().ok_or_else(|| {
MsalError::InvalidParse("Payload not present".to_string())
})?)
.map_err(|e| MsalError::InvalidBase64(format!("{}", e)))?,
)
.map_err(|e| MsalError::InvalidParse(format!("{}", e)))?,
)
.map_err(|e| MsalError::InvalidJson(format!("{}", e)))?;
Ok(payload.amr.iter().any(|s| s == "ngcmfa" || s == "mfa"))
}
None => Err(MsalError::GeneralFailure(
"No access token available for UserToken".to_string(),
)),
}
}
}

#[cfg(feature = "broker")]
Expand Down