Merge pull request #141 from himmelblau-idm/dmulder/stable-0.4.x_cred…

…_leak_fix Fix a refresh token leak in debug from msal (stable-0.4.x)
himmelblau-idm · May 22, 2024 · 63e3704 · 63e3704
2 parents 7b57f5e + a9fabf0
commit 63e3704
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,7 @@ tracing-subscriber = "^0.3.17"
 tracing = "^0.1.37"
 himmelblau_unix_common = { path = "src/common" }
 kanidm_unix_common = { path = "src/glue" }
-msal = { version = "0.2.0" }
+msal = { version = "0.2.3" }
 graph = { path = "src/graph" }
 clap = { version = "^4.5", features = ["derive", "env"] }
 clap_complete = "^4.4.1"

diff --git a/src/common/src/idprovider/himmelblau.rs b/src/common/src/idprovider/himmelblau.rs
@@ -16,9 +16,10 @@ use idmap::SssIdmap;
 use kanidm_hsm_crypto::{LoadableIdentityKey, LoadableMsOapxbcRsaKey, PinValue, SealedData, Tpm};
 use msal::auth::{
     BrokerClientApplication, ClientInfo,
-    DeviceAuthorizationResponse as msal_DeviceAuthorizationResponse, EnrollAttrs, IdToken,
-    MFAAuthContinue, UserToken as UnixUserToken,
+    DeviceAuthorizationResponse as msal_DeviceAuthorizationResponse, IdToken, MFAAuthContinue,
+    UserToken as UnixUserToken,
 };
+use msal::discovery::EnrollAttrs;
 use msal::error::{MsalError, AUTH_PENDING, DEVICE_AUTH_FAIL, REQUIRES_MFA};
 use reqwest;
 use std::collections::HashMap;