Merge pull request #337 from himmelblau-idm/stable-0.8.x_rust_sso

Stable 0.8.x Rewrite the sso code in Rust

Author: dmulder

Cargo.toml

@@ -19,11 +19,11 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.8.0"
+version = "0.8.1"
 authors = [
     "David Mulder <[email protected]>"
 ]
-rust-version = "1.66"
+rust-version = "1.70"
 edition = "2021"
 license = "GPL-3.0-or-later"
 homepage = "https://github.com/himmelblau-idm/himmelblau"
@@ -69,7 +69,7 @@ serde_with = "3.1.0"
 time = { version = "^0.3.21", features = ["formatting", "local-offset"] }
 url = "^2.4.0"
 urlencoding = "2.1.3"
-uuid = "^1.4.1"
+uuid = { version = "^1.4.1", features = ["v4"] }
 webauthn-rs-proto = "0.5.0"
 kanidm_proto = { path = "./src/proto" }
 openssl-sys = "^0.9"

src/sso/Cargo.toml

@@ -9,11 +9,22 @@ license.workspace = true
 homepage.workspace = true
 repository.workspace = true
 
+[[bin]]
+name = "linux-entra-sso"
+path = "src/main.rs"
+
+[dependencies]
+clap.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio.workspace = true
+uuid.workspace = true
+zbus = "5.2.0"
+
 [package.metadata.deb]
 name = "himmelblau-sso"
-depends = ["python3-pydbus"]
 assets = [
-  ["src/linux-entra-sso.py", "usr/bin/linux-entra-sso", "755"],
+  ["target/release/linux-entra-sso", "usr/bin/linux-entra-sso", "755"],
   ["src/firefox/linux_entra_sso.json", "usr/lib/mozilla/native-messaging-hosts/", "644"],
   ["src/firefox/policies.json", "etc/firefox/policies/", "644"],
   ["src/chrome/linux_entra_sso.json", "etc/opt/chrome/native-messaging-hosts/", "644"],
@@ -26,7 +37,7 @@ assets = [
 [package.metadata.generate-rpm]
 name = "himmelblau-sso"
 assets = [
-  { source = "src/linux-entra-sso.py", dest = "/usr/bin/linux-entra-sso", mode = "755" },
+  { source = "target/release/linux-entra-sso", dest = "/usr/bin/linux-entra-sso", mode = "755" },
   { source = "src/firefox/linux_entra_sso.json", dest = "/usr/lib64/mozilla/native-messaging-hosts/", mode = "644" },
   { source = "src/firefox/policies.json", dest = "/etc/firefox/policies/", mode = "644" },
   { source = "src/chrome/linux_entra_sso.json", dest = "/etc/opt/chrome/native-messaging-hosts/", mode = "644" },
@@ -35,6 +46,3 @@ assets = [
   { source = "src/chrome/policies.json", dest = "/etc/opt/chrome/policies/managed/himmelblau.json", mode = "644" },
   { source = "src/chrome/policies.json", dest = "/etc/chromium/policies/managed/himmelblau.json", mode = "644" },
 ]
-
-[package.metadata.generate-rpm.requires]
-python3-pydbus = "*"