Merge pull request #248 from himmelblau-idm/dmulder/main_fixes

Fixes for the main branch
himmelblau-idm · Oct 14, 2024 · e71c6b8 · e71c6b8
2 parents f4d5ebb + 7d9cb35
commit e71c6b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/images/ubuntu/Dockerfile.22.04 b/images/ubuntu/Dockerfile.22.04
@@ -31,6 +31,7 @@ RUN apt-get update && apt-get install -y \
     gettext \
     cargo \
     libsqlite3-dev \
+    libutf8proc-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Rust (latest stable)

diff --git a/images/ubuntu/Dockerfile.24.04 b/images/ubuntu/Dockerfile.24.04
@@ -31,6 +31,7 @@ RUN apt-get update && apt-get install -y \
     gettext \
     cargo \
     libsqlite3-dev \
+    libutf8proc-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Rust (latest stable)

diff --git a/src/common/src/idprovider/himmelblau.rs b/src/common/src/idprovider/himmelblau.rs
@@ -546,17 +546,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))),

diff --git a/src/daemon/Cargo.toml b/src/daemon/Cargo.toml
@@ -46,7 +46,7 @@ async-trait = "0.1.83"
 [package.metadata.deb]
 name = "himmelblau"
 maintainer = "David Mulder <[email protected]>"
-depends = ["libssl3", "libsqlite3-0"]
+depends = ["libssl3", "libsqlite3-0", "libutf8proc3"]
 recommends = ["nss-himmelblau", "pam-himmelblau"]
 assets = [
   ["../../src/config/himmelblau.conf.example", "etc/himmelblau/himmelblau.conf", "644"],