diff --git a/Cargo.lock b/Cargo.lock
index 3f2928c6d..ad441e969 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,7 +28,7 @@ dependencies = [
"once_cell",
"serde",
"version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
]
[[package]]
@@ -113,9 +113,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.96"
+version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
[[package]]
name = "arc-swap"
@@ -157,7 +157,7 @@ checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163"
dependencies = [
"askama",
"axum-core",
- "http 1.2.0",
+ "http 1.3.1",
]
[[package]]
@@ -173,7 +173,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -215,7 +215,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
"synstructure",
]
@@ -227,14 +227,14 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
name = "async-compression"
-version = "0.4.18"
+version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
+checksum = "310c9bcae737a48ef5cdee3174184e6d548b292739ede61a1f955ef76a738861"
dependencies = [
"flate2",
"futures-core",
@@ -262,18 +262,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
name = "async-trait"
-version = "0.1.86"
+version = "0.1.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
+checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -326,7 +326,7 @@ dependencies = [
"axum-macros",
"bytes",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper 1.6.0",
@@ -360,7 +360,7 @@ dependencies = [
"async-trait",
"bytes",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"mime",
@@ -384,7 +384,7 @@ dependencies = [
"cookie 0.18.1",
"fastrand",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"mime",
@@ -405,7 +405,7 @@ dependencies = [
"async-trait",
"axum-core",
"futures-core",
- "http 1.2.0",
+ "http 1.3.1",
"pin-project-lite",
"serde",
"serde_json",
@@ -420,7 +420,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -431,7 +431,7 @@ checksum = "56bac90848f6a9393ac03c63c640925c4b7c8ca21654de40d53f55964667c7d8"
dependencies = [
"bytes",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper 1.6.0",
@@ -483,9 +483,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "base64ct"
-version = "1.6.0"
+version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
[[package]]
name = "base64urlsafedata"
@@ -500,9 +500,9 @@ dependencies = [
[[package]]
name = "basic-toml"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8"
+checksum = "ba62675e8242a4c4e806d12f11d136e626e6c8361d6b829310732241652a178a"
dependencies = [
"serde",
]
@@ -513,7 +513,7 @@ version = "0.66.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cexpr",
"clang-sys",
"lazy_static",
@@ -526,17 +526,17 @@ dependencies = [
"regex",
"rustc-hash 1.1.0",
"shlex",
- "syn 2.0.98",
+ "syn 2.0.100",
"which",
]
[[package]]
name = "bindgen"
-version = "0.70.1"
+version = "0.71.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
+checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cexpr",
"clang-sys",
"itertools 0.13.0",
@@ -545,9 +545,9 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "rustc-hash 1.1.0",
+ "rustc-hash 2.1.1",
"shlex",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -594,9 +594,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.8.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
[[package]]
name = "blake2"
@@ -647,9 +647,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
[[package]]
name = "bytemuck"
-version = "1.21.0"
+version = "1.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
[[package]]
name = "byteorder"
@@ -659,15 +659,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.10.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]]
name = "cc"
-version = "1.2.15"
+version = "1.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
dependencies = [
"shlex",
]
@@ -701,9 +701,9 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919"
[[package]]
name = "chrono"
-version = "0.4.39"
+version = "0.4.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
dependencies = [
"android-tzdata",
"iana-time-zone",
@@ -711,7 +711,7 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
]
[[package]]
@@ -727,9 +727,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.30"
+version = "4.5.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
dependencies = [
"clap_builder",
"clap_derive",
@@ -737,9 +737,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.30"
+version = "4.5.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
dependencies = [
"anstream",
"anstyle",
@@ -749,23 +749,23 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.45"
+version = "4.5.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e3040c8291884ddf39445dc033c70abc2bc44a42f0a3a00571a0f483a83f0cd"
+checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
-version = "4.5.28"
+version = "4.5.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -830,9 +830,9 @@ dependencies = [
[[package]]
name = "console"
-version = "0.15.10"
+version = "0.15.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
dependencies = [
"encode_unicode",
"libc",
@@ -1044,7 +1044,7 @@ dependencies = [
"kanidmd_core",
"mimalloc",
"prctl",
- "reqwest 0.12.12",
+ "reqwest 0.12.14",
"sd-notify",
"serde_json",
"sketching",
@@ -1099,7 +1099,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim 0.11.1",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -1121,7 +1121,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core 0.20.10",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -1165,7 +1165,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -1287,7 +1287,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -1307,15 +1307,15 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "dyn-clone"
-version = "1.0.18"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35"
+checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
[[package]]
name = "either"
-version = "1.13.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "email_address"
@@ -1358,7 +1358,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -1378,7 +1378,7 @@ checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -1452,7 +1452,7 @@ dependencies = [
"cookie 0.18.1",
"futures-core",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body-util",
"hyper 1.6.0",
"hyper-tls",
@@ -1494,11 +1494,11 @@ dependencies = [
[[package]]
name = "file-id"
-version = "0.1.0"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13be71e6ca82e91bc0cb862bebaac0b2d1924a5a1d970c822b2f98b63fda8c3"
+checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
dependencies = [
- "winapi-util",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1527,9 +1527,9 @@ checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec"
[[package]]
name = "flate2"
-version = "1.0.35"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1598,7 +1598,7 @@ version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c29c30684418547d476f0b48e84f4821639119c483b1eccd566c8cd0cd05f521"
dependencies = [
- "rustix",
+ "rustix 0.38.44",
"windows-sys 0.52.0",
]
@@ -1667,7 +1667,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -1810,7 +1810,7 @@ version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b1f1d8764958699dc764e3f727cef280ff4d1bd92c107bbf8acd85b30c1bd6f"
dependencies = [
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
]
[[package]]
@@ -1854,11 +1854,11 @@ version = "0.14.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11365144ef93082f3403471dbaa94cfe4b5e72743bdb9560719a251d439f4cee"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"bstr",
"gix-path",
"libc",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
]
[[package]]
@@ -1937,7 +1937,7 @@ version = "0.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"bstr",
"gix-features",
"gix-path",
@@ -1983,7 +1983,7 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -2053,7 +2053,7 @@ dependencies = [
"gix-trace",
"home",
"once_cell",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
]
[[package]]
@@ -2064,7 +2064,7 @@ checksum = "e49357fccdb0c85c0d3a3292a9f6db32d9b3535959b5471bb9624908f4a066c6"
dependencies = [
"bstr",
"gix-utils",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
]
[[package]]
@@ -2137,7 +2137,7 @@ version = "0.10.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d84dae13271f4313f8d60a166bf27e54c968c7c33e2ffd31c48cafe5da649875"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"gix-path",
"libc",
"windows-sys 0.52.0",
@@ -2168,7 +2168,7 @@ version = "0.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"gix-commitgraph",
"gix-date",
"gix-hash",
@@ -2231,7 +2231,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.12",
- "indexmap 2.7.1",
+ "indexmap 2.8.0",
"slab",
"tokio",
"tokio-util",
@@ -2249,8 +2249,8 @@ dependencies = [
"fnv",
"futures-core",
"futures-sink",
- "http 1.2.0",
- "indexmap 2.7.1",
+ "http 1.3.1",
+ "indexmap 2.8.0",
"slab",
"tokio",
"tokio-util",
@@ -2340,9 +2340,9 @@ dependencies = [
[[package]]
name = "http"
-version = "1.2.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
dependencies = [
"bytes",
"fnv",
@@ -2367,18 +2367,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
- "http 1.2.0",
+ "http 1.3.1",
]
[[package]]
name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
dependencies = [
"bytes",
- "futures-util",
- "http 1.2.0",
+ "futures-core",
+ "http 1.3.1",
"http-body 1.0.1",
"pin-project-lite",
]
@@ -2391,9 +2391,9 @@ checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c"
[[package]]
name = "httparse"
-version = "1.10.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
[[package]]
name = "httpdate"
@@ -2444,7 +2444,7 @@ dependencies = [
"futures-channel",
"futures-util",
"h2 0.4.8",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"httparse",
"httpdate",
@@ -2462,7 +2462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
dependencies = [
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"hyper 1.6.0",
"hyper-util",
"rustls",
@@ -2512,7 +2512,7 @@ dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"hyper 1.6.0",
"pin-project-lite",
@@ -2660,7 +2660,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -2742,9 +2742,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.7.1"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
dependencies = [
"equivalent",
"hashbrown 0.15.2",
@@ -2753,11 +2753,11 @@ dependencies = [
[[package]]
name = "inotify"
-version = "0.9.6"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.0",
"inotify-sys",
"libc",
]
@@ -2812,9 +2812,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jpeg-decoder"
@@ -2851,7 +2851,7 @@ dependencies = [
"percent-encoding",
"referencing",
"regex-syntax 0.8.5",
- "reqwest 0.12.12",
+ "reqwest 0.12.14",
"serde",
"serde_json",
"uuid-simd",
@@ -2938,11 +2938,11 @@ name = "kanidm_client"
version = "1.6.0-dev"
dependencies = [
"compact_jwt",
- "http 1.2.0",
+ "http 1.3.1",
"hyper 1.6.0",
"kanidm_lib_file_permissions",
"kanidm_proto",
- "reqwest 0.12.12",
+ "reqwest 0.12.14",
"serde",
"serde_json",
"serde_urlencoded",
@@ -2962,7 +2962,7 @@ dependencies = [
"anyhow",
"kanidm_proto",
"oauth2 5.0.0",
- "reqwest 0.12.12",
+ "reqwest 0.12.14",
"sketching",
"tokio",
"tracing",
@@ -3183,7 +3183,7 @@ version = "1.6.0-dev"
dependencies = [
"base64 0.22.1",
"base64urlsafedata",
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"compact_jwt",
"concread",
"dhat",
@@ -3236,7 +3236,7 @@ version = "1.6.0-dev"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -3258,7 +3258,7 @@ dependencies = [
"oauth2 4.4.2",
"openssl",
"petgraph",
- "reqwest 0.12.12",
+ "reqwest 0.12.14",
"serde",
"serde_json",
"sketching",
@@ -3354,9 +3354,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.169"
+version = "0.2.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]]
name = "libloading"
@@ -3365,7 +3365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [
"cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -3400,7 +3400,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"libc",
"redox_syscall",
]
@@ -3443,10 +3443,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
[[package]]
-name = "litemap"
-version = "0.7.4"
+name = "linux-raw-sys"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+
+[[package]]
+name = "litemap"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
[[package]]
name = "litrs"
@@ -3610,18 +3616,6 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bec4598fddb13cc7b528819e697852653252b760f1228b7642679bf2ff2cd07"
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "mio"
version = "1.0.3"
@@ -3629,6 +3623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
dependencies = [
"libc",
+ "log",
"wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.52.0",
]
@@ -3642,7 +3637,7 @@ dependencies = [
"bytes",
"encoding_rs",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"httparse",
"memchr",
"mime",
@@ -3673,7 +3668,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cfg-if",
"cfg_aliases",
"libc",
@@ -3700,36 +3695,42 @@ dependencies = [
[[package]]
name = "notify"
-version = "6.1.1"
+version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
dependencies = [
- "bitflags 2.8.0",
- "crossbeam-channel",
+ "bitflags 2.9.0",
"filetime",
"fsevent-sys",
"inotify",
"kqueue",
"libc",
"log",
- "mio 0.8.11",
+ "mio",
+ "notify-types",
"walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "notify-debouncer-full"
-version = "0.1.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4812c1eb49be776fb8df4961623bdc01ec9dfdc1abe8211ceb09150a2e64219"
+checksum = "d2d88b1a7538054351c8258338df7c931a590513fb3745e8c15eb9ff4199b8d1"
dependencies = [
- "crossbeam-channel",
"file-id",
+ "log",
"notify",
- "parking_lot",
+ "notify-types",
"walkdir",
]
+[[package]]
+name = "notify-types"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
+
[[package]]
name = "nss_kanidm"
version = "1.6.0-dev"
@@ -3917,9 +3918,9 @@ dependencies = [
"base64 0.22.1",
"chrono",
"getrandom 0.2.15",
- "http 1.2.0",
+ "http 1.3.1",
"rand",
- "reqwest 0.12.12",
+ "reqwest 0.12.14",
"serde",
"serde_json",
"serde_path_to_error",
@@ -3957,9 +3958,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.20.3"
+version = "1.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
[[package]]
name = "openssl"
@@ -3967,7 +3968,7 @@ version = "0.10.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"cfg-if",
"foreign-types",
"libc",
@@ -3984,7 +3985,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -4027,7 +4028,7 @@ checksum = "10a8a7f5f6ba7c1b286c2fbca0454eaba116f63bbe69ed250b642d36fbb04d80"
dependencies = [
"async-trait",
"bytes",
- "http 1.2.0",
+ "http 1.3.1",
"opentelemetry",
]
@@ -4039,7 +4040,7 @@ checksum = "91cf61a1868dacc576bf2b2a1c3e9ab150af7272909e80085c3173384fe11f76"
dependencies = [
"async-trait",
"futures-core",
- "http 1.2.0",
+ "http 1.3.1",
"opentelemetry",
"opentelemetry-http",
"opentelemetry-proto",
@@ -4187,9 +4188,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]]
name = "peg"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f"
+checksum = "9928cfca101b36ec5163e70049ee5368a8a1c3c6efc9ca9c5f9cc2f816152477"
dependencies = [
"peg-macros",
"peg-runtime",
@@ -4197,9 +4198,9 @@ dependencies = [
[[package]]
name = "peg-macros"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426"
+checksum = "6298ab04c202fa5b5d52ba03269fb7b74550b150323038878fe6c372d8280f71"
dependencies = [
"peg-runtime",
"proc-macro2",
@@ -4208,9 +4209,9 @@ dependencies = [
[[package]]
name = "peg-runtime"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a"
+checksum = "132dca9b868d927b35b5dd728167b2dee150eb1ad686008fc71ccb298b776fca"
[[package]]
name = "pem-rfc7468"
@@ -4234,7 +4235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
dependencies = [
"fixedbitset",
- "indexmap 2.7.1",
+ "indexmap 2.8.0",
"serde",
]
@@ -4275,22 +4276,22 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.9"
+version = "1.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.9"
+version = "1.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -4307,9 +4308,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "powerfmt"
@@ -4319,11 +4320,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
- "zerocopy",
+ "zerocopy 0.8.23",
]
[[package]]
@@ -4338,12 +4339,12 @@ dependencies = [
[[package]]
name = "prettyplease"
-version = "0.2.29"
+version = "0.2.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
+checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
dependencies = [
"proc-macro2",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -4382,9 +4383,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [
"unicode-ident",
]
@@ -4415,7 +4416,7 @@ dependencies = [
"itertools 0.14.0",
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -4463,7 +4464,7 @@ dependencies = [
"rustc-hash 2.1.1",
"rustls",
"socket2",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
"tokio",
"tracing",
]
@@ -4482,7 +4483,7 @@ dependencies = [
"rustls",
"rustls-pki-types",
"slab",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
"tinyvec",
"tracing",
"web-time",
@@ -4504,9 +4505,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2",
]
@@ -4543,11 +4544,11 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.9"
+version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
]
[[package]]
@@ -4563,22 +4564,22 @@ dependencies = [
[[package]]
name = "ref-cast"
-version = "1.0.23"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
+checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.23"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
+checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -4683,9 +4684,9 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.12.12"
+version = "0.12.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+checksum = "989e327e510263980e231de548a33e63d34962d29ae61b467389a1a09627a254"
dependencies = [
"async-compression",
"base64 0.22.1",
@@ -4696,7 +4697,7 @@ dependencies = [
"futures-core",
"futures-util",
"h2 0.4.8",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper 1.6.0",
@@ -4743,9 +4744,9 @@ dependencies = [
[[package]]
name = "ring"
-version = "0.17.13"
+version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
dependencies = [
"cc",
"cfg-if",
@@ -4787,9 +4788,9 @@ dependencies = [
[[package]]
name = "rust-embed"
-version = "8.5.0"
+version = "8.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
+checksum = "0b3aba5104622db5c9fc61098de54708feb732e7763d7faa2fa625899f00bf6f"
dependencies = [
"rust-embed-impl",
"rust-embed-utils",
@@ -4798,22 +4799,22 @@ dependencies = [
[[package]]
name = "rust-embed-impl"
-version = "8.5.0"
+version = "8.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
+checksum = "1f198c73be048d2c5aa8e12f7960ad08443e56fd39cc26336719fdb4ea0ebaae"
dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
- "syn 2.0.98",
+ "syn 2.0.100",
"walkdir",
]
[[package]]
name = "rust-embed-utils"
-version = "8.5.0"
+version = "8.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
+checksum = "5a2fcdc9f40c8dc2922842ca9add611ad19f332227fc651d015881ad1552bd9a"
dependencies = [
"sha2",
"walkdir",
@@ -4852,10 +4853,23 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"errno",
"libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.2",
"windows-sys 0.59.0",
]
@@ -4916,15 +4930,15 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.19"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
[[package]]
name = "ryu"
-version = "1.0.19"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]]
name = "same-file"
@@ -4982,7 +4996,7 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"core-foundation 0.9.4",
"core-foundation-sys",
"libc",
@@ -4995,7 +5009,7 @@ version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"core-foundation 0.10.0",
"core-foundation-sys",
"libc",
@@ -5018,7 +5032,7 @@ version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0139b2436c81305eb6bda33af151851f75bd62783817b25f44daa371119c30b5"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"libc",
"once_cell",
"reference-counted-singleton",
@@ -5028,11 +5042,11 @@ dependencies = [
[[package]]
name = "selinux-sys"
-version = "0.6.13"
+version = "0.6.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e6e2b8e07a8ff45c90f8e3611bf10c4da7a28d73a26f9ede04f927da234f52"
+checksum = "280da3df1236da180be5ac50a893b26a1d3c49e3a44acb2d10d1f082523ff916"
dependencies = [
- "bindgen 0.70.1",
+ "bindgen 0.71.1",
"cc",
"dunce",
"walkdir",
@@ -5040,24 +5054,24 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.25"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
[[package]]
name = "serde"
-version = "1.0.218"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_bytes"
-version = "0.11.15"
+version = "0.11.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
dependencies = [
"serde",
]
@@ -5084,20 +5098,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.218"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
name = "serde_json"
-version = "1.0.139"
+version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
dependencies = [
"itoa",
"memchr",
@@ -5107,9 +5121,9 @@ dependencies = [
[[package]]
name = "serde_path_to_error"
-version = "0.1.16"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
+checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
dependencies = [
"itoa",
"serde",
@@ -5137,7 +5151,7 @@ dependencies = [
"chrono",
"hex",
"indexmap 1.9.3",
- "indexmap 2.7.1",
+ "indexmap 2.8.0",
"serde",
"serde_derive",
"serde_json",
@@ -5154,7 +5168,7 @@ dependencies = [
"darling 0.20.10",
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -5392,9 +5406,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.98"
+version = "2.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
dependencies = [
"proc-macro2",
"quote",
@@ -5424,7 +5438,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -5456,15 +5470,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.17.1"
+version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
+checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
dependencies = [
- "cfg-if",
"fastrand",
"getrandom 0.3.1",
"once_cell",
- "rustix",
+ "rustix 1.0.2",
"windows-sys 0.59.0",
]
@@ -5474,7 +5487,7 @@ version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -5488,11 +5501,11 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "2.0.11"
+version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
dependencies = [
- "thiserror-impl 2.0.11",
+ "thiserror-impl 2.0.12",
]
[[package]]
@@ -5503,18 +5516,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
name = "thiserror-impl"
-version = "2.0.11"
+version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -5535,9 +5548,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.37"
+version = "0.3.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
dependencies = [
"deranged",
"itoa",
@@ -5552,15 +5565,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
[[package]]
name = "time-macros"
-version = "0.2.19"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
dependencies = [
"num-conv",
"time-core",
@@ -5578,9 +5591,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
dependencies = [
"tinyvec_macros",
]
@@ -5609,19 +5622,19 @@ checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
name = "tokio"
-version = "1.43.0"
+version = "1.44.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
dependencies = [
"backtrace",
"bytes",
"libc",
- "mio 1.0.3",
+ "mio",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
@@ -5638,7 +5651,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -5664,9 +5677,9 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
dependencies = [
"rustls",
"tokio",
@@ -5686,9 +5699,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.13"
+version = "0.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
dependencies = [
"bytes",
"futures-core",
@@ -5718,7 +5731,7 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.8.0",
"toml_datetime",
"winnow 0.5.40",
]
@@ -5735,7 +5748,7 @@ dependencies = [
"base64 0.22.1",
"bytes",
"h2 0.4.8",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper 1.6.0",
@@ -5797,11 +5810,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
dependencies = [
"async-compression",
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
"bytes",
"futures-core",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"http-range-header",
@@ -5850,7 +5863,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -5986,9 +5999,9 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217"
[[package]]
name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "unicode-normalization"
@@ -6059,7 +6072,7 @@ version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23"
dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.8.0",
"serde",
"serde_json",
"utoipa-gen",
@@ -6075,7 +6088,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.98",
+ "syn 2.0.100",
"url",
"uuid",
]
@@ -6098,9 +6111,9 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.14.0"
+version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1"
+checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
dependencies = [
"getrandom 0.3.1",
"serde",
@@ -6203,7 +6216,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
"wasm-bindgen-shared",
]
@@ -6238,7 +6251,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -6417,7 +6430,7 @@ dependencies = [
"either",
"home",
"once_cell",
- "rustix",
+ "rustix 0.38.44",
]
[[package]]
@@ -6487,33 +6500,38 @@ dependencies = [
]
[[package]]
-name = "windows-registry"
-version = "0.2.0"
+name = "windows-link"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+
+[[package]]
+name = "windows-registry"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
dependencies = [
"windows-result",
"windows-strings",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.0",
]
[[package]]
name = "windows-result"
-version = "0.2.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
]
[[package]]
name = "windows-strings"
-version = "0.1.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-link",
]
[[package]]
@@ -6567,13 +6585,29 @@ dependencies = [
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
"windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6",
]
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.41.0"
@@ -6592,6 +6626,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.41.0"
@@ -6610,6 +6650,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
[[package]]
name = "windows_i686_gnu"
version = "0.41.0"
@@ -6628,12 +6674,24 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
[[package]]
name = "windows_i686_msvc"
version = "0.41.0"
@@ -6652,6 +6710,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.41.0"
@@ -6670,6 +6734,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.41.0"
@@ -6688,6 +6758,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.41.0"
@@ -6706,6 +6782,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
[[package]]
name = "winnow"
version = "0.5.40"
@@ -6740,7 +6822,7 @@ version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
]
[[package]]
@@ -6804,7 +6886,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
"synstructure",
]
@@ -6814,8 +6896,16 @@ version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
- "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+dependencies = [
+ "zerocopy-derive 0.8.23",
]
[[package]]
@@ -6826,27 +6916,38 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
]
[[package]]
name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
dependencies = [
"zerofrom-derive",
]
[[package]]
name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
"synstructure",
]
@@ -6867,7 +6968,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
@@ -6889,7 +6990,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.98",
+ "syn 2.0.100",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 298955995..e54dea30c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -206,7 +206,7 @@ lru = "^0.12.5"
mathru = "^0.13.0"
md-5 = "0.10.6"
mimalloc = "0.1.43"
-notify-debouncer-full = { version = "0.1" }
+notify-debouncer-full = { version = "0.5" }
num_enum = "^0.5.11"
oauth2_ext = { version = "^4.4.2", package = "oauth2", default-features = false }
openssl-sys = "^0.9"
diff --git a/platform/opensuse/kanidm-unixd.service b/platform/opensuse/kanidm-unixd.service
index 766d14772..3ccb27b97 100644
--- a/platform/opensuse/kanidm-unixd.service
+++ b/platform/opensuse/kanidm-unixd.service
@@ -12,7 +12,7 @@ Conflicts=nscd.service
[Service]
DynamicUser=yes
-SupplementaryGroups=tss shadow
+SupplementaryGroups=tss
UMask=0027
CacheDirectory=kanidm-unixd
RuntimeDirectory=kanidm-unixd
diff --git a/unix_integration/Makefile b/unix_integration/Makefile
new file mode 100644
index 000000000..b6f480dd6
--- /dev/null
+++ b/unix_integration/Makefile
@@ -0,0 +1,19 @@
+
+current_dir = $(shell pwd)
+
+dev_install:
+ @ echo "WARNING: THIS WILL BREAK EXISTING UNIXD INSTALLS"
+ @ echo "ctrl-c now if this is not what you want"
+ @ read
+ @ echo "LAST CHANCE"
+ @ sleep 5
+ ln -s -f $(current_dir)/../platform/opensuse/kanidm-unixd.service /etc/systemd/system/kanidm-unixd.service
+ ln -s -f $(current_dir)/../platform/opensuse/kanidm-unixd-tasks.service /etc/systemd/system/kanidm-unixd-tasks.service
+ ln -s -f $(current_dir)/../target/debug/kanidm-unix /usr/sbin/kanidm-unix
+ ln -s -f $(current_dir)/../target/debug/kanidm_ssh_authorizedkeys /usr/sbin/kanidm_ssh_authorizedkeys
+ ln -s -f $(current_dir)/../target/debug/kanidm_unixd_tasks /usr/sbin/kanidm_unixd_tasks
+ ln -s -f $(current_dir)/../target/debug/kanidm_unixd /usr/sbin/kanidm_unixd
+ ln -s -f $(current_dir)/../target/debug/libpam_kanidm.so /lib64/security/pam_kanidm.so
+ ln -s -f $(current_dir)/../target/debug/libnss_kanidm.so /usr/lib64/libnss_kanidm.so.2
+
+
diff --git a/unix_integration/common/src/unix_passwd.rs b/unix_integration/common/src/unix_passwd.rs
index 02e265c65..4e61fe5b2 100644
--- a/unix_integration/common/src/unix_passwd.rs
+++ b/unix_integration/common/src/unix_passwd.rs
@@ -7,6 +7,13 @@ use std::io::Read;
use std::path::Path;
use std::str::FromStr;
+#[derive(Serialize, Deserialize, Debug)]
+pub struct EtcDb {
+ pub users: Vec<EtcUser>,
+ pub shadow: Vec<EtcShadow>,
+ pub groups: Vec<EtcGroup>,
+}
+
#[derive(Serialize, Deserialize, Debug, PartialEq)]
pub struct EtcUser {
pub name: String,
@@ -39,7 +46,7 @@ pub fn read_etc_passwd_file<P: AsRef<Path>>(path: P) -> Result<Vec<EtcUser>, Uni
parse_etc_passwd(contents.as_slice()).map_err(|_| UnixIntegrationError)
}
-#[derive(Debug, PartialEq, Default)]
+#[derive(PartialEq, Default)]
pub enum CryptPw {
Sha256(String),
Sha512(String),
@@ -56,6 +63,16 @@ impl fmt::Display for CryptPw {
}
}
+impl fmt::Debug for CryptPw {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ CryptPw::Invalid => write!(f, "x"),
+ CryptPw::Sha256(_s) => write!(f, "crypt sha256"),
+ CryptPw::Sha512(_s) => write!(f, "crypt sha512"),
+ }
+ }
+}
+
impl FromStr for CryptPw {
type Err = &'static str;
diff --git a/unix_integration/common/src/unix_proto.rs b/unix_integration/common/src/unix_proto.rs
index 69f88c100..69074c094 100644
--- a/unix_integration/common/src/unix_proto.rs
+++ b/unix_integration/common/src/unix_proto.rs
@@ -1,4 +1,4 @@
-use crate::unix_passwd::{EtcGroup, EtcUser};
+use crate::unix_passwd::{EtcDb, EtcGroup, EtcUser};
use kanidm_proto::internal::OperationError;
use serde::{Deserialize, Serialize};
@@ -200,6 +200,12 @@ pub struct HomeDirectoryInfo {
pub aliases: Vec<String>,
}
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct TaskRequestFrame {
+ pub id: u64,
+ pub req: TaskRequest,
+}
+
#[derive(Serialize, Deserialize, Debug, Clone)]
pub enum TaskRequest {
HomeDirectory(HomeDirectoryInfo),
@@ -207,8 +213,9 @@ pub enum TaskRequest {
#[derive(Serialize, Deserialize, Debug)]
pub enum TaskResponse {
- Success,
+ Success(u64),
Error(String),
+ NotifyShadowChange(EtcDb),
}
#[test]
diff --git a/unix_integration/resolver/src/bin/kanidm_unixd.rs b/unix_integration/resolver/src/bin/kanidm_unixd.rs
index 2ce34edad..9099e3d13 100644
--- a/unix_integration/resolver/src/bin/kanidm_unixd.rs
+++ b/unix_integration/resolver/src/bin/kanidm_unixd.rs
@@ -10,6 +10,31 @@
#![deny(clippy::needless_pass_by_value)]
#![deny(clippy::trivially_copy_pass_by_ref)]
+use bytes::{BufMut, BytesMut};
+use clap::{Arg, ArgAction, Command};
+use futures::{SinkExt, StreamExt};
+use kanidm_client::KanidmClientBuilder;
+use kanidm_hsm_crypto::{soft::SoftTpm, AuthValue, BoxedDynTpm, Tpm};
+use kanidm_proto::constants::DEFAULT_CLIENT_CONFIG_PATH;
+use kanidm_proto::internal::OperationError;
+use kanidm_unix_common::constants::DEFAULT_CONFIG_PATH;
+use kanidm_unix_common::unix_passwd::EtcDb;
+use kanidm_unix_common::unix_proto::{
+ ClientRequest, ClientResponse, TaskRequest, TaskRequestFrame, TaskResponse,
+};
+use kanidm_unix_resolver::db::{Cache, Db};
+use kanidm_unix_resolver::idprovider::interface::IdProvider;
+use kanidm_unix_resolver::idprovider::kanidm::KanidmProvider;
+use kanidm_unix_resolver::idprovider::system::SystemProvider;
+use kanidm_unix_resolver::resolver::Resolver;
+use kanidm_unix_resolver::unix_config::{HsmType, UnixdConfig};
+use kanidm_utils_users::{get_current_gid, get_current_uid, get_effective_gid, get_effective_uid};
+use libc::umask;
+use sketching::tracing::span;
+use sketching::tracing_forest::traits::*;
+use sketching::tracing_forest::util::*;
+use sketching::tracing_forest::{self};
+use std::collections::BTreeMap;
use std::error::Error;
use std::fs::metadata;
use std::io;
@@ -20,29 +45,6 @@ use std::process::ExitCode;
use std::str::FromStr;
use std::sync::Arc;
use std::time::{Duration, SystemTime};
-
-use bytes::{BufMut, BytesMut};
-use clap::{Arg, ArgAction, Command};
-use futures::{SinkExt, StreamExt};
-use kanidm_client::KanidmClientBuilder;
-use kanidm_proto::constants::DEFAULT_CLIENT_CONFIG_PATH;
-use kanidm_proto::internal::OperationError;
-use kanidm_unix_common::constants::DEFAULT_CONFIG_PATH;
-use kanidm_unix_common::unix_passwd::{parse_etc_group, parse_etc_passwd, parse_etc_shadow};
-use kanidm_unix_common::unix_proto::{ClientRequest, ClientResponse, TaskRequest, TaskResponse};
-use kanidm_unix_resolver::db::{Cache, Db};
-use kanidm_unix_resolver::idprovider::interface::IdProvider;
-use kanidm_unix_resolver::idprovider::kanidm::KanidmProvider;
-use kanidm_unix_resolver::idprovider::system::SystemProvider;
-use kanidm_unix_resolver::resolver::Resolver;
-use kanidm_unix_resolver::unix_config::{HsmType, UnixdConfig};
-
-use kanidm_utils_users::{get_current_gid, get_current_uid, get_effective_gid, get_effective_uid};
-use libc::umask;
-use sketching::tracing::span;
-use sketching::tracing_forest::traits::*;
-use sketching::tracing_forest::util::*;
-use sketching::tracing_forest::{self};
use time::OffsetDateTime;
use tokio::fs::File;
use tokio::io::AsyncReadExt; // for read_to_end()
@@ -52,17 +54,16 @@ use tokio::sync::mpsc::{channel, Receiver, Sender};
use tokio::sync::oneshot;
use tokio_util::codec::{Decoder, Encoder, Framed};
-use kanidm_hsm_crypto::{soft::SoftTpm, AuthValue, BoxedDynTpm, Tpm};
-
-use notify_debouncer_full::{new_debouncer, notify::RecursiveMode, notify::Watcher};
-
#[cfg(not(target_os = "illumos"))]
#[global_allocator]
static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
//=== the codec
-type AsyncTaskRequest = (TaskRequest, oneshot::Sender<()>);
+struct AsyncTaskRequest {
+ task_req: TaskRequest,
+ task_chan: oneshot::Sender<()>,
+}
#[derive(Default)]
struct ClientCodec;
@@ -117,11 +118,11 @@ impl Decoder for TaskCodec {
}
}
-impl Encoder<TaskRequest> for TaskCodec {
+impl Encoder<TaskRequestFrame> for TaskCodec {
type Error = io::Error;
- fn encode(&mut self, msg: TaskRequest, dst: &mut BytesMut) -> Result<(), Self::Error> {
- debug!("Attempting to send request -> {:?} ...", msg);
+ fn encode(&mut self, msg: TaskRequestFrame, dst: &mut BytesMut) -> Result<(), Self::Error> {
+ debug!("Attempting to send request -> {:?} ...", msg.id);
let data = serde_json::to_vec(&msg).map_err(|e| {
error!("socket encoding error -> {:?}", e);
io::Error::new(io::ErrorKind::Other, "JSON encode error")
@@ -148,46 +149,79 @@ fn rm_if_exist(p: &str) {
async fn handle_task_client(
stream: UnixStream,
- task_channel_tx: &Sender<AsyncTaskRequest>,
+ notify_shadow_change_tx: &Sender<EtcDb>,
task_channel_rx: &mut Receiver<AsyncTaskRequest>,
+ broadcast_rx: &mut broadcast::Receiver<bool>,
) -> Result<(), Box<dyn Error>> {
- // setup the codec
- let mut reqs = Framed::new(stream, TaskCodec);
+ // setup the codec, this is to the unix socket which the task daemon
+ // connected to us with.
+ let mut last_task_id: u64 = 0;
+ let mut task_handles = BTreeMap::new();
+
+ let mut framed_stream = Framed::new(stream, TaskCodec);
loop {
- // TODO wait on the channel OR the task handler, so we know
- // when it closes.
- let v = match task_channel_rx.recv().await {
- Some(v) => v,
- None => return Ok(()),
- };
-
- debug!("Sending Task -> {:?}", v.0);
-
- // Write the req to the socket.
- if let Err(_e) = reqs.send(v.0.clone()).await {
- // re-queue the event if not timed out.
- // This is indicated by the one shot being dropped.
- if !v.1.is_closed() {
- let _ = task_channel_tx
- .send_timeout(v, Duration::from_millis(100))
- .await;
+ tokio::select! {
+ // We have been commanded to stop operation.
+ _ = broadcast_rx.recv() => {
+ return Ok(())
}
- // now return the error.
- return Err(Box::new(IoError::new(ErrorKind::Other, "oh no!")));
- }
+ task_request = task_channel_rx.recv() => {
+ let Some(AsyncTaskRequest {
+ task_req,
+ task_chan
+ }) = task_request else {
+ // Task channel has died, cease operation.
+ return Ok(())
+ };
- match reqs.next().await {
- Some(Ok(TaskResponse::Success)) => {
- debug!("Task was acknowledged and completed.");
- // Send a result back via the one-shot
- // Ignore if it fails.
- let _ = v.1.send(());
+ debug!("Sending Task -> {:?}", task_req);
+
+ last_task_id += 1;
+ let task_id = last_task_id;
+
+ // Setup the task handle so we know who to get back to.
+ task_handles.insert(task_id, task_chan);
+
+ let task_frame = TaskRequestFrame {
+ id: task_id,
+ req: task_req,
+ };
+
+ if let Err(err) = framed_stream.send(task_frame).await {
+ warn!("Unable to queue task for completion");
+ return Err(Box::new(err));
+ }
+ // Task sent
}
- other => {
- error!("Error -> {:?}", other);
- return Err(Box::new(IoError::new(ErrorKind::Other, "oh no!")));
+
+ response = framed_stream.next() => {
+ // Process incoming messages. They may be out of order.
+ match response {
+ Some(Ok(TaskResponse::Success(task_id))) => {
+ debug!("Task was acknowledged and completed.");
+
+ if let Some(handle) = task_handles.remove(&task_id) {
+ // Send a result back via the one-shot
+ // Ignore if it fails.
+ let _ = handle.send(());
+ }
+ // If the ID was unregistered, ignore.
+ }
+ Some(Ok(TaskResponse::NotifyShadowChange(etc_db))) => {
+ let _ = notify_shadow_change_tx.send(etc_db).await;
+ }
+ // Other things ....
+ // Some(Ok(TaskResponse::ReloadSystemIds))
+
+ other => {
+ error!("Error -> {:?}", other);
+ return Err(Box::new(IoError::new(ErrorKind::Other, "oh no!")));
+ }
+ }
+
}
+
}
}
}
@@ -341,7 +375,10 @@ async fn handle_client(
match task_channel_tx
.send_timeout(
- (TaskRequest::HomeDirectory(info), tx),
+ AsyncTaskRequest {
+ task_req: TaskRequest::HomeDirectory(info),
+ task_chan: tx,
+ },
Duration::from_millis(100),
)
.await
@@ -420,40 +457,6 @@ async fn handle_client(
Ok(())
}
-async fn process_etc_passwd_group(
- cachelayer: &Resolver,
- shadow_is_accessible: bool,
-) -> Result<(), Box<dyn Error>> {
- let mut file = File::open("/etc/passwd").await?;
- let mut contents = vec![];
- file.read_to_end(&mut contents).await?;
-
- let users = parse_etc_passwd(contents.as_slice()).map_err(|_| "Invalid passwd content")?;
-
- let maybe_shadow = if shadow_is_accessible {
- let mut file = File::open("/etc/shadow").await?;
- let mut contents = vec![];
- file.read_to_end(&mut contents).await?;
-
- let shadow = parse_etc_shadow(contents.as_slice()).map_err(|_| "Invalid passwd content")?;
- Some(shadow)
- } else {
- None
- };
-
- let mut file = File::open("/etc/group").await?;
- let mut contents = vec![];
- file.read_to_end(&mut contents).await?;
-
- let groups = parse_etc_group(contents.as_slice()).map_err(|_| "Invalid group content")?;
-
- cachelayer
- .reload_system_identities(users, maybe_shadow, groups)
- .await;
-
- Ok(())
-}
-
async fn read_hsm_pin(hsm_pin_path: &str) -> Result<Vec<u8>, Box<dyn Error>> {
if !PathBuf::from_str(hsm_pin_path)?.exists() {
return Err(std::io::Error::new(
@@ -1009,23 +1012,6 @@ async fn main() -> ExitCode {
// Undo umask changes.
let _ = unsafe { umask(before) };
- // We pre-check if we can read /etc/shadow, and we flag that for the process so that
- // we don't attempt to read it again as we proceed.
- let shadow_is_accessible = {
- if let Err(err) = File::open("/etc/shadow").await {
- warn!(?err, "Unable to read /etc/shadow, some features will be disabled.");
- false
- } else {
- true
- }
- };
-
- // Pre-process /etc/passwd and /etc/group for nxset
- if let Err(err) = process_etc_passwd_group(&cachelayer, shadow_is_accessible).await {
- error!(?err, "Failed to process system id providers");
- return ExitCode::FAILURE
- }
-
// Setup the tasks socket first.
let (task_channel_tx, mut task_channel_rx) = channel(16);
let task_channel_tx = Arc::new(task_channel_tx);
@@ -1037,9 +1023,14 @@ async fn main() -> ExitCode {
let mut c_broadcast_rx = broadcast_tx.subscribe();
let mut d_broadcast_rx = broadcast_tx.subscribe();
+ // This channel allowss
+ let (notify_shadow_channel_tx, mut notify_shadow_channel_rx) = channel(16);
+ let notify_shadow_channel_tx = Arc::new(notify_shadow_channel_tx);
+
let task_b = tokio::spawn(async move {
loop {
tokio::select! {
+ // Wait on the broadcast to see if we need to close down.
_ = c_broadcast_rx.recv() => {
break;
}
@@ -1062,16 +1053,11 @@ async fn main() -> ExitCode {
// It did? Great, now we can wait and spin on that one
// client.
- tokio::select! {
- _ = d_broadcast_rx.recv() => {
- break;
- }
- // We have to check for signals here else this tasks waits forever.
- Err(e) = handle_task_client(socket, &task_channel_tx, &mut task_channel_rx) => {
- error!("Task client error occurred; error = {:?}", e);
- }
+ // We have to check for signals here else this tasks waits forever.
+ if let Err(err) = handle_task_client(socket, ¬ify_shadow_channel_tx, &mut task_channel_rx, &mut d_broadcast_rx).await {
+ error!(?err, "Task client error occurred");
}
- // If they DC we go back to accept.
+ // If they disconnect we go back to accept.
}
Err(err) => {
error!("Task Accept error -> {:?}", err);
@@ -1084,57 +1070,32 @@ async fn main() -> ExitCode {
info!("Stopped task connector");
});
- // TODO: Setup a task that handles pre-fetching here.
-
- let (inotify_tx, mut inotify_rx) = channel(4);
-
- let watcher = new_debouncer(Duration::from_secs(2), None, move |_event| {
- let _ = inotify_tx.try_send(true);
- })
- .and_then(|mut debouncer| {
- debouncer.watcher().watch(Path::new("/etc/passwd"), RecursiveMode::NonRecursive)
- .map(|()| debouncer)
- })
- .and_then(|mut debouncer| debouncer.watcher().watch(Path::new("/etc/group"), RecursiveMode::NonRecursive)
- .map(|()| debouncer)
- )
- .and_then(|mut debouncer| if shadow_is_accessible {
- debouncer.watcher().watch(Path::new("/etc/shadow"), RecursiveMode::NonRecursive)
- .map(|()| debouncer)
- } else {
- Ok(debouncer)
- }
- );
- let watcher =
- match watcher {
- Ok(watcher) => {
- watcher
- }
- Err(e) => {
- error!("Failed to setup inotify {:?}", e);
- return ExitCode::FAILURE
- }
- };
+ // ====== Listen for shadow change notification from tasks ======
+ let shadow_notify_cachelayer = cachelayer.clone();
let mut c_broadcast_rx = broadcast_tx.subscribe();
- let inotify_cachelayer = cachelayer.clone();
let task_c = tokio::spawn(async move {
+ debug!("Spawned shadow reload task handler");
loop {
tokio::select! {
_ = c_broadcast_rx.recv() => {
break;
}
- _ = inotify_rx.recv() => {
- if let Err(err) = process_etc_passwd_group(&inotify_cachelayer, shadow_is_accessible).await {
- error!(?err, "Failed to process system id providers");
- }
+ Some(EtcDb {
+ users, shadow, groups
+ }) = notify_shadow_channel_rx.recv() => {
+ shadow_notify_cachelayer
+ .reload_system_identities(users, shadow, groups)
+ .await;
}
}
}
- info!("Stopped inotify watcher");
+ info!("Stopped shadow reload task handler");
});
+ // TODO: Setup a task that handles pre-fetching here.
+
// Set the umask while we open the path for most clients.
let before = unsafe { umask(0) };
let listener = match UnixListener::bind(cfg.sock_path.as_str()) {
@@ -1234,8 +1195,6 @@ async fn main() -> ExitCode {
error!("Unable to shutdown workers {:?}", e);
}
- drop(watcher);
-
let _ = task_a.await;
let _ = task_b.await;
let _ = task_c.await;
diff --git a/unix_integration/resolver/src/bin/kanidm_unixd_tasks.rs b/unix_integration/resolver/src/bin/kanidm_unixd_tasks.rs
index 5b312f49b..ccaddc8d2 100644
--- a/unix_integration/resolver/src/bin/kanidm_unixd_tasks.rs
+++ b/unix_integration/resolver/src/bin/kanidm_unixd_tasks.rs
@@ -10,6 +10,23 @@
#![deny(clippy::needless_pass_by_value)]
#![deny(clippy::trivially_copy_pass_by_ref)]
+use bytes::{BufMut, BytesMut};
+use futures::{SinkExt, StreamExt};
+use kanidm_unix_common::constants::DEFAULT_CONFIG_PATH;
+use kanidm_unix_common::unix_passwd::{parse_etc_group, parse_etc_passwd, parse_etc_shadow, EtcDb};
+use kanidm_unix_common::unix_proto::{
+ HomeDirectoryInfo, TaskRequest, TaskRequestFrame, TaskResponse,
+};
+use kanidm_unix_resolver::unix_config::UnixdConfig;
+use kanidm_utils_users::{get_effective_gid, get_effective_uid};
+use libc::{lchown, umask};
+use notify_debouncer_full::notify::RecommendedWatcher;
+use notify_debouncer_full::Debouncer;
+use notify_debouncer_full::RecommendedCache;
+use notify_debouncer_full::{new_debouncer, notify::RecursiveMode, DebouncedEvent};
+use sketching::tracing_forest::traits::*;
+use sketching::tracing_forest::util::*;
+use sketching::tracing_forest::{self};
use std::ffi::CString;
use std::os::unix::ffi::OsStrExt;
use std::os::unix::fs::symlink;
@@ -17,17 +34,8 @@ use std::path::{Path, PathBuf};
use std::process::ExitCode;
use std::time::Duration;
use std::{fs, io};
-
-use bytes::{BufMut, BytesMut};
-use futures::{SinkExt, StreamExt};
-use kanidm_unix_common::constants::DEFAULT_CONFIG_PATH;
-use kanidm_unix_common::unix_proto::{HomeDirectoryInfo, TaskRequest, TaskResponse};
-use kanidm_unix_resolver::unix_config::UnixdConfig;
-use kanidm_utils_users::{get_effective_gid, get_effective_uid};
-use libc::{lchown, umask};
-use sketching::tracing_forest::traits::*;
-use sketching::tracing_forest::util::*;
-use sketching::tracing_forest::{self};
+use tokio::fs::File;
+use tokio::io::AsyncReadExt;
use tokio::net::UnixStream;
use tokio::sync::broadcast;
use tokio::time;
@@ -41,10 +49,10 @@ struct TaskCodec;
impl Decoder for TaskCodec {
type Error = io::Error;
- type Item = TaskRequest;
+ type Item = TaskRequestFrame;
fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
- match serde_json::from_slice::<TaskRequest>(src) {
+ match serde_json::from_slice::<TaskRequestFrame>(src) {
Ok(msg) => {
// Clear the buffer for the next message.
src.clear();
@@ -269,38 +277,173 @@ fn create_home_directory(
Ok(())
}
-async fn handle_tasks(stream: UnixStream, cfg: &UnixdConfig) {
+async fn handle_tasks(
+ stream: UnixStream,
+ ctl_broadcast_rx: &mut broadcast::Receiver<bool>,
+ shadow_broadcast_rx: &mut broadcast::Receiver<bool>,
+ cfg: &UnixdConfig,
+) {
let mut reqs = Framed::new(stream, TaskCodec::new());
loop {
- match reqs.next().await {
- Some(Ok(TaskRequest::HomeDirectory(info))) => {
- debug!("Received task -> HomeDirectory({:?})", info);
-
- let resp = match create_home_directory(
- &info,
- cfg.home_prefix.as_ref(),
- cfg.home_mount_prefix.as_ref(),
- cfg.use_etc_skel,
- cfg.selinux,
- ) {
- Ok(()) => TaskResponse::Success,
- Err(msg) => TaskResponse::Error(msg),
- };
-
- // Now send a result.
- if let Err(e) = reqs.send(resp).await {
- error!("Error -> {:?}", e);
- return;
- }
- // All good, loop.
+ tokio::select! {
+ _ = ctl_broadcast_rx.recv() => {
+ break;
}
- other => {
- error!("Error -> {:?}", other);
- return;
+ request = reqs.next() => {
+ match request {
+ Some(Ok(TaskRequestFrame {
+ id,
+ req: TaskRequest::HomeDirectory(info),
+ })) => {
+ debug!("Received task -> HomeDirectory({:?})", info);
+
+ let resp = match create_home_directory(
+ &info,
+ cfg.home_prefix.as_ref(),
+ cfg.home_mount_prefix.as_ref(),
+ cfg.use_etc_skel,
+ cfg.selinux,
+ ) {
+ Ok(()) => TaskResponse::Success(id),
+ Err(msg) => TaskResponse::Error(msg),
+ };
+
+ // Now send a result.
+ if let Err(err) = reqs.send(resp).await {
+ error!(?err, "Unable to communicate to kanidm unixd");
+ break;
+ }
+ // All good, loop.
+ }
+ other => {
+ error!("Error -> {:?}", other);
+ break;
+ }
+ }
+ }
+ _ = shadow_broadcast_rx.recv() => {
+ // process etc shadow and send it here.
+ match process_etc_passwd_group().await {
+ Ok(etc_db) => {
+ let resp = TaskResponse::NotifyShadowChange(etc_db);
+ if let Err(err) = reqs.send(resp).await {
+ error!(?err, "Unable to communicate to kanidm unixd");
+ break;
+ }
+ }
+ Err(()) => {
+ error!("Unable to process etc db");
+ continue
+ }
+ }
}
}
}
+
+ info!("Disconnected from kanidm_unixd ...");
+}
+
+async fn process_etc_passwd_group() -> Result<EtcDb, ()> {
+ let mut file = File::open("/etc/passwd").await.map_err(|err| {
+ error!(?err);
+ })?;
+ let mut contents = vec![];
+ file.read_to_end(&mut contents).await.map_err(|err| {
+ error!(?err);
+ })?;
+
+ let users = parse_etc_passwd(contents.as_slice())
+ .map_err(|_| "Invalid passwd content")
+ .map_err(|err| {
+ error!(?err);
+ })?;
+
+ let mut file = File::open("/etc/shadow").await.map_err(|err| {
+ error!(?err);
+ })?;
+ let mut contents = vec![];
+ file.read_to_end(&mut contents).await.map_err(|err| {
+ error!(?err);
+ })?;
+
+ let shadow = parse_etc_shadow(contents.as_slice())
+ .map_err(|_| "Invalid passwd content")
+ .map_err(|err| {
+ error!(?err);
+ })?;
+
+ let mut file = File::open("/etc/group").await.map_err(|err| {
+ error!(?err);
+ })?;
+ let mut contents = vec![];
+ file.read_to_end(&mut contents).await.map_err(|err| {
+ error!(?err);
+ })?;
+
+ let groups = parse_etc_group(contents.as_slice())
+ .map_err(|_| "Invalid group content")
+ .map_err(|err| {
+ error!(?err);
+ })?;
+
+ Ok(EtcDb {
+ users,
+ shadow,
+ groups,
+ })
+}
+
+fn setup_shadow_inotify_watcher(
+ shadow_broadcast_tx: broadcast::Sender<bool>,
+) -> Result<Debouncer<RecommendedWatcher, RecommendedCache>, ExitCode> {
+ let watcher = new_debouncer(
+ Duration::from_secs(1),
+ None,
+ move |event: Result<Vec<DebouncedEvent>, _>| {
+ let array_of_events = match event {
+ Ok(events) => events,
+ Err(array_errors) => {
+ for err in array_errors {
+ error!(?err, "inotify debounce error");
+ }
+ return;
+ }
+ };
+
+ let mut path_of_interest_was_changed = false;
+
+ for inode_event in array_of_events.iter() {
+ if !inode_event.kind.is_access()
+ && inode_event.paths.iter().any(|path| {
+ path == Path::new("/etc/group")
+ || path == Path::new("/etc/passwd")
+ || path == Path::new("/etc/shadow")
+ })
+ {
+ debug!(?inode_event, "Handling inotify modification event");
+
+ path_of_interest_was_changed = true
+ }
+ }
+
+ if path_of_interest_was_changed {
+ let _ = shadow_broadcast_tx.send(true);
+ } else {
+ debug!(?array_of_events, "IGNORED");
+ }
+ },
+ )
+ .and_then(|mut debouncer| {
+ debouncer
+ .watch(Path::new("/etc"), RecursiveMode::Recursive)
+ .map(|()| debouncer)
+ });
+
+ watcher.map_err(|err| {
+ error!(?err, "Failed to setup inotify");
+ ExitCode::FAILURE
+ })
}
#[tokio::main(flavor = "current_thread")]
@@ -369,9 +512,19 @@ async fn main() -> ExitCode {
let task_sock_path = cfg.task_sock_path.clone();
debug!("Attempting to use {} ...", task_sock_path);
+ // This is the startup/shutdown control channel
let (broadcast_tx, mut broadcast_rx) = broadcast::channel(4);
let mut d_broadcast_rx = broadcast_tx.subscribe();
+ // This is to broadcast when we need to reload the shadow
+ // files.
+ let (shadow_broadcast_tx, mut shadow_broadcast_rx) = broadcast::channel(4);
+
+ let watcher = match setup_shadow_inotify_watcher(shadow_broadcast_tx.clone()) {
+ Ok(w) => w,
+ Err(exit) => return exit,
+ };
+
let server = tokio::spawn(async move {
loop {
info!("Attempting to connect to kanidm_unixd ...");
@@ -384,16 +537,14 @@ async fn main() -> ExitCode {
match connect_res {
Ok(stream) => {
info!("Found kanidm_unixd, waiting for tasks ...");
+
+ // Immediately trigger that we should reload the shadow files
+ let _ = shadow_broadcast_tx.send(true);
+
// Yep! Now let the main handler do it's job.
// If it returns (dc, etc, then we loop and try again).
- tokio::select! {
- _ = d_broadcast_rx.recv() => {
- break;
- }
- _ = handle_tasks(stream, &cfg) => {
- continue;
- }
- }
+ handle_tasks(stream, &mut d_broadcast_rx, &mut shadow_broadcast_rx, &cfg).await;
+ continue;
}
Err(e) => {
debug!("\\---> {:?}", e);
@@ -403,8 +554,8 @@ async fn main() -> ExitCode {
}
}
}
- }
- }
+ } // select
+ } // loop
});
info!("Server started ...");
@@ -462,6 +613,9 @@ async fn main() -> ExitCode {
error!("Unable to shutdown workers {:?}", e);
}
+ debug!("Dropping inotify watcher ...");
+ drop(watcher);
+
let _ = server.await;
ExitCode::SUCCESS
})
diff --git a/unix_integration/resolver/src/idprovider/system.rs b/unix_integration/resolver/src/idprovider/system.rs
index a73db482c..1ded61e53 100644
--- a/unix_integration/resolver/src/idprovider/system.rs
+++ b/unix_integration/resolver/src/idprovider/system.rs
@@ -147,12 +147,7 @@ impl SystemProvider {
})
}
- pub async fn reload(
- &self,
- users: Vec<EtcUser>,
- shadow: Option<Vec<EtcShadow>>,
- groups: Vec<EtcGroup>,
- ) {
+ pub async fn reload(&self, users: Vec<EtcUser>, shadow: Vec<EtcShadow>, groups: Vec<EtcGroup>) {
let mut system_ids_txn = self.inner.lock().await;
system_ids_txn.users.clear();
system_ids_txn.user_list.clear();
@@ -160,52 +155,51 @@ impl SystemProvider {
system_ids_txn.group_list.clear();
system_ids_txn.shadow.clear();
- system_ids_txn.shadow_enabled = shadow.is_some();
+ system_ids_txn.shadow_enabled = !shadow.is_empty();
- if let Some(shadow) = shadow {
- let s_iter = shadow.into_iter().filter_map(|shadow_entry| {
- let EtcShadow {
+ let s_iter = shadow.into_iter().filter_map(|shadow_entry| {
+ let EtcShadow {
+ name,
+ password,
+ epoch_change_days,
+ days_min_password_age,
+ days_max_password_age,
+ days_warning_period,
+ days_inactivity_period,
+ epoch_expire_date,
+ flag_reserved: _,
+ } = shadow_entry;
+
+ if password.is_valid() {
+ let aging_policy = epoch_change_days.map(|change_days| {
+ AgingPolicy::new(
+ change_days,
+ days_min_password_age,
+ days_max_password_age,
+ days_warning_period,
+ days_inactivity_period,
+ )
+ });
+
+ let expiration_date = epoch_expire_date
+ .map(|expire| OffsetDateTime::UNIX_EPOCH + time::Duration::days(expire));
+
+ Some((
name,
- password,
- epoch_change_days,
- days_min_password_age,
- days_max_password_age,
- days_warning_period,
- days_inactivity_period,
- epoch_expire_date,
- flag_reserved: _,
- } = shadow_entry;
+ Arc::new(Shadow {
+ crypt_pw: password,
+ aging_policy,
+ expiration_date,
+ }),
+ ))
+ } else {
+ // Invalid password, skip the account
+ debug!(?name, "account password is invalid.");
+ None
+ }
+ });
- if password.is_valid() {
- let aging_policy = epoch_change_days.map(|change_days| {
- AgingPolicy::new(
- change_days,
- days_min_password_age,
- days_max_password_age,
- days_warning_period,
- days_inactivity_period,
- )
- });
-
- let expiration_date = epoch_expire_date
- .map(|expire| OffsetDateTime::UNIX_EPOCH + time::Duration::days(expire));
-
- Some((
- name,
- Arc::new(Shadow {
- crypt_pw: password,
- aging_policy,
- expiration_date,
- }),
- ))
- } else {
- // Invalid password, skip the account
- None
- }
- });
-
- system_ids_txn.shadow.extend(s_iter)
- };
+ system_ids_txn.shadow.extend(s_iter);
for group in groups {
let name = Id::Name(group.name.clone());
diff --git a/unix_integration/resolver/src/resolver.rs b/unix_integration/resolver/src/resolver.rs
index 3eb8531cd..6bef8dbb9 100644
--- a/unix_integration/resolver/src/resolver.rs
+++ b/unix_integration/resolver/src/resolver.rs
@@ -208,10 +208,11 @@ impl Resolver {
nxcache_txn.get(id).copied()
}
+ #[instrument(level = "info", skip_all)]
pub async fn reload_system_identities(
&self,
users: Vec<EtcUser>,
- shadow: Option<Vec<EtcShadow>>,
+ shadow: Vec<EtcShadow>,
groups: Vec<EtcGroup>,
) {
self.system_provider.reload(users, shadow, groups).await
diff --git a/unix_integration/resolver/tests/cache_layer_test.rs b/unix_integration/resolver/tests/cache_layer_test.rs
index 7e5b9c0fe..768547463 100644
--- a/unix_integration/resolver/tests/cache_layer_test.rs
+++ b/unix_integration/resolver/tests/cache_layer_test.rs
@@ -776,7 +776,7 @@ async fn test_cache_nxset_account() {
homedir: Default::default(),
shell: Default::default(),
}],
- None,
+ vec![],
vec![],
)
.await;
@@ -832,7 +832,7 @@ async fn test_cache_nxset_group() {
cachelayer
.reload_system_identities(
vec![],
- None,
+ vec![],
vec![EtcGroup {
name: "testgroup1".to_string(),
// Important! We set the GID to differ from what kanidm stores so we can
@@ -940,7 +940,7 @@ async fn test_cache_authenticate_system_account() {
shell: Default::default(),
}
],
- Some(vec![
+ vec![
EtcShadow {
name: "testaccount1".to_string(),
// The very secure password, "a".
@@ -965,7 +965,7 @@ async fn test_cache_authenticate_system_account() {
epoch_expire_date: Some(380),
flag_reserved: None
},
- ]),
+ ],
vec![],
)
.await;
@@ -1111,7 +1111,7 @@ async fn test_cache_extend_group_members() {
homedir: Default::default(),
shell: Default::default(),
}],
- None,
+ vec![],
vec![EtcGroup {
// This group is configured to allow extension from
// the group "testgroup1"