From a11856336631d84dfccffd4e7579768173687a20 Mon Sep 17 00:00:00 2001 From: David Culbreth Date: Wed, 25 Mar 2026 10:52:07 -0500 Subject: [PATCH] building? hopefully? --- Cargo.lock | 96 ++++--------------------------- Cargo.toml | 2 +- crates/api/Cargo.toml | 2 +- crates/worker/src/registration.rs | 2 +- 4 files changed, 14 insertions(+), 88 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8eca6f4..87f13ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2150,21 +2150,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -3065,15 +3050,17 @@ dependencies = [ "futures-util", "lber", "log", - "native-tls", "nom 7.1.3", "percent-encoding", + "rustls", + "rustls-native-certs", "thiserror 2.0.18", "tokio", - "tokio-native-tls", + "tokio-rustls", "tokio-stream", "tokio-util", "url", + "x509-parser", ] [[package]] @@ -3314,23 +3301,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "native-tls" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nom" version = "7.1.3" @@ -3576,50 +3546,12 @@ dependencies = [ "url", ] -[[package]] -name = "openssl" -version = "0.10.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" -[[package]] -name = "openssl-sys" -version = "0.9.112" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -4642,6 +4574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ "aws-lc-rs", + "log", "once_cell", "ring", "rustls-pki-types", @@ -5698,16 +5631,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.4" @@ -5749,9 +5672,11 @@ checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" dependencies = [ "futures-util", "log", - "native-tls", + "rustls", + "rustls-native-certs", + "rustls-pki-types", "tokio", - "tokio-native-tls", + "tokio-rustls", "tungstenite", ] @@ -5938,8 +5863,9 @@ dependencies = [ "http", "httparse", "log", - "native-tls", "rand 0.9.2", + "rustls", + "rustls-pki-types", "sha1", "thiserror 2.0.18", "utf-8", diff --git a/Cargo.toml b/Cargo.toml index c97cab6..7b79f41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ tar = "0.4" flate2 = "1.1" # WebSocket client -tokio-tungstenite = { version = "0.28", features = ["native-tls"] } +tokio-tungstenite = { version = "0.28", features = ["rustls-tls-native-roots"] } # URL parsing url = "2.5" diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 02a8d8b..6c553ce 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -70,7 +70,7 @@ jsonschema = { workspace = true } # HTTP client reqwest = { workspace = true } openidconnect = "4.0" -ldap3 = "0.12" +ldap3 = { version = "0.12", default-features = false, features = ["sync", "tls-rustls-ring"] } url = { workspace = true } # Archive/compression diff --git a/crates/worker/src/registration.rs b/crates/worker/src/registration.rs index 5bdf9fd..d670ab1 100644 --- a/crates/worker/src/registration.rs +++ b/crates/worker/src/registration.rs @@ -452,7 +452,7 @@ mod tests { #[test] fn test_detected_runtimes_json_structure() { // Test the JSON structure that set_detected_runtimes builds - let runtimes = vec![ + let runtimes = [ DetectedRuntime { name: "python".to_string(), path: "/usr/bin/python3".to_string(),