mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-04-30 06:05:04 +02:00
Code Issues Actions10 Packages Projects Releases Wiki Activity

Merge 9ad4ea9e20 into d79188559f

Browse source
This commit is contained in:
dependabot[bot] 2025-04-07 14:41:12 +00:00 committed by GitHub
parent d79188559f 9ad4ea9e20
commit ba6599b044
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 118 additions and 53 deletions
Cargo.lockCargo.toml
server
core
Cargo.toml
testkit
Cargo.toml
unix_integration/nss_kanidm
Cargo.toml

149
Cargo.lock generated
View file

@ -156,7 +156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163" checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163"
dependencies = [ dependencies = [
"askama", "askama",
"axum-core", "axum-core 0.4.5",
"http 1.3.1", "http 1.3.1",
] ]
@ -322,8 +322,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core", "axum-core 0.4.5",
"axum-macros", "axum-macros 0.4.2",
"bytes", "bytes",
"futures-util", "futures-util",
"http 1.3.1", "http 1.3.1",
@ -332,7 +332,7 @@ dependencies = [
"hyper 1.6.0", "hyper 1.6.0",
"hyper-util", "hyper-util",
"itoa", "itoa",
"matchit", "matchit 0.7.3",
"memchr", "memchr",
"mime", "mime",
"multer", "multer",
@ -351,6 +351,33 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "axum"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288"
dependencies = [
"axum-core 0.5.2",
"bytes",
"futures-util",
"http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"itoa",
"matchit 0.8.4",
"memchr",
"mime",
"percent-encoding",
"pin-project-lite",
"rustversion",
"serde",
"sync_wrapper 1.0.2",
"tower 0.5.2",
"tower-layer",
"tower-service",
"tracing",
]
[[package]] [[package]]
name = "axum-core" name = "axum-core"
version = "0.4.5" version = "0.4.5"
@ -373,23 +400,42 @@ dependencies = [
] ]
[[package]] [[package]]
name = "axum-extra" name = "axum-core"
version = "0.9.6" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
dependencies = [ dependencies = [
"axum", "bytes",
"axum-core", "futures-core",
"http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"mime",
"pin-project-lite",
"rustversion",
"sync_wrapper 1.0.2",
"tower-layer",
"tower-service",
"tracing",
]
[[package]]
name = "axum-extra"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d"
dependencies = [
"axum 0.8.3",
"axum-core 0.5.2",
"bytes", "bytes",
"cookie 0.18.1", "cookie 0.18.1",
"fastrand",
"futures-util", "futures-util",
"http 1.3.1", "http 1.3.1",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
"mime", "mime",
"multer",
"pin-project-lite", "pin-project-lite",
"rustversion",
"serde", "serde",
"tower 0.5.2", "tower 0.5.2",
"tower-layer", "tower-layer",
@ -403,7 +449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40f7051fdc094b6e5ea06cab9bca4b198c54dee4472a9419155f0ff19f19901e" checksum = "40f7051fdc094b6e5ea06cab9bca4b198c54dee4472a9419155f0ff19f19901e"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core", "axum-core 0.4.5",
"futures-core", "futures-core",
"http 1.3.1", "http 1.3.1",
"pin-project-lite", "pin-project-lite",
@ -423,6 +469,17 @@ dependencies = [
"syn 2.0.100", "syn 2.0.100",
] ]
[[package]]
name = "axum-macros"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]] [[package]]
name = "axum-server" name = "axum-server"
version = "0.7.2" version = "0.7.2"
@ -662,9 +719,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.17" version = "1.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a" checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
dependencies = [ dependencies = [
"shlex", "shlex",
] ]
@ -724,9 +781,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.34" version = "4.5.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff" checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -734,9 +791,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.34" version = "4.5.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489" checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -2513,9 +2570,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper-util" name = "hyper-util"
version = "0.1.10" version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
@ -2523,6 +2580,7 @@ dependencies = [
"http 1.3.1", "http 1.3.1",
"http-body 1.0.1", "http-body 1.0.1",
"hyper 1.6.0", "hyper 1.6.0",
"libc",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
@ -2981,7 +3039,7 @@ dependencies = [
"md-5", "md-5",
"openssl", "openssl",
"openssl-sys", "openssl-sys",
"rand 0.8.5", "rand 0.9.0",
"serde", "serde",
"sha-crypt", "sha-crypt",
"sha2", "sha2",
@ -3128,10 +3186,10 @@ version = "1.6.0-dev"
dependencies = [ dependencies = [
"askama", "askama",
"askama_axum", "askama_axum",
"axum", "axum 0.7.9",
"axum-extra", "axum-extra",
"axum-htmx", "axum-htmx",
"axum-macros", "axum-macros 0.5.0",
"axum-server", "axum-server",
"bytes", "bytes",
"chrono", "chrono",
@ -3207,7 +3265,7 @@ dependencies = [
"num_enum", "num_enum",
"openssl", "openssl",
"openssl-sys", "openssl-sys",
"rand 0.8.5", "rand 0.9.0",
"regex", "regex",
"rusqlite", "rusqlite",
"serde", "serde",
@ -3376,9 +3434,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
[[package]] [[package]]
name = "libmimalloc-sys" name = "libmimalloc-sys"
version = "0.1.40" version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07d0e07885d6a754b9c7993f2625187ad694ee985d60f23355ff0e7077261502" checksum = "6b20daca3a4ac14dbdc753c5e90fc7b490a48a9131daed3c9a9ced7b2defd37b"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -3518,6 +3576,12 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
[[package]]
name = "matchit"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
[[package]] [[package]]
name = "mathru" name = "mathru"
version = "0.13.0" version = "0.13.0"
@ -3563,9 +3627,9 @@ dependencies = [
[[package]] [[package]]
name = "mimalloc" name = "mimalloc"
version = "0.1.44" version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99585191385958383e13f6b822e6b6d8d9cf928e7d286ceb092da92b43c87bc1" checksum = "03cb1f88093fe50061ca1195d336ffec131347c7b833db31f9ab62a2d1b7925f"
dependencies = [ dependencies = [
"libmimalloc-sys", "libmimalloc-sys",
] ]
@ -3955,9 +4019,9 @@ checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b"
[[package]] [[package]]
name = "openssl" name = "openssl"
version = "0.10.71" version = "0.10.72"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"cfg-if", "cfg-if",
@ -3987,9 +4051,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.9.106" version = "0.9.107"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -4097,8 +4161,8 @@ dependencies = [
"kanidm_client", "kanidm_client",
"mathru", "mathru",
"mimalloc", "mimalloc",
"rand 0.8.5", "rand 0.9.0",
"rand_chacha 0.3.1", "rand_chacha 0.9.0",
"serde", "serde",
"serde_json", "serde_json",
"tokio", "tokio",
@ -4221,11 +4285,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]] [[package]]
name = "petgraph" name = "petgraph"
version = "0.7.1" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" checksum = "c96dc3f2709da98e228764d8f4c01c39a101dcc441547e8036372ee0522eb108"
dependencies = [ dependencies = [
"fixedbitset", "fixedbitset",
"hashbrown 0.15.2",
"indexmap 2.8.0", "indexmap 2.8.0",
"serde", "serde",
] ]
@ -5326,9 +5391,9 @@ dependencies = [
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.5.8" version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.52.0", "windows-sys 0.52.0",
@ -5656,9 +5721,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.44.1" version = "1.44.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -5773,7 +5838,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
dependencies = [ dependencies = [
"async-stream", "async-stream",
"async-trait", "async-trait",
"axum", "axum 0.7.9",
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
"h2 0.4.8", "h2 0.4.8",
@ -6128,7 +6193,7 @@ version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da" checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da"
dependencies = [ dependencies = [
"axum", "axum 0.7.9",
"mime_guess", "mime_guess",
"regex", "regex",
"rust-embed", "rust-embed",

14
Cargo.toml
View file

@ -159,7 +159,7 @@ base64 = "^0.22.1"
base64urlsafedata = "0.5.1" base64urlsafedata = "0.5.1"
bitflags = "^2.8.0" bitflags = "^2.8.0"
bytes = "^1.9.0" bytes = "^1.9.0"
clap = { version = "^4.5.34", features = ["derive", "env"] } clap = { version = "^4.5.35", features = ["derive", "env"] }
clap_complete = "^4.5.42" clap_complete = "^4.5.42"
# Forced by saffron/cron # Forced by saffron/cron
chrono = "^0.4.39" chrono = "^0.4.39"
@ -183,7 +183,7 @@ http = "1.2.0"
hyper = { version = "1.5.1", features = [ hyper = { version = "1.5.1", features = [
"full", "full",
] } # hyper full includes client/server/http2 ] } # hyper full includes client/server/http2
hyper-util = { version = "0.1.10", features = ["server", "tokio"] } hyper-util = { version = "0.1.11", features = ["server", "tokio"] }
idlset = "^0.2.5" idlset = "^0.2.5"
image = { version = "0.24.9", default-features = false, features = [ image = { version = "0.24.9", default-features = false, features = [
"gif", "gif",
@ -205,12 +205,12 @@ lodepng = "3.11.0"
lru = "^0.13.0" lru = "^0.13.0"
mathru = "^0.13.0" mathru = "^0.13.0"
md-5 = "0.10.6" md-5 = "0.10.6"
mimalloc = "0.1.43" mimalloc = "0.1.45"
notify-debouncer-full = { version = "0.5" } notify-debouncer-full = { version = "0.5" }
num_enum = "^0.5.11" num_enum = "^0.5.11"
oauth2_ext = { version = "^4.4.2", package = "oauth2", default-features = false } oauth2_ext = { version = "^4.4.2", package = "oauth2", default-features = false }
openssl-sys = "^0.9" openssl-sys = "^0.9"
openssl = "^0.10.70" openssl = "^0.10.72"
opentelemetry = { version = "0.27.0" } opentelemetry = { version = "0.27.0" }
opentelemetry_api = { version = "0.27.0", features = ["logs", "metrics"] } opentelemetry_api = { version = "0.27.0", features = ["logs", "metrics"] }
@ -232,8 +232,8 @@ prctl = "1.0.0"
proc-macro2 = "1.0.93" proc-macro2 = "1.0.93"
qrcode = "^0.12.0" qrcode = "^0.12.0"
quote = "1" quote = "1"
rand = "^0.8.5" rand = "^0.9.0"
rand_chacha = "0.3.1" rand_chacha = "0.9.0"
regex = "1.11.0" regex = "1.11.0"
reqwest = { version = "0.12.12", default-features = false, features = [ reqwest = { version = "0.12.12", default-features = false, features = [
"cookies", "cookies",
@ -268,7 +268,7 @@ tempfile = "3.15.0"
testkit-macros = { path = "./server/testkit-macros" } testkit-macros = { path = "./server/testkit-macros" }
time = { version = "^0.3.36", features = ["formatting", "local-offset"] } time = { version = "^0.3.36", features = ["formatting", "local-offset"] }
tokio = "^1.43.0" tokio = "^1.44.2"
tokio-openssl = "^0.6.5" tokio-openssl = "^0.6.5"
tokio-util = "^0.7.13" tokio-util = "^0.7.13"

4
server/core/Cargo.toml
View file

@ -24,8 +24,8 @@ askama = { workspace = true, features = ["with-axum"] }
askama_axum = { workspace = true } askama_axum = { workspace = true }
axum = { workspace = true } axum = { workspace = true }
axum-htmx = { workspace = true } axum-htmx = { workspace = true }
axum-extra = { version = "0.9.6", features = ["cookie"] } axum-extra = { version = "0.10.1", features = ["cookie"] }
axum-macros = "0.4.2" axum-macros = "0.5.0"
axum-server = { version = "0.7.1", default-features = false } axum-server = { version = "0.7.1", default-features = false }
bytes = { workspace = true } bytes = { workspace = true }
chrono = { workspace = true } chrono = { workspace = true }

2
server/testkit/Cargo.toml
View file

@ -57,7 +57,7 @@ ldap3_client = { workspace = true }
oauth2_ext = { workspace = true, default-features = false, features = [ oauth2_ext = { workspace = true, default-features = false, features = [
"reqwest", "reqwest",
] } ] }
petgraph = { version = "0.7.1", features = ["serde"] } petgraph = { version = "0.8.0", features = ["serde"] }
serde_json = { workspace = true } serde_json = { workspace = true }
time = { workspace = true } time = { workspace = true }
tokio-openssl = { workspace = true } tokio-openssl = { workspace = true }

2
unix_integration/nss_kanidm/Cargo.toml
View file

@ -24,7 +24,7 @@ libc = { workspace = true }
lazy_static = { workspace = true } lazy_static = { workspace = true }
[target."cfg(target_os = \"freebsd\")".build-dependencies] [target."cfg(target_os = \"freebsd\")".build-dependencies]
cc = "^1.2.10" cc = "^1.2.18"
## Debian packaging ## Debian packaging
[package.metadata.deb] [package.metadata.deb]