Merge pull request #276 from himmelblau-idm/dmulder/broker_scopes

Specify scopes when making an SSO request
himmelblau-idm · Nov 5, 2024 · 87d9e74 · 87d9e74
2 parents 1bc67e0 + 89cdbc8
commit 87d9e74
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ tracing-subscriber = "^0.3.17"
 tracing = "^0.1.37"
 himmelblau_unix_common = { path = "src/common" }
 kanidm_unix_common = { path = "src/glue" }
-libhimmelblau = { version = "0.3.5" }
+libhimmelblau = { version = "0.3.6" }
 clap = { version = "^4.5", features = ["derive", "env"] }
 clap_complete = "^4.4.1"
 reqwest = { version = "^0.12.2", features = ["json"] }

diff --git a/src/common/src/idprovider/himmelblau.rs b/src/common/src/idprovider/himmelblau.rs
@@ -604,7 +604,7 @@ impl IdProvider for HimmelblauProvider {
             .await
             .exchange_prt_for_access_token(
                 &prt,
-                vec!["User.Read"],
+                vec![],
                 Some("https://graph.microsoft.com".to_string()),
                 tpm,
                 machine_key,
@@ -687,7 +687,7 @@ impl IdProvider for HimmelblauProvider {
                     .await
                     .acquire_token_by_refresh_token(
                         &$token.refresh_token,
-                        vec!["User.Read"],
+                        vec![],
                         Some("https://graph.microsoft.com".to_string()),
                         tpm,
                         machine_key,
@@ -711,7 +711,7 @@ impl IdProvider for HimmelblauProvider {
                                         .await
                                         .acquire_token_by_refresh_token(
                                             &$token.refresh_token,
-                                            vec!["User.Read"],
+                                            vec![],
                                             Some("https://graph.microsoft.com".to_string()),
                                             tpm,
                                             machine_key,
@@ -740,7 +740,7 @@ impl IdProvider for HimmelblauProvider {
                     .acquire_token_by_hello_for_business_key(
                         account_id,
                         &$hello_key,
-                        vec!["User.Read"],
+                        vec![],
                         Some("https://graph.microsoft.com".to_string()),
                         tpm,
                         machine_key,

diff --git a/src/daemon/src/broker.rs b/src/daemon/src/broker.rs
@@ -89,10 +89,9 @@ impl HimmelblauBroker for Broker {
         if request.account.username.to_lowercase() != user.spn.to_lowercase() {
             return Err("Invalid request for user!".into());
         }
-        let scopes = vec![];
         let token = self
             .cachelayer
-            .get_user_accesstoken(Id::Name(user.spn), scopes)
+            .get_user_accesstoken(Id::Name(user.spn), request.auth_parameters.requested_scopes)
             .await
             .ok_or("Failed to authenticate user")?;
         let now = SystemTime::now()