diff --git a/Cargo.lock b/Cargo.lock index d5e4b10ca..d514e5cd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -407,18 +407,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-auth" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8169113a185f54f68614fcfc3581df585d30bf8542bcb99496990e1025e4120a" -dependencies = [ - "async-trait", - "axum-core 0.4.5", - "base64 0.21.7", - "http 1.1.0", -] - [[package]] name = "axum-core" version = "0.3.4" @@ -1238,7 +1226,6 @@ dependencies = [ "serde", "serde_json", "sketching", - "tempfile", "tokio", "tokio-util", "toml", @@ -3467,7 +3454,6 @@ dependencies = [ "askama_axum", "async-trait", "axum 0.7.7", - "axum-auth", "axum-extra", "axum-htmx", "axum-macros", @@ -3530,7 +3516,6 @@ dependencies = [ "criterion", "dhat", "dyn-clone", - "enum-iterator", "fernet", "futures", "hashbrown 0.14.5", @@ -3598,7 +3583,6 @@ dependencies = [ "fantoccini", "futures", "http 1.1.0", - "hyper-tls", "jsonschema", "kanidm_build_profiles", "kanidm_client", @@ -3615,7 +3599,6 @@ dependencies = [ "serde", "serde_json", "sketching", - "tempfile", "testkit-macros", "time", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 69bc5d9de..476d09c0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -190,7 +190,6 @@ hyper = { version = "1.5.0", features = [ "full", ] } # hyper full includes client/server/http2 hyper-util = { version = "0.1.9", features = ["server", "tokio"] } -hyper-tls = "0.6.0" idlset = "^0.2.5" image = { version = "0.24.9", default-features = false, features = [ "gif", diff --git a/libs/crypto/build.rs b/libs/crypto/build.rs index a00da843c..2ab475f99 100644 --- a/libs/crypto/build.rs +++ b/libs/crypto/build.rs @@ -2,7 +2,7 @@ use std::env; fn main() { // Allows openssl3 as a cfg flag - println!("cargo::rustc-check-cfg=cfg(openssl3)"); + println!("cargo:rustc-check-cfg=cfg(openssl3)"); println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=DEP_OPENSSL_VERSION_NUMBER"); diff --git a/libs/scim_proto/Cargo.toml b/libs/scim_proto/Cargo.toml index 48aea2dff..ba8e4bc6b 100644 --- a/libs/scim_proto/Cargo.toml +++ b/libs/scim_proto/Cargo.toml @@ -27,9 +27,9 @@ time = { workspace = true, features = [ "parsing", "serde", ] } -tracing = { workspace = true } url = { workspace = true, features = ["serde"] } utoipa = { workspace = true } uuid = { workspace = true, features = ["serde"] } [dev-dependencies] +tracing = { workspace = true } tracing-subscriber = { workspace = true } diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 7bc548d72..ef1661da1 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -30,7 +30,6 @@ num_enum = { workspace = true } scim_proto = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -serde_urlencoded = { workspace = true } serde_with = { workspace = true, features = ["time_0_3", "base64", "hex"] } smartstring = { workspace = true, features = ["serde"] } time = { workspace = true, features = ["serde", "std"] } @@ -45,3 +44,4 @@ sshkeys = { workspace = true } [dev-dependencies] enum-iterator = { workspace = true } +serde_urlencoded = { workspace = true } diff --git a/server/core/Cargo.toml b/server/core/Cargo.toml index a71a2af43..8bf55d47b 100644 --- a/server/core/Cargo.toml +++ b/server/core/Cargo.toml @@ -26,7 +26,6 @@ askama = { workspace = true, features = ["with-axum"] } askama_axum = { workspace = true } axum = { workspace = true } axum-htmx = { workspace = true } -axum-auth = "0.7.0" axum-extra = { version = "0.9.4", features = ["cookie"] } axum-macros = "0.4.1" axum-server = { version = "0.7.1", features = ["tls-openssl"] } diff --git a/server/daemon/Cargo.toml b/server/daemon/Cargo.toml index 58f87cea6..8d6425b36 100644 --- a/server/daemon/Cargo.toml +++ b/server/daemon/Cargo.toml @@ -38,7 +38,6 @@ serde = { workspace = true, features = ["derive"] } tokio = { workspace = true, features = ["rt-multi-thread", "macros", "signal"] } tokio-util = { workspace = true, features = ["codec"] } toml = { workspace = true } -tempfile = { workspace = true } tracing = { workspace = true } serde_json.workspace = true diff --git a/server/lib/Cargo.toml b/server/lib/Cargo.toml index b8aebc0d8..75144eeb1 100644 --- a/server/lib/Cargo.toml +++ b/server/lib/Cargo.toml @@ -39,7 +39,6 @@ compact_jwt = { workspace = true, features = ["openssl", "hsm-crypto"] } concread = { workspace = true } dhat = { workspace = true, optional = true } dyn-clone = { workspace = true } -enum-iterator = { workspace = true } fernet = { workspace = true, features = ["fernet_danger_timestamps"] } # futures-util = { workspace = true } hashbrown = { workspace = true } diff --git a/server/testkit/Cargo.toml b/server/testkit/Cargo.toml index 1f3778937..df4e49a58 100644 --- a/server/testkit/Cargo.toml +++ b/server/testkit/Cargo.toml @@ -25,7 +25,6 @@ webdriver = [] dev-oauth2-device-flow = [] [dependencies] -hyper-tls = { workspace = true } http = { workspace = true } kanidm_client = { workspace = true } kanidm_proto = { workspace = true } @@ -37,7 +36,6 @@ regex = { workspace = true } reqwest = { workspace = true, default-features = false, features = ["cookies"] } serde = { workspace = true } sketching = { workspace = true } -tempfile = { workspace = true } testkit-macros = { workspace = true } tokio = { workspace = true, features = [ "net", diff --git a/tools/cli/Cargo.toml b/tools/cli/Cargo.toml index aa0489885..bf3d79c37 100644 --- a/tools/cli/Cargo.toml +++ b/tools/cli/Cargo.toml @@ -90,9 +90,17 @@ maintainer = "James Hodgkinson " depends = ["libc6", "libudev1", "libssl3 | libssl3t64"] section = "admin" priority = "optional" -changelog = "../../target/debian/changelog" # Generated by packaging scripts +changelog = "../../target/debian/changelog" # Generated by packaging scripts assets = [ - [ "target/release/kanidm", "usr/bin/", "755" ], - [ "../../examples/config", "usr/share/kanidm/", "444" ], + [ + "target/release/kanidm", + "usr/bin/", + "755", + ], + [ + "../../examples/config", + "usr/share/kanidm/", + "444", + ], ] maintainer-scripts = "debian/"