Merge pull request #250 from himmelblau-idm/stable-0.6.x_backports

Stable 0.6.x backports
himmelblau-idm · Oct 14, 2024 · 5246a10 · 5246a10
2 parents 561c6d1 + 4c6ef4e
commit 5246a10
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.6.11"
+version = "0.6.12"
 authors = [
     "David Mulder <[email protected]>"
 ]
@@ -77,7 +77,7 @@ tracing-forest = "^0.1.6"
 rusqlite = "^0.32.0"
 hashbrown = { version = "0.14.0", features = ["serde", "inline-more", "ahash"] }
 lru = "^0.12.3"
-kanidm_lib_crypto = { path = "./src/crypto", version = "0.6.11" }
+kanidm_lib_crypto = { path = "./src/crypto", version = "0.6.12" }
 kanidm_utils_users = { path = "./src/users" }
 walkdir = "2"
 csv = "1.2.2"

diff --git a/platform/debian/pam-config b/platform/debian/pam-config
@@ -1,9 +1,9 @@
 Name: Azure authentication
 Default: yes
-Priority: 192
+Priority: 512
 Auth-Type: Primary
 Auth:
-	[success=end default=ignore]    pam_himmelblau.so ignore_unknown_user use_first_pass
+	[success=end default=ignore]    pam_himmelblau.so ignore_unknown_user
 Account-Type: Primary
 Account:
 	[success=end default=ignore]    pam_himmelblau.so ignore_unknown_user

diff --git a/src/common/src/idprovider/himmelblau.rs b/src/common/src/idprovider/himmelblau.rs
@@ -436,17 +436,18 @@ impl IdProvider for HimmelblauProvider {
                                     )?
                                 }
                             };
+                            let fake_uuid = Uuid::new_v4();
                             let groups = vec![GroupToken {
                                 name: account_id.clone(),
                                 spn: account_id.clone(),
-                                uuid: Uuid::max(),
+                                uuid: fake_uuid,
                                 gidnumber,
                             }];
                             let config = self.config.read().await;
                             return Ok(UserToken {
                                 name: account_id.clone(),
                                 spn: account_id.clone(),
-                                uuid: Uuid::new_v4(),
+                                uuid: fake_uuid,
                                 gidnumber,
                                 displayname: "".to_string(),
                                 shell: Some(config.get_shell(Some(&self.domain))),