From dfcacaa3db2a5a26e58bbb44164a3fd051b04df7 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:56 +0200 Subject: [PATCH 01/47] tools(guix): Add `manifest.scm`. --- manifest.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 manifest.scm diff --git a/manifest.scm b/manifest.scm new file mode 100644 index 00000000..1da09ce2 --- /dev/null +++ b/manifest.scm @@ -0,0 +1,40 @@ +;; Example usage: +;; guix shell -mmanifest.scm -CFN -Sbin/cc=bin/gcc -ETERM --share=$HOME/.cargo -- sh -c 'LD_LIBRARY_PATH=$LIBRARY_PATH cargo build' + +(use-modules (guix channels) + (guix inferior) + (guix profiles) + (guix ui) + (srfi srfi-11)) + +(define channels + (list + (channel + (name 'guix) + (url "https://git.guix.gnu.org/guix.git") + (branch "master") + (commit "dd080e7fda2be54e2bcec3814473f90b326cb256") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))) + +(define inferior + (inferior-for-channels channels)) + +(define (pkg spec) + (let-values (((name version output) + (package-specification->name+version+output spec))) + (list (car (lookup-inferior-packages inferior name version)) + output))) +(define (pkgs . args) + (map pkg args)) + +(packages->manifest + (pkgs "bash" "coreutils" + "gcc-toolchain" "pkg-config" "postgresql" "openssl" + "rust" "rust:cargo" "rust:rust-src" "rust:tools" + "node" + "python" "python-flask" "python-requests" + "nss-certs" "man-db")) From 58cf5cb322c1ab05356d9eef5cba81ea24643d80 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:56 +0200 Subject: [PATCH 02/47] deps: Pin rust toolchain version. --- rust-toolchain | 1 + rust-toolchain.toml | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 rust-toolchain delete mode 100644 rust-toolchain.toml diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 00000000..d8ac93be --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +1.93.1 diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index 292fe499..00000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "stable" From 775ae6f02b03dcfe34b19423e85b2faf8ebc7748 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:56 +0200 Subject: [PATCH 03/47] deps: Run `cargo update`. Co-authored-by: nokoe --- Cargo.lock | 907 +++++++++++++++++++++++++++-------------------------- 1 file changed, 469 insertions(+), 438 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9c64fc8..bcc9b779 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,18 +37,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.4" @@ -58,12 +46,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "allocator-api2" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -74,13 +56,10 @@ dependencies = [ ] [[package]] -name = "ar_archive_writer" -version = "0.2.0" +name = "anyhow" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c269894b6fe5e9d7ada0cf69b5bf847ff35bc25fc271f08e1d080fce80339a" -dependencies = [ - "object", -] +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "askama" @@ -238,9 +217,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64urlsafedata" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215ee31f8a88f588c349ce2d20108b2ed96089b96b9c2b03775dc35dd72938e8" +checksum = "42f7f6be94fa637132933fd0a68b9140bcb60e3d46164cb68e82a2bb8d102b3a" dependencies = [ "base64 0.21.7", "pastey", @@ -284,9 +263,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "block-buffer" @@ -319,15 +298,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "bytemuck" -version = "1.24.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" [[package]] name = "byteorder" @@ -337,15 +316,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "cc" -version = "1.2.44" +version = "1.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" +checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" dependencies = [ "find-msvc-tools", "shlex", @@ -359,26 +338,16 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chrono" -version = "0.4.42" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ "iana-time-zone", "js-sys", "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.1", -] - -[[package]] -name = "chumsky" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" -dependencies = [ - "hashbrown 0.14.5", - "stacker", + "windows-link", ] [[package]] @@ -402,11 +371,11 @@ dependencies = [ [[package]] name = "colored" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -428,9 +397,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ "core-foundation-sys", "libc", @@ -459,9 +428,9 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -559,9 +528,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" +checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" [[package]] name = "der-parser" @@ -579,9 +548,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.5" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", ] @@ -621,9 +590,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.3.4" +version = "2.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c415189028b232660655e4893e8bc25ca7aee8e96888db66d9edb400535456a" +checksum = "f4ae09a41a4b89f94ec1e053623da8340d996bc32c6517d325a9daad9b239358" dependencies = [ "bitflags", "byteorder", @@ -649,9 +618,9 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.3.4" +version = "2.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9daac6489a36e42570da165a10c424f3edcefdff70c5fd55e1847c23f3dd7562" +checksum = "47618bf0fac06bb670c036e48404c26a865e6a71af4114dfd97dfe89936e404e" dependencies = [ "diesel_table_macro_syntax", "dsl_auto_type", @@ -780,9 +749,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "figment" @@ -800,9 +769,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fnv" @@ -810,6 +779,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -836,9 +811,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -850,9 +825,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", @@ -860,33 +835,33 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -895,7 +870,6 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] @@ -914,9 +888,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.9" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -924,9 +898,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -943,8 +917,21 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 5.3.0", + "wasip2", +] + +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", "wasip2", + "wasip3", ] [[package]] @@ -995,19 +982,18 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "ahash", - "allocator-api2", + "foldhash", ] [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -1063,13 +1049,13 @@ dependencies = [ [[package]] name = "hostname" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" +checksum = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" dependencies = [ "cfg-if", "libc", - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -1085,12 +1071,11 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -1152,9 +1137,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.64" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1176,12 +1161,13 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" dependencies = [ "displaydoc", "potential_utf", + "utf8_iter", "yoke", "zerofrom", "zerovec", @@ -1189,9 +1175,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" dependencies = [ "displaydoc", "litemap", @@ -1202,9 +1188,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -1216,15 +1202,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" dependencies = [ "icu_collections", "icu_locale_core", @@ -1236,15 +1222,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" [[package]] name = "icu_provider" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" dependencies = [ "displaydoc", "icu_locale_core", @@ -1255,6 +1241,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "ident_case" version = "1.0.1" @@ -1284,12 +1276,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" dependencies = [ "equivalent", - "hashbrown 0.16.0", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -1322,15 +1314,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" dependencies = [ "once_cell", "wasm-bindgen", @@ -1357,14 +1349,19 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "lettre" -version = "0.11.19" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e13e10e8818f8b2a60f52cb127041d388b89f3a96a62be9ceaffa22262fef7f" +checksum = "dabda5859ee7c06b995b9d1165aa52c39110e079ef609db97178d86aeb051fa7" dependencies = [ "base64 0.22.1", - "chumsky", "email-encoding", "email_address", "fastrand", @@ -1377,34 +1374,34 @@ dependencies = [ "nom 8.0.0", "percent-encoding", "quoted_printable", - "socket2 0.6.1", + "socket2 0.6.3", "tokio", "url", ] [[package]] name = "libc" -version = "0.2.177" +version = "0.2.184" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" [[package]] name = "libm" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "linux-raw-sys" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" [[package]] name = "lock_api" @@ -1417,9 +1414,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "loom" @@ -1467,9 +1464,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "migrations_internals" @@ -1478,7 +1475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36c791ecdf977c99f45f23280405d7723727470f6689a5e6dbf513ac547ae10d" dependencies = [ "serde", - "toml 0.9.8", + "toml 0.9.12+spec-1.1.0", ] [[package]] @@ -1516,9 +1513,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", "wasi", @@ -1534,7 +1531,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.3.1", + "http 1.4.0", "httparse", "memchr", "mime", @@ -1546,9 +1543,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.14" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" dependencies = [ "libc", "log", @@ -1601,9 +1598,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" [[package]] name = "num-integer" @@ -1642,15 +1639,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - [[package]] name = "oid-registry" version = "0.7.1" @@ -1662,9 +1650,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "opaque-debug" @@ -1674,9 +1662,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.75" +version = "0.10.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" +checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf" dependencies = [ "bitflags", "cfg-if", @@ -1700,15 +1688,15 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "openssl-sys" -version = "0.9.111" +version = "0.9.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" +checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb" dependencies = [ "cc", "libc", @@ -1736,7 +1724,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1786,15 +1774,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pin-utils" -version = "0.1.0" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkg-config" @@ -1816,9 +1798,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" dependencies = [ "zerovec", ] @@ -1849,6 +1831,16 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -1873,9 +1865,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -1893,16 +1885,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "psm" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11f2fedc3b7dafdc2851bc52f277377c5473d378859be234bc7ebb593144d01" -dependencies = [ - "ar_archive_writer", - "cc", -] - [[package]] name = "pwhash" version = "1.0.0" @@ -1920,18 +1902,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] [[package]] name = "quoted_printable" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" +checksum = "478e0585659a122aa407eb7e3c0e1fa51b1d8a870038bd29f0cf4a8551eea972" [[package]] name = "r-efi" @@ -1939,6 +1921,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "r2d2" version = "0.8.10" @@ -1968,7 +1956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1988,7 +1976,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1997,14 +1985,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ "getrandom 0.3.4", ] @@ -2040,9 +2028,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -2052,9 +2040,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -2063,9 +2051,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "ring" @@ -2075,7 +2063,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -2199,9 +2187,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags", "errno", @@ -2218,15 +2206,15 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "schannel" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" dependencies = [ "windows-sys 0.61.2", ] @@ -2254,9 +2242,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags", "core-foundation", @@ -2267,14 +2255,20 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.15.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", ] +[[package]] +name = "semver" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" + [[package]] name = "serde" version = "1.0.228" @@ -2317,15 +2311,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -2339,9 +2333,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" dependencies = [ "serde_core", ] @@ -2412,30 +2406,31 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.6" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] [[package]] name = "simple_asn1" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d" dependencies = [ "num-bigint", "num-traits", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", ] [[package]] name = "simple_logger" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291bee647ce7310b0ea721bfd7e0525517b4468eb7c7e15eb8bd774343179702" +checksum = "c7038d0e96661bf9ce647e1a6f6ef6d6f3663f66d9bf741abf14ba4876071c17" dependencies = [ "colored", "log", @@ -2445,9 +2440,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" @@ -2467,12 +2462,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2496,19 +2491,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "stacker" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1f8b29fb42aafcea4edeeb6b2f2d7ecd0d969c48b4cf0d2e64aafc471dd6e59" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "windows-sys 0.59.0", -] - [[package]] name = "state" version = "0.6.0" @@ -2532,9 +2514,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "2.0.108" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -2554,12 +2536,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.23.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", "rustix", "windows-sys 0.61.2", @@ -2576,11 +2558,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] [[package]] @@ -2596,9 +2578,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -2616,9 +2598,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.44" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", @@ -2626,22 +2608,22 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.24" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -2649,9 +2631,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" dependencies = [ "displaydoc", "zerovec", @@ -2659,25 +2641,25 @@ dependencies = [ [[package]] name = "tokio" -version = "1.48.0" +version = "1.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd" dependencies = [ "bytes", "libc", "mio", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.1", + "socket2 0.6.3", "tokio-macros", "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", @@ -2686,9 +2668,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -2697,9 +2679,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.16" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -2722,15 +2704,15 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.8" +version = "0.9.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" dependencies = [ "serde_core", - "serde_spanned 1.0.3", - "toml_datetime 0.7.3", + "serde_spanned 1.1.1", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", - "winnow", + "winnow 0.7.15", ] [[package]] @@ -2744,9 +2726,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] @@ -2762,16 +2744,16 @@ dependencies = [ "serde_spanned 0.6.9", "toml_datetime 0.6.11", "toml_write", - "winnow", + "winnow 0.7.15", ] [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow", + "winnow 1.0.1", ] [[package]] @@ -2788,9 +2770,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -2799,9 +2781,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", @@ -2810,9 +2792,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -2831,9 +2813,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.20" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", @@ -2880,9 +2862,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.8.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicode-id" @@ -2892,9 +2874,9 @@ checksum = "70ba288e709927c043cbe476718d37be306be53fb1fafecd0dbe36d072be2580" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-xid" @@ -2926,14 +2908,15 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" [[package]] name = "url" -version = "2.5.7" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -2950,13 +2933,13 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.18.1" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.2", "js-sys", - "serde", + "serde_core", "wasm-bindgen", ] @@ -3031,18 +3014,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" dependencies = [ "cfg-if", "once_cell", @@ -3053,9 +3045,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3063,9 +3055,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" dependencies = [ "bumpalo", "proc-macro2", @@ -3076,18 +3068,52 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap", + "semver", +] + [[package]] name = "webauthn-attestation-ca" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77a2892ec44032e6c48dad9aad1b05fada09c346ada11d8d32db119b4b4f205" +checksum = "fafcf13f7dc1fb292ed4aea22cdd3757c285d7559e9748950ee390249da4da6b" dependencies = [ "base64urlsafedata", "openssl", @@ -3099,9 +3125,9 @@ dependencies = [ [[package]] name = "webauthn-rs" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7c3a2f9c8bddd524e47bbd427bcf3a28aa074de55d74470b42a91a41937b8e" +checksum = "1b24d082d3360258fefb6ffe56123beef7d6868c765c779f97b7a2fcf06727f8" dependencies = [ "base64urlsafedata", "serde", @@ -3113,9 +3139,9 @@ dependencies = [ [[package]] name = "webauthn-rs-core" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f1d80f3146382529fe70a3ab5d0feb2413a015204ed7843f9377cd39357fc4" +checksum = "15784340a24c170ce60567282fb956a0938742dbfbf9eff5df793a686a009b8b" dependencies = [ "base64 0.21.7", "base64urlsafedata", @@ -3124,8 +3150,8 @@ dependencies = [ "nom 7.1.3", "openssl", "openssl-sys", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand 0.9.2", + "rand_chacha 0.9.0", "serde", "serde_cbor_2", "serde_json", @@ -3140,9 +3166,9 @@ dependencies = [ [[package]] name = "webauthn-rs-proto" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e786894f89facb9aaf1c5f6559670236723c98382e045521c76f3d5ca5047bd" +checksum = "16a1fb2580ce73baa42d3011a24de2ceab0d428de1879ece06e02e8c416e497c" dependencies = [ "base64 0.21.7", "base64urlsafedata", @@ -3168,7 +3194,7 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.1", + "windows-link", "windows-result", "windows-strings", ] @@ -3195,12 +3221,6 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -3213,7 +3233,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3222,7 +3242,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3234,31 +3254,13 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - [[package]] name = "windows-sys" version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3285,30 +3287,13 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", + "windows_i686_gnullvm", "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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link 0.2.1", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -3321,12 +3306,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -3339,12 +3318,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -3357,24 +3330,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -3387,12 +3348,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -3405,12 +3360,6 @@ 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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3423,12 +3372,6 @@ 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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3442,31 +3385,113 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" +name = "winnow" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" +dependencies = [ + "memchr", +] [[package]] name = "winnow" -version = "0.7.13" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" + +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" dependencies = [ - "memchr", + "wit-bindgen-rust-macro", ] [[package]] -name = "wit-bindgen" -version = "0.46.0" +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck 0.5.0", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck 0.5.0", + "indexmap", + "prettyplease", + "syn", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] [[package]] name = "writeable" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "x509-parser" @@ -3496,9 +3521,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -3507,9 +3532,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", @@ -3547,7 +3572,7 @@ dependencies = [ "serde_urlencoded", "simple_logger", "tempfile", - "thiserror 2.0.17", + "thiserror 2.0.18", "toml 0.8.23", "urlencoding", "validator", @@ -3557,18 +3582,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" dependencies = [ "proc-macro2", "quote", @@ -3577,18 +3602,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", @@ -3598,9 +3623,9 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" dependencies = [ "displaydoc", "yoke", @@ -3609,9 +3634,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" dependencies = [ "yoke", "zerofrom", @@ -3620,11 +3645,17 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" dependencies = [ "proc-macro2", "quote", "syn", ] + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" From 266d3482b08fc18af8ce91ef02a6757ad2aa967f Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:56 +0200 Subject: [PATCH 04/47] deps: Run `cargo upgrade`. Co-authored-by: nokoe --- Cargo.lock | 8 ++++---- Cargo.toml | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bcc9b779..f623b5ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -428,9 +428,9 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -888,9 +888,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", diff --git a/Cargo.toml b/Cargo.toml index 896bebef..b4e38e3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,39 +11,39 @@ base64 = "0.22" bincode = {version = "2.0", features = ["serde"]} pwhash = "1.0" chrono = { version = "0.4", features = ["serde"] } -lazy_static = "1.1" +lazy_static = "1.5" lettre = { version = "0.11", features = ["builder", "smtp-transport"] } log = "0.4" urlencoding = "2.1" toml = "0.8" rand = "0.9" -regex = "1.6" -rocket = { version = "0.5.0-rc.3", features = [ "json", "secrets" ] } -rocket_sync_db_pools = { version = "0.1.0-rc.3", features = [ "diesel_postgres_pool" ] } +regex = "1.12" +rocket = { version = "0.5.1", features = [ "json", "secrets" ] } +rocket_sync_db_pools = { version = "0.1.0", features = [ "diesel_postgres_pool" ] } serde = "1.0" serde_json = "1.0" serde_derive = "1.0" serde_urlencoded = "0.7" -simple_logger = "5.0" -diesel = { version = "2.3.4", features = ["postgres", "r2d2", "chrono"] } +simple_logger = "5.2" +diesel = { version = "2.3.7", features = ["postgres", "r2d2", "chrono"] } diesel-derive-enum = { version = "3.0.0-beta.1", features = ["postgres"] } diesel_migrations = "2.3.1" -tempfile = "3.1" +tempfile = "3.27" parking_lot = { version = "0.12" } thiserror = "2.0" validator = { version = "0.20", features = [ "derive" ] } -jsonwebtoken = "9.1" +jsonwebtoken = "9.3" openssl = "0.10" -webauthn-rs = { version = "0.5.0", features = [ +webauthn-rs = { version = "0.5.4", features = [ "conditional-ui" ]} -webauthn-rs-proto = "0.5.1" +webauthn-rs-proto = "0.5.4" markdown = "1.0.0" [dev-dependencies] -webauthn-rs = { version = "0.5.0", features = [ +webauthn-rs = { version = "0.5.4", features = [ "conditional-ui", "danger-allow-state-serialisation" ]} From cbccd1449246e15177edab64eab33f40ab244202 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:56 +0200 Subject: [PATCH 05/47] deps(cargo): Update askama to 0.15.6. Co-authored-by: nokoe --- Cargo.lock | 92 +++++++++++++++++++++--------------------------------- Cargo.toml | 3 +- 2 files changed, 37 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f623b5ac..dd2e4b6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,51 +63,54 @@ checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "askama" -version = "0.12.1" -source = "git+https://github.com/djc/askama.git?rev=40bb338#40bb3382b0c98e97f484c81659207b6b950c5cb0" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b8246bcbf8eb97abef10c2d92166449680d41d55c0fc6978a91dec2e3619608" dependencies = [ - "askama_derive", - "askama_escape", - "humansize", - "num-traits", + "askama_macros", + "itoa", "percent-encoding", + "serde", + "serde_json", ] [[package]] name = "askama_derive" -version = "0.12.2" -source = "git+https://github.com/djc/askama.git?rev=40bb338#40bb3382b0c98e97f484c81659207b6b950c5cb0" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f9670bc84a28bb3da91821ef74226949ab63f1265aff7c751634f1dd0e6f97c" dependencies = [ "askama_parser", "basic-toml", - "mime", - "mime_guess", + "memchr", "proc-macro2", "quote", + "rustc-hash", "serde", + "serde_derive", "syn", ] [[package]] -name = "askama_escape" -version = "0.10.3" -source = "git+https://github.com/djc/askama.git?rev=40bb338#40bb3382b0c98e97f484c81659207b6b950c5cb0" - -[[package]] -name = "askama_parser" -version = "0.1.1" -source = "git+https://github.com/djc/askama.git?rev=40bb338#40bb3382b0c98e97f484c81659207b6b950c5cb0" +name = "askama_macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0756b45480437dded0565dfc568af62ccce146fb6cfe902e808ba86e445f44f" dependencies = [ - "nom 7.1.3", + "askama_derive", ] [[package]] -name = "askama_rocket" -version = "0.12.0" -source = "git+https://github.com/djc/askama.git?rev=40bb338#40bb3382b0c98e97f484c81659207b6b950c5cb0" +name = "askama_parser" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0af3691ba3af77949c0b5a3925444b85cb58a0184cc7fec16c68ba2e7be868" dependencies = [ - "askama", - "rocket", + "rustc-hash", + "serde", + "serde_derive", + "unicode-ident", + "winnow 1.0.1", ] [[package]] @@ -1102,15 +1105,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - [[package]] name = "hyper" version = "0.14.32" @@ -1385,12 +1379,6 @@ version = "0.2.184" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" -[[package]] -name = "libm" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" - [[package]] name = "linux-raw-sys" version = "0.12.1" @@ -1495,16 +1483,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2176,6 +2154,12 @@ dependencies = [ "quote", ] +[[package]] +name = "rustc-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" + [[package]] name = "rusticata-macros" version = "4.1.0" @@ -2860,12 +2844,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "unicase" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" - [[package]] name = "unicode-id" version = "0.3.6" @@ -3398,6 +3376,9 @@ name = "winnow" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +dependencies = [ + "memchr", +] [[package]] name = "wit-bindgen" @@ -3547,7 +3528,6 @@ name = "zauth" version = "2.0.2" dependencies = [ "askama", - "askama_rocket", "base64 0.22.1", "bincode", "chrono", diff --git a/Cargo.toml b/Cargo.toml index b4e38e3b..99c4b7c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,7 @@ edition = "2024" authors = ["Rien Maertens "] [dependencies] -askama = { git = "https://github.com/djc/askama.git", rev = "40bb338", features = ["with-rocket", "mime", "mime_guess"] } -askama_rocket = { git = "https://github.com/djc/askama.git", rev = "40bb338" } +askama = "0.15.6" base64 = "0.22" bincode = {version = "2.0", features = ["serde"]} pwhash = "1.0" From 313b008a178da159f81308a8c0ac12540b1a95e1 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:56 +0200 Subject: [PATCH 06/47] deps(cargo): Complete the migration to askama 0.15. Co-authored-by: nokoe --- src/controllers/clients_controller.rs | 14 +- src/controllers/mailing_list_controller.rs | 56 ++++---- src/controllers/oauth_controller.rs | 15 +-- src/controllers/pages_controller.rs | 3 +- src/controllers/roles_controller.rs | 14 +- src/controllers/sessions_controller.rs | 20 ++- src/controllers/users_controller.rs | 149 +++++++++------------ src/controllers/webauthn_controller.rs | 22 ++- src/errors.rs | 15 ++- src/views/template.rs | 64 +++++---- templates/layout.html | 2 +- templates/pages/home.html | 10 +- templates/users/index.html | 16 ++- 13 files changed, 198 insertions(+), 202 deletions(-) diff --git a/src/controllers/clients_controller.rs b/src/controllers/clients_controller.rs index 99f4e51f..b203acde 100644 --- a/src/controllers/clients_controller.rs +++ b/src/controllers/clients_controller.rs @@ -1,5 +1,6 @@ use rocket::form::Form; use rocket::http::Status; +use rocket::response::content::RawHtml; use rocket::response::status; use rocket::response::status::Custom; use rocket::response::{Redirect, Responder}; @@ -67,11 +68,10 @@ pub async fn list_clients<'r>( ) -> Result> { let clients = Client::all(&db).await?; Ok(Accepter { - html: template! { - "clients/index.html"; + html: RawHtml(template!("clients/index.html", { clients: Vec = clients.clone(), current_user: User = session.admin, - }, + })), json: Json(clients), }) } @@ -86,12 +86,12 @@ pub async fn update_client_page<'r>( let roles = Role::all(&db).await?; - Ok(template! { "clients/edit_client.html"; + Ok(RawHtml(template!("clients/edit_client.html", { current_user: User = session.admin, client: Client = client.clone(), client_roles: Vec = client.roles(&db).await?, roles: Vec = roles - }) + }))) } #[put("/clients/", data = "")] @@ -144,9 +144,9 @@ pub async fn get_generate_secret<'r>( db: DbConn, ) -> Result> { let client = Client::find(id, &db).await?; - Ok(template! { "clients/confirm_generate_secret.html"; + Ok(RawHtml(template!("clients/confirm_generate_secret.html", { client: Client = client, - }) + }))) } #[post("/clients//generate_secret")] diff --git a/src/controllers/mailing_list_controller.rs b/src/controllers/mailing_list_controller.rs index 1f5598ce..522d29b3 100644 --- a/src/controllers/mailing_list_controller.rs +++ b/src/controllers/mailing_list_controller.rs @@ -1,5 +1,6 @@ use lettre::message::{Mailbox, header}; use rocket::form::validate::Contains; +use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; use std::fmt::Debug; @@ -27,11 +28,10 @@ pub async fn list_mails<'r>( let mails = Mail::all(&db).await?; Ok(Accepter { - html: template! { - "maillist/index.html"; + html: RawHtml(template!("maillist/index.html", { current_user: User = session.user, mails: Vec = mails.clone(), - }, + })), json: Json(mails), }) } @@ -83,14 +83,6 @@ impl From for header::ContentType { } } -// Separate template struct to disable HTML escaping -#[derive(Template)] -#[template(path = "mails/mailinglist_mail.html", escape = "none")] -struct MailingListTemplate { - body: String, - unsubscribe_url: String, -} - async fn send_mail<'r>( new_mail: Api, db: DbConn, @@ -110,19 +102,29 @@ async fn send_mail<'r>( uri!(conf.base_url(), show_confirm_unsubscribe(token)); let text = match &mail.content_type { - &ContentType::Plain => template!( - "mails/mailinglist_mail.txt"; + &ContentType::Plain => template!("mails/mailinglist_mail.txt", { body: String = body.clone(), unsubscribe_url: String = unsubscribe_url.to_string(), - ) - .render(), - &ContentType::Markdown => MailingListTemplate { - body: body.clone(), - unsubscribe_url: unsubscribe_url.to_string(), - } - .render(), - } - .map_err(InternalError::from)?; + })?, + &ContentType::Markdown => { + #[derive(Template)] + #[template( + path = "mails/mailinglist_mail.html", + escape = "none", + )] + struct MailingListTemplate { + body: String, + unsubscribe_url: String, + } + MailingListTemplate { + body: body.clone(), + unsubscribe_url: unsubscribe_url.to_string(), + } + .render() + .map_err(InternalError::from) + .map_err(ZauthError::from)? + }, + }; mailer.create_for_mailinglist( receiver, @@ -143,10 +145,9 @@ async fn send_mail<'r>( pub async fn show_create_mail_page<'r>( session: AdminSession, ) -> Result> { - Ok(template! { - "maillist/new_mail.html"; + Ok(RawHtml(template!("maillist/new_mail.html", { current_user: User = session.admin, - }) + }))) } /// Show a specific mail @@ -159,12 +160,11 @@ pub async fn show_mail<'r>( let mail = Mail::get_by_id(id, &db).await?; Ok(Accepter { - html: template! { - "maillist/show_mail.html"; + html: RawHtml(template!("maillist/show_mail.html", { current_user: User = session.user, mail: Mail = mail.clone(), rendered_body: Option = mail.render_body().ok(), - }, + })), json: Json(mail), }) } diff --git a/src/controllers/oauth_controller.rs b/src/controllers/oauth_controller.rs index 8e994767..bf0273f3 100644 --- a/src/controllers/oauth_controller.rs +++ b/src/controllers/oauth_controller.rs @@ -4,6 +4,7 @@ use jsonwebtoken::jwk::JwkSet; use rocket::State; use rocket::form::Form; use rocket::http::{Cookie, CookieJar}; +use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; use rocket::serde::json::Json; use std::fmt::Debug; @@ -11,7 +12,7 @@ use std::fmt::Debug; use crate::DbConn; use crate::config::Config; use crate::ephemeral::session::UserSession; -use crate::errors::Either::{Left, Right}; +use crate::errors::Either; use crate::errors::*; use crate::http_authentication::BasicAuthentication; use crate::jwt::JWTBuilder; @@ -118,11 +119,10 @@ pub async fn authorize<'r>( let client_description = client.description.clone(); let state = AuthState::from_req(client, req); cookies.add_private(state.into_cookie()?); - Ok(template! { - "oauth/authorize.html"; + Ok(RawHtml(template!("oauth/authorize.html", { authorize_post_url: String = uri!(do_authorize).to_string(), client_description: String = client_description, - }) + }))) } else { Err(AuthenticationError::Unauthorized(format!( "client with id {} is not authorized to use redirect_uri '{}'", @@ -187,12 +187,11 @@ pub async fn grant_get<'r>( match Client::find(state.client_id, &db).await { Ok(client) => { if client.needs_grant { - Ok(Left(template! { - "oauth/grant.html"; + Ok(Either::Left(RawHtml(template!("oauth/grant.html", { client_description: String = client.description.clone(), - })) + })))) } else { - Ok(Right( + Ok(Either::Right( authorization_granted( state, session.user, diff --git a/src/controllers/pages_controller.rs b/src/controllers/pages_controller.rs index 77233269..6af1714a 100644 --- a/src/controllers/pages_controller.rs +++ b/src/controllers/pages_controller.rs @@ -1,3 +1,4 @@ +use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; use crate::controllers::users_controller::rocket_uri_macro_show_user; @@ -10,7 +11,7 @@ pub fn home_page<'r>( session: Option, ) -> Either> { match session { - None => Either::Right(template! {"pages/home.html"}), + None => Either::Right(RawHtml(template!("pages/home.html"))), Some(session) => { Either::Left(Redirect::to(uri!(show_user(session.user.username)))) }, diff --git a/src/controllers/roles_controller.rs b/src/controllers/roles_controller.rs index 85cd2193..29a1fb46 100644 --- a/src/controllers/roles_controller.rs +++ b/src/controllers/roles_controller.rs @@ -1,6 +1,7 @@ use diesel::result::DatabaseErrorKind; use rocket::form::Form; use rocket::http::Status; +use rocket::response::content::RawHtml; use rocket::response::status::Custom; use rocket::response::{Redirect, Responder, status}; use rocket::serde::json::Json; @@ -25,13 +26,12 @@ pub async fn list_roles<'r>( let clients = Client::all(&db).await?; Ok(Accepter { - html: template! { - "roles/index.html"; + html: RawHtml(template!("roles/index.html", { roles: Vec = roles.clone(), clients: Vec = clients, error: Option = error, current_user: User = session.admin, - }, + })), json: Json(roles), }) } @@ -83,15 +83,15 @@ pub async fn show_role_page<'r>( None }; - Ok(template! { "roles/show_role.html"; + Ok(RawHtml(template!("roles/show_role.html", { current_user: User = session.admin, role: Role = role, client: Option = client, users: Vec = users, - clients: Vec = clients, + clients: Vec = clients, error: Option = error, - info: Option = info - }) + info: Option = info, + }))) } #[delete("/roles/")] diff --git a/src/controllers/sessions_controller.rs b/src/controllers/sessions_controller.rs index b263b83f..902d42f8 100644 --- a/src/controllers/sessions_controller.rs +++ b/src/controllers/sessions_controller.rs @@ -1,5 +1,6 @@ use rocket::State; use rocket::form::Form; +use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; use crate::Config; @@ -19,20 +20,18 @@ pub fn new_session<'r>( cookies: &CookieJar, ) -> Either + use<'r>> { match session { - None => Either::Right(template! { - "session/login.html"; - error: Option = None - }), + None => Either::Right(RawHtml(template!("session/login.html", { + error: Option = None, + }))), _ => Either::Left(stored_redirect_or(cookies, uri!(home_page))), } } #[get("/logout")] pub fn delete_session<'r>(session: UserSession) -> impl Responder<'r, 'static> { - template! { - "session/logout.html"; - current_user: User = session.user - } + RawHtml(template!("session/logout.html", { + current_user: User = session.user, + })) } #[derive(FromForm, Debug)] @@ -51,10 +50,9 @@ pub async fn create_session<'r>( let form = form.into_inner(); match User::find_and_authenticate(form.username, form.password, &db).await { Err(ZauthError::LoginError(login_error)) => { - Ok(Either::Right(template! { - "session/login.html"; + Ok(Either::Right(RawHtml(template!("session/login.html", { error: Option = Some(login_error.to_string()), - })) + })))) }, Ok(user) => { let session = diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs index a26bae02..b372420e 100644 --- a/src/controllers/users_controller.rs +++ b/src/controllers/users_controller.rs @@ -1,6 +1,7 @@ use lettre::message::header; use rocket::http::Status; use rocket::http::uri::Absolute; +use rocket::response::content::RawHtml; use rocket::response::status::Custom; use rocket::response::{Redirect, Responder}; use std::fmt::Debug; @@ -138,13 +139,13 @@ pub async fn show_user<'r>( // Check whether the current session is allowed to view this user if session.user.admin || session.user.username == username { Ok(Accepter { - html: template!("users/show.html"; - user: User = user.clone(), - current_user: User = session.user, - user_roles: Vec = user_roles, - roles: Vec = roles, - errors: Option = None - ), + html: RawHtml(template!("users/show.html", { + user: User = user.clone(), + current_user: User = session.user, + user_roles: Vec = user_roles, + roles: Vec = roles, + errors: Option = None, + })), json: Json(user), }) } else { @@ -176,7 +177,9 @@ pub async fn show_ssh_key<'r>( } } Ok(Accepter { - html: template!("users/keys.html"; keys: String = keys.join("\n")), + html: RawHtml(template!("users/keys.html", { + keys: String = keys.join("\n"), + })), json: Json(keys), }) } @@ -192,13 +195,12 @@ pub async fn list_users<'r>( let users_pending_for_approval: Vec = User::find_by_pending(&db).await?; Ok(Accepter { - html: template! { - "users/index.html"; + html: RawHtml(template!("users/index.html", { users: Vec = users.clone(), current_user: User = session.admin, registrations_full: bool = full, users_pending_for_approval: Vec = users_pending_for_approval.clone(), - }, + })), json: Json(users), }) } @@ -207,9 +209,9 @@ pub async fn list_users<'r>( pub fn create_user_page<'r>( session: AdminSession, ) -> Result> { - Ok(template! { "users/new_user.html"; + Ok(RawHtml(template!("users/new_user.html", { current_user: User = session.admin, - }) + }))) } #[post("/users", data = "")] @@ -233,8 +235,7 @@ pub async fn register_page<'r>( conf: &'r State, ) -> Result> { let full = User::pending_count(&db).await? >= conf.maximum_pending_users; - Ok(template! { - "users/registration_form.html"; + Ok(RawHtml(template!("users/registration_form.html", { registrations_full: bool = full, errors: Option = None, user: NewUser = NewUser { @@ -245,7 +246,7 @@ pub async fn register_page<'r>( ssh_key: None, not_a_robot: false, } - }) + }))) } #[post("/register", data = "")] @@ -271,20 +272,17 @@ pub async fn register<'r>( mailer.try_create( &user, String::from("[Zauth] Confirm your email"), - template!( - "mails/confirm_user_registration.txt"; - name: String = user.full_name.to_string(), - confirm_url: String = confirm_url.to_string(), - ) - .render() - .map_err(InternalError::from)?, + template!("mails/confirm_user_registration.txt", { + name: String = user.full_name.to_string(), + confirm_url: String = confirm_url.to_string(), + })?, header::ContentType::TEXT_PLAIN, )?; Ok(Left(Accepter { html: Custom( Status::Created, - template!("users/registration_success.html"), + RawHtml(template!("users/registration_success.html")), ), json: Custom(Status::Created, Json(user)), })) @@ -292,12 +290,11 @@ pub async fn register<'r>( Err(ZauthError::ValidationError(errors)) => Ok(Right(Accepter { html: Custom( Status::UnprocessableEntity, - template! { - "users/registration_form.html"; + RawHtml(template!("users/registration_form.html", { registrations_full: bool = full, user: NewUser = new_user, errors: Option = Some(errors.clone()), - }, + })), ), json: Custom(Status::UnprocessableEntity, Json(errors)), })), @@ -326,14 +323,13 @@ pub async fn update_user<'r, 'o: 'r>( let roles = user.clone().roles(&db).await?; Ok(OneOf::Two(Custom( Status::UnprocessableEntity, - template! { - "users/show.html"; + RawHtml(template!("users/show.html", { user: User = user, current_user: User = session.user, user_roles: Vec = roles, roles: Vec = vec![], errors: Option = Some(errors.clone()), - }, + })), ))) }, Err(other) => Err(other), @@ -392,13 +388,10 @@ pub async fn set_approved<'r>( .create( &user, String::from("[Zauth] Your account has been approved"), - template!( - "mails/user_approved.txt"; - name: String = user.full_name.to_string(), - login_url: String = login_url.to_string(), - ) - .render() - .map_err(InternalError::from)?, + template!("mails/user_approved.txt", { + name: String = user.full_name.to_string(), + login_url: String = login_url.to_string(), + })?, header::ContentType::TEXT_PLAIN, ) .await?; @@ -433,7 +426,7 @@ pub async fn reject<'r>( #[get("/users/forgot_password")] pub fn forgot_password_get<'r>() -> impl Responder<'r, 'static> { - template! { "users/forgot_password.html" } + RawHtml(template!("users/forgot_password.html")) } #[derive(Debug, FromForm, Deserialize)] @@ -468,31 +461,26 @@ pub async fn forgot_password_post<'r>( mailer.try_create( &user, String::from("[Zauth] You've requested a password reset"), - template!( - "mails/password_reset_token.txt"; + template!("mails/password_reset_token.txt", { name: String = user.username.to_string(), reset_url: String = reset_url.to_string(), - ) - .render() - .map_err(InternalError::from)?, + })?, header::ContentType::TEXT_PLAIN, )? }; - Ok(template! { - "users/reset_link_sent.html"; - email: String = for_email - }) + Ok(RawHtml(template!("users/reset_link_sent.html", { + email: String = for_email, + }))) } #[get("/users/unsubscribe/")] pub fn show_confirm_unsubscribe<'r>( token: String, ) -> impl Responder<'r, 'static> { - template! { - "users/confirm_unsubscribe_form.html"; + RawHtml(template!("users/confirm_unsubscribe_form.html", { token: String = token, - } + })) } #[derive(Debug, FromForm)] @@ -511,7 +499,7 @@ pub async fn unsubscribe_user<'r>( if user.is_none() { return Ok(Either::Left(Custom( Status::Unauthorized, - template!("users/unsubscribe_invalid.html"), + RawHtml(template!("users/unsubscribe_invalid.html")), ))); } @@ -521,16 +509,15 @@ pub async fn unsubscribe_user<'r>( user.subscribed_to_mailing_list = false; user.update(&db).await?; - Ok(Either::Right(template!("users/unsubscribed.html"))) + Ok(Either::Right(RawHtml(template!("users/unsubscribed.html")))) } #[get("/users/reset_password/")] pub fn reset_password_get<'r>(token: String) -> impl Responder<'r, 'static> { - template! { - "users/reset_password_form.html"; + RawHtml(template!("users/reset_password_form.html", { token: String = token, errors: Option = None, - } + })) } #[derive(Debug, FromForm)] @@ -556,47 +543,41 @@ pub async fn reset_password_post<'r, 'o: 'r>( let changed = user.change_password(change, conf, &db).await; match changed { Ok(user) => { - let body = template!( - "mails/password_reset_success.txt"; - name: String = user.username.to_string(), - ) - .render() - .map_err(InternalError::from)?; mailer .create( &user, String::from("[Zauth] Your password has been reset"), - body, + template!("mails/password_reset_success.txt", { + name: String = user.username.to_string(), + })?, header::ContentType::TEXT_PLAIN, ) .await?; - Ok(OneOf::One( - template! { "users/reset_password_success.html" }, - )) + Ok(OneOf::One(RawHtml(template!("users/reset_password_success.html")))) }, Err(ZauthError::ValidationError(errors)) => Ok(OneOf::Two(Custom( Status::UnprocessableEntity, - template! { - "users/reset_password_form.html"; + RawHtml(template!("users/reset_password_form.html", { token: String = form.token, errors: Option = Some(errors.clone()), - }, + })), ))), Err(other) => Err(other), } } else { - let template = template! { "users/reset_password_invalid.html" }; - Ok(OneOf::Three(Custom(Status::Forbidden, template))) + Ok(OneOf::Three(Custom( + Status::Forbidden, + RawHtml(template!("users/reset_password_invalid.html")), + ))) } } #[get("/users/confirm/")] pub fn confirm_email_get<'r>(token: String) -> impl Responder<'r, 'static> { - template! { - "users/confirm_email_form.html"; + RawHtml(template!("users/confirm_email_form.html", { token: String = token, - } + })) } #[derive(Debug, FromForm)] @@ -626,23 +607,21 @@ pub async fn confirm_email_post<'r>( mailer.try_create( admin_email.0.clone(), String::from("[Zauth] New user registration"), - template!( - "mails/new_user_registration.txt"; - name: String = user.username.to_string(), - user_list_url: String = user_list_url.to_string(), - ) - .render() - .map_err(InternalError::from)?, + template!("mails/new_user_registration.txt", { + name: String = user.username.to_string(), + user_list_url: String = user_list_url.to_string(), + })?, header::ContentType::TEXT_PLAIN, )?; - Ok(Either::Left(template! { - "users/confirm_email_success.html"; - user: User = user, - })) + Ok(Either::Left( + RawHtml(template!("users/confirm_email_success.html", { + user: User = user, + })), + )) } else { Ok(Either::Right( - template! {"users/confirm_email_invalid.html"}, + RawHtml(template!("users/confirm_email_invalid.html")), )) } } diff --git a/src/controllers/webauthn_controller.rs b/src/controllers/webauthn_controller.rs index 629cd69e..dc5191bc 100644 --- a/src/controllers/webauthn_controller.rs +++ b/src/controllers/webauthn_controller.rs @@ -1,6 +1,7 @@ use chrono::{DateTime, Local}; use rocket::form::Form; use rocket::http::{CookieJar, Status}; +use rocket::response::content::RawHtml; use rocket::response::status::Custom; use rocket::response::{Redirect, Responder}; use rocket::{State, serde::json::Json}; @@ -105,11 +106,10 @@ pub async fn finish_register<'r>( PassKey::create(passkey, &db).await?; Ok(Either::Left(Redirect::to(uri!(list_passkeys)))) }, - Err(e) => Ok(Either::Right(template! { - "passkeys/new_passkey.html"; + Err(e) => Ok(Either::Right(RawHtml(template!("passkeys/new_passkey.html", { current_user: User = session.user, errors: Option = Some(e.to_string()), - })), + })))), } } @@ -258,10 +258,9 @@ pub async fn finish_authentication<'r>( Ok(Either::Left(stored_redirect_or(cookies, uri!(home_page)))) }, Err(ZauthError::LoginError(login_error)) => { - Ok(Either::Right(template! { - "session/login.html"; + Ok(Either::Right(RawHtml(template!("session/login.html", { error: Option = Some(login_error.to_string()), - })) + })))) }, Err(e) => Err(e), } @@ -274,11 +273,10 @@ pub async fn list_passkeys<'r>( ) -> Result> { let passkeys = PassKey::find_by_user_id(session.user.id, &db).await?; Ok(Accepter { - html: template! { - "passkeys/index.html"; + html: RawHtml(template!("passkeys/index.html", { passkeys: Vec = passkeys.clone(), - current_user: User = session.user - }, + current_user: User = session.user, + })), json: Json(passkeys), }) } @@ -287,10 +285,10 @@ pub async fn list_passkeys<'r>( pub async fn new_passkey<'r>( session: UserSession, ) -> Result> { - Ok(template! { "passkeys/new_passkey.html"; + Ok(RawHtml(template!("passkeys/new_passkey.html", { current_user: User = session.user, errors: Option = None, - }) + }))) } #[delete("/passkeys/")] diff --git a/src/errors.rs b/src/errors.rs index b98b0667..8088594b 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,3 +1,4 @@ +use askama; use rocket::Request; use rocket::http::Status; use rocket::response::{self, Responder, Response}; @@ -139,9 +140,9 @@ pub fn unprocessable_with_message<'r>( message: Option, ) -> impl Responder<'r, 'static> { Accepter { - html: template!("errors/422.html"; - message: Option = message.clone() - ), + html: template!("errors/422.html", { + message: Option = message.clone(), + }), json: Json(JsonError { error: "unprocessable", status: 422, @@ -159,7 +160,9 @@ fn internal_server_error_with_message<'r>( message: String, ) -> impl Responder<'r, 'static> { Accepter { - html: template!("errors/500.html"; error: String = message.clone()), + html: template!("errors/500.html", { + error: String = message.clone(), + }), json: Json(JsonError { error: "internal server error", status: 500, @@ -177,7 +180,9 @@ fn not_implemented_with_message<'r>( message: String, ) -> impl Responder<'r, 'static> { Accepter { - html: template!("errors/501.html"; error: String = message.clone()), + html: template!("errors/501.html", { + error: String = message.clone(), + }), json: Json(JsonError { error: "not implemented", status: 501, diff --git a/src/views/template.rs b/src/views/template.rs index e93bd64c..80996ee4 100644 --- a/src/views/template.rs +++ b/src/views/template.rs @@ -1,38 +1,50 @@ +use std::default::Default; + +#[derive(Debug)] +pub struct CommonTemplateData { + pub zauth_version: &'static str, +} + +impl Default for CommonTemplateData { + fn default() -> Self { + CommonTemplateData { + zauth_version: crate::ZAUTH_VERSION, + } + } +} + #[macro_export] macro_rules! template { - ($template_name:literal) => { + ( + $template_name:literal $(,{ + $($name:ident : $type:ty = $value:expr_2021),* + $(,)? + })? + ) => { { use askama::Template; - #[derive(Template, Debug)] - #[template(path = $template_name)] - struct TemplateStruct { - #[allow(dead_code)] - zauth_version: &'static str - } - TemplateStruct { - zauth_version: $crate::ZAUTH_VERSION, - } - } - }; - ($template_name:literal; $($name:ident: $type:ty = $value:expr_2021),+$(,)?) => { - { - use askama::Template; + use crate::errors::{InternalError,Result,ZauthError}; + use crate::views::template::CommonTemplateData; + #[derive(Template, Debug)] #[template(path = $template_name)] struct TemplateStruct { #[allow(dead_code)] - zauth_version: &'static str, - $( - $name: $type, - )+ - } - TemplateStruct { - zauth_version: $crate::ZAUTH_VERSION, - $( - $name: $value, - )+ + common: CommonTemplateData, + $($($name: $type,)*)? } + + let instance = TemplateStruct { + common: CommonTemplateData::default(), + $($($name: $value,)*)? + }; + + let res: Result = instance + .render() + .map_err(InternalError::from) + .map_err(ZauthError::from); + res } - } + }; } diff --git a/templates/layout.html b/templates/layout.html index bc9d9c4f..a6ff68eb 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -35,7 +35,7 @@
- Zauth v{{ zauth_version }} by Zeus WPI + Zauth v{{ common.zauth_version }} by Zeus WPI
diff --git a/templates/pages/home.html b/templates/pages/home.html index 0b65cecb..1ebd8fb0 100644 --- a/templates/pages/home.html +++ b/templates/pages/home.html @@ -51,11 +51,11 @@ With a Zeus account you have access to all of our services in- and outside the Kelder.
- {%- call service_card("Haldis", "Order food from our favorite places and eat together with other Zeus members.", "https://haldis.zeus.gent") -%} - {%- call service_card("Tap", "Grab drinks and snacks in the kelder and easily pay for them.", "https://tap.zeus.gent") -%} - {%- call service_card("Tab", "Manage your Zeus balance for paying in Haldis or Tap.", "https://tab.zeus.gent") -%} - {%- call service_card("Gamification", "Get points for code contributions and join the leaderboard.", "https://zeus.ugent.be/game") -%} - {%- call service_card("Cat", "Keep track of who has given hugs to who. We all need some affection sometimes…", "https://cat.zeus.gent") -%} + {%- call service_card("Haldis", "Order food from our favorite places and eat together with other Zeus members.", "https://haldis.zeus.gent") -%}{%- endcall -%} + {%- call service_card("Tap", "Grab drinks and snacks in the kelder and easily pay for them.", "https://tap.zeus.gent") -%}{%- endcall -%} + {%- call service_card("Tab", "Manage your Zeus balance for paying in Haldis or Tap.", "https://tab.zeus.gent") -%}{%- endcall -%} + {%- call service_card("Gamification", "Get points for code contributions and join the leaderboard.", "https://zeus.ugent.be/game") -%}{%- endcall -%} + {%- call service_card("Cat", "Keep track of who has given hugs to who. We all need some affection sometimes…", "https://cat.zeus.gent") -%}{%- endcall -%}
diff --git a/templates/users/index.html b/templates/users/index.html index a6a1bc58..f13a2af7 100644 --- a/templates/users/index.html +++ b/templates/users/index.html @@ -146,12 +146,16 @@ - {% match user.state %} {% when UserState::Active %} {%- call - colored_circle("#80A66C", user.state) -%} {% when UserState::PendingApproval %} - {%- call colored_circle("#F2A950", user.state) -%} {% when - UserState::PendingMailConfirmation %} {%- call colored_circle("#FFFF00", - user.state) -%} {% when UserState::Disabled %} {%- call - colored_circle("#DD6761", user.state) -%} {% endmatch %} + {% match user.state %} + {% when UserState::Active %} + {%- call colored_circle("#80A66C", user.state) -%}{%- endcall -%} + {% when UserState::PendingApproval %} + {%- call colored_circle("#F2A950", user.state) -%}{%- endcall -%} + {% when UserState::PendingMailConfirmation %} + {%- call colored_circle("#FFFF00", user.state) -%}{%- endcall -%} + {% when UserState::Disabled %} + {%- call colored_circle("#DD6761", user.state) -%}{%- endcall -%} + {% endmatch %} From 8cbcfa76782be6cf270f0641cd6064971e46c832 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:57 +0200 Subject: [PATCH 07/47] lint: Fix rustc warnings. --- src/controllers/users_controller.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs index b372420e..f3f48b7f 100644 --- a/src/controllers/users_controller.rs +++ b/src/controllers/users_controller.rs @@ -12,7 +12,7 @@ use crate::controllers::sessions_controller::rocket_uri_macro_new_session; use crate::ephemeral::from_api::Api; use crate::ephemeral::session::{AdminSession, UserClientSession, UserSession}; use crate::errors::Either::{self, Left, Right}; -use crate::errors::{InternalError, OneOf, Result, ZauthError}; +use crate::errors::{OneOf, Result, ZauthError}; use crate::mailer::Mailer; use crate::models::client::Client; use crate::models::role::Role; @@ -20,7 +20,6 @@ use crate::models::user::*; use crate::util::split_scopes; use crate::views::accepter::Accepter; use crate::{DbConn, util}; -use askama::Template; use chrono::{Duration, Utc}; use rocket::State; use rocket::form::Form; From ffbb39c14feda6eb0c6bf546735d71f275dc9a1f Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:57 +0200 Subject: [PATCH 08/47] style: Run `cargo fmt`. --- src/controllers/mailing_list_controller.rs | 6 +++--- src/controllers/users_controller.rs | 20 +++++++++++--------- src/controllers/webauthn_controller.rs | 10 ++++++---- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/controllers/mailing_list_controller.rs b/src/controllers/mailing_list_controller.rs index 522d29b3..1124c7fb 100644 --- a/src/controllers/mailing_list_controller.rs +++ b/src/controllers/mailing_list_controller.rs @@ -110,7 +110,7 @@ async fn send_mail<'r>( #[derive(Template)] #[template( path = "mails/mailinglist_mail.html", - escape = "none", + escape = "none" )] struct MailingListTemplate { body: String, @@ -121,8 +121,8 @@ async fn send_mail<'r>( unsubscribe_url: unsubscribe_url.to_string(), } .render() - .map_err(InternalError::from) - .map_err(ZauthError::from)? + .map_err(InternalError::from) + .map_err(ZauthError::from)? }, }; diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs index f3f48b7f..13f6a273 100644 --- a/src/controllers/users_controller.rs +++ b/src/controllers/users_controller.rs @@ -325,7 +325,7 @@ pub async fn update_user<'r, 'o: 'r>( RawHtml(template!("users/show.html", { user: User = user, current_user: User = session.user, - user_roles: Vec = roles, + user_roles: Vec = roles, roles: Vec = vec![], errors: Option = Some(errors.clone()), })), @@ -552,7 +552,9 @@ pub async fn reset_password_post<'r, 'o: 'r>( header::ContentType::TEXT_PLAIN, ) .await?; - Ok(OneOf::One(RawHtml(template!("users/reset_password_success.html")))) + Ok(OneOf::One(RawHtml(template!( + "users/reset_password_success.html" + )))) }, Err(ZauthError::ValidationError(errors)) => Ok(OneOf::Two(Custom( @@ -613,15 +615,15 @@ pub async fn confirm_email_post<'r>( header::ContentType::TEXT_PLAIN, )?; - Ok(Either::Left( - RawHtml(template!("users/confirm_email_success.html", { + Ok(Either::Left(RawHtml( + template!("users/confirm_email_success.html", { user: User = user, - })), - )) + }), + ))) } else { - Ok(Either::Right( - RawHtml(template!("users/confirm_email_invalid.html")), - )) + Ok(Either::Right(RawHtml(template!( + "users/confirm_email_invalid.html" + )))) } } diff --git a/src/controllers/webauthn_controller.rs b/src/controllers/webauthn_controller.rs index dc5191bc..31a880b3 100644 --- a/src/controllers/webauthn_controller.rs +++ b/src/controllers/webauthn_controller.rs @@ -106,10 +106,12 @@ pub async fn finish_register<'r>( PassKey::create(passkey, &db).await?; Ok(Either::Left(Redirect::to(uri!(list_passkeys)))) }, - Err(e) => Ok(Either::Right(RawHtml(template!("passkeys/new_passkey.html", { - current_user: User = session.user, - errors: Option = Some(e.to_string()), - })))), + Err(e) => Ok(Either::Right(RawHtml( + template!("passkeys/new_passkey.html", { + current_user: User = session.user, + errors: Option = Some(e.to_string()), + }), + ))), } } From b1aba1aed4dc3ebd1aba9cd36d51e0225aff3631 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:57 +0200 Subject: [PATCH 09/47] feat: Add client column to the roles overview page. Co-authored-by: nokoe --- src/controllers/mailing_list_controller.rs | 1 - src/controllers/roles_controller.rs | 9 +++++++-- src/views/template.rs | 2 +- templates/roles/index.html | 18 +++++++++++++++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/controllers/mailing_list_controller.rs b/src/controllers/mailing_list_controller.rs index 1124c7fb..b5b37cb8 100644 --- a/src/controllers/mailing_list_controller.rs +++ b/src/controllers/mailing_list_controller.rs @@ -2,7 +2,6 @@ use lettre::message::{Mailbox, header}; use rocket::form::validate::Contains; use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; -use std::fmt::Debug; use crate::DbConn; use crate::config::Config; diff --git a/src/controllers/roles_controller.rs b/src/controllers/roles_controller.rs index 29a1fb46..a74a285e 100644 --- a/src/controllers/roles_controller.rs +++ b/src/controllers/roles_controller.rs @@ -5,7 +5,6 @@ use rocket::response::content::RawHtml; use rocket::response::status::Custom; use rocket::response::{Redirect, Responder, status}; use rocket::serde::json::Json; -use std::fmt::Debug; use crate::DbConn; use crate::ephemeral::from_api::Api; @@ -22,15 +21,21 @@ pub async fn list_roles<'r>( db: DbConn, session: AdminSession, ) -> Result> { - let roles = Role::all(&db).await?; + let roles: Vec = Role::all(&db).await?; let clients = Client::all(&db).await?; + let lookup_client_by_id: Box Option> = + Box::new(move |id: i32, c: &[Client]| { + c.iter().find(|c| c.id == id).cloned() + }); + Ok(Accepter { html: RawHtml(template!("roles/index.html", { roles: Vec = roles.clone(), clients: Vec = clients, error: Option = error, current_user: User = session.admin, + lookup_client_by_id: Box Option> = lookup_client_by_id, })), json: Json(roles), }) diff --git a/src/views/template.rs b/src/views/template.rs index 80996ee4..28048bdd 100644 --- a/src/views/template.rs +++ b/src/views/template.rs @@ -27,7 +27,7 @@ macro_rules! template { use crate::errors::{InternalError,Result,ZauthError}; use crate::views::template::CommonTemplateData; - #[derive(Template, Debug)] + #[derive(Template)] #[template(path = $template_name)] struct TemplateStruct { #[allow(dead_code)] diff --git a/templates/roles/index.html b/templates/roles/index.html index 57a74f04..28a95e50 100644 --- a/templates/roles/index.html +++ b/templates/roles/index.html @@ -43,12 +43,13 @@ Name Description + Client - {% for role in roles %} + {% for role in roles.iter() %} @@ -59,6 +60,21 @@ {{ role.description }} + + + {% if let Some(client_id) = role.client_id %} + + {% if let Some(client) = (lookup_client_by_id)(**client_id, clients) %} + {{ client.name }} + {% else %} + {{ client_id }} + {% endif %} + + {% else %} + Global + {% endif %} + +
From 579596bf542e822c662ef5360e79d04a0e175286 Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:57 +0200 Subject: [PATCH 10/47] lint: Use `$crate` in macros. --- src/views/template.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/template.rs b/src/views/template.rs index 28048bdd..5e1ddd7f 100644 --- a/src/views/template.rs +++ b/src/views/template.rs @@ -24,8 +24,8 @@ macro_rules! template { { use askama::Template; - use crate::errors::{InternalError,Result,ZauthError}; - use crate::views::template::CommonTemplateData; + use $crate::errors::{InternalError,Result,ZauthError}; + use $crate::views::template::CommonTemplateData; #[derive(Template)] #[template(path = $template_name)] From a70e21a81f60611ca3b6767023a8923fd49c54da Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:57 +0200 Subject: [PATCH 11/47] style: Organize imports. --- src/controllers/clients_controller.rs | 1 - src/controllers/mailing_list_controller.rs | 6 ++--- src/controllers/oauth_controller.rs | 8 +++---- src/controllers/pages_controller.rs | 1 - src/controllers/sessions_controller.rs | 2 +- src/controllers/users_controller.rs | 15 ++++++------ src/db_seed.rs | 4 ++-- src/ephemeral/from_api.rs | 4 ++-- src/ephemeral/session.rs | 7 +++--- src/errors.rs | 12 +++++----- src/http_authentication.rs | 6 ++--- src/jwt.rs | 14 ++++++----- src/lib.rs | 28 +++++++++++----------- src/mailer.rs | 9 +++---- src/models/client.rs | 9 +++---- src/models/mail.rs | 13 +++++----- src/models/role.rs | 9 ++++--- src/models/session.rs | 3 +-- src/models/user.rs | 16 ++++++------- src/token_store.rs | 8 ++++--- src/util.rs | 1 + src/views/mod.rs | 1 + src/views/template.rs | 2 -- src/webauthn.rs | 3 ++- tests/clients.rs | 12 ++++------ tests/common/mod.rs | 20 ++++++++-------- tests/mailinglist.rs | 12 ++++------ tests/oauth.rs | 12 +++------- tests/passkeys.rs | 6 ++--- tests/roles.rs | 14 +++++------ tests/sessions.rs | 10 ++++---- tests/users.rs | 8 +++---- 32 files changed, 128 insertions(+), 148 deletions(-) diff --git a/src/controllers/clients_controller.rs b/src/controllers/clients_controller.rs index b203acde..d2d34498 100644 --- a/src/controllers/clients_controller.rs +++ b/src/controllers/clients_controller.rs @@ -5,7 +5,6 @@ use rocket::response::status; use rocket::response::status::Custom; use rocket::response::{Redirect, Responder}; use rocket::serde::json::Json; -use std::fmt::Debug; use crate::DbConn; use crate::ephemeral::from_api::Api; diff --git a/src/controllers/mailing_list_controller.rs b/src/controllers/mailing_list_controller.rs index b5b37cb8..c5fc0181 100644 --- a/src/controllers/mailing_list_controller.rs +++ b/src/controllers/mailing_list_controller.rs @@ -1,7 +1,10 @@ +use askama::Template; use lettre::message::{Mailbox, header}; +use rocket::State; use rocket::form::validate::Contains; use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; +use rocket::serde::json::Json; use crate::DbConn; use crate::config::Config; @@ -14,9 +17,6 @@ use crate::mailer::Mailer; use crate::models::mail::*; use crate::models::user::User; use crate::views::accepter::Accepter; -use askama::Template; -use rocket::State; -use rocket::serde::json::Json; /// Show an overview of all mails, sorted by send date #[get("/mails")] diff --git a/src/controllers/oauth_controller.rs b/src/controllers/oauth_controller.rs index bf0273f3..466aedbe 100644 --- a/src/controllers/oauth_controller.rs +++ b/src/controllers/oauth_controller.rs @@ -7,23 +7,21 @@ use rocket::http::{Cookie, CookieJar}; use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; use rocket::serde::json::Json; -use std::fmt::Debug; use crate::DbConn; use crate::config::Config; use crate::ephemeral::session::UserSession; +use crate::ephemeral::session::ensure_logged_in_and_redirect; use crate::errors::Either; +use crate::errors::OAuthError::InvalidCookie; use crate::errors::*; use crate::http_authentication::BasicAuthentication; use crate::jwt::JWTBuilder; use crate::models::client::*; use crate::models::session::*; use crate::models::user::*; -use crate::util::split_scopes; - -use crate::ephemeral::session::ensure_logged_in_and_redirect; -use crate::errors::OAuthError::InvalidCookie; use crate::token_store::TokenStore; +use crate::util::split_scopes; const OAUTH_COOKIE: &str = "ZAUTH_OAUTH"; diff --git a/src/controllers/pages_controller.rs b/src/controllers/pages_controller.rs index 6af1714a..114a0bc2 100644 --- a/src/controllers/pages_controller.rs +++ b/src/controllers/pages_controller.rs @@ -2,7 +2,6 @@ use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; use crate::controllers::users_controller::rocket_uri_macro_show_user; - use crate::ephemeral::session::UserSession; use crate::errors::Either; diff --git a/src/controllers/sessions_controller.rs b/src/controllers/sessions_controller.rs index 902d42f8..6547e331 100644 --- a/src/controllers/sessions_controller.rs +++ b/src/controllers/sessions_controller.rs @@ -1,5 +1,6 @@ use rocket::State; use rocket::form::Form; +use rocket::http::CookieJar; use rocket::response::content::RawHtml; use rocket::response::{Redirect, Responder}; @@ -12,7 +13,6 @@ use crate::ephemeral::session::{ use crate::errors::{Either, Result, ZauthError}; use crate::models::session::Session; use crate::models::user::User; -use rocket::http::CookieJar; #[get("/login")] pub fn new_session<'r>( diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs index 13f6a273..50709a83 100644 --- a/src/controllers/users_controller.rs +++ b/src/controllers/users_controller.rs @@ -1,12 +1,16 @@ +use chrono::{Duration, Utc}; use lettre::message::header; +use rocket::State; +use rocket::form::Form; use rocket::http::Status; use rocket::http::uri::Absolute; use rocket::response::content::RawHtml; use rocket::response::status::Custom; use rocket::response::{Redirect, Responder}; -use std::fmt::Debug; +use rocket::serde::json::Json; use validator::ValidationErrors; +use crate::DbConn; use crate::config::{AdminEmail, Config}; use crate::controllers::sessions_controller::rocket_uri_macro_new_session; use crate::ephemeral::from_api::Api; @@ -17,13 +21,8 @@ use crate::mailer::Mailer; use crate::models::client::Client; use crate::models::role::Role; use crate::models::user::*; -use crate::util::split_scopes; +use crate::util; use crate::views::accepter::Accepter; -use crate::{DbConn, util}; -use chrono::{Duration, Utc}; -use rocket::State; -use rocket::form::Form; -use rocket::serde::json::Json; #[derive(Serialize)] pub struct UserInfo { @@ -47,7 +46,7 @@ impl UserInfo { db: &DbConn, config: &Config, ) -> Result { - let scopes = split_scopes(&scope); + let scopes = util::split_scopes(&scope); let roles = if let Some(client) = &client { if scopes.contains(&"roles".into()) { diff --git a/src/db_seed.rs b/src/db_seed.rs index 18f12020..ad3150e8 100644 --- a/src/db_seed.rs +++ b/src/db_seed.rs @@ -1,3 +1,5 @@ +use diesel::RunQueryDsl; + use crate::DbConn; use crate::errors::{Result, ZauthError}; use crate::models::client::{Client, NewClient}; @@ -5,8 +7,6 @@ use crate::models::schema::clients; use crate::models::schema::users; use crate::models::user::{NewUser, User}; use crate::util::random_token; -use diesel::RunQueryDsl; -use std::default::Default; #[derive(Default)] pub struct Seeder { diff --git a/src/ephemeral/from_api.rs b/src/ephemeral/from_api.rs index 14f17456..088ab13b 100644 --- a/src/ephemeral/from_api.rs +++ b/src/ephemeral/from_api.rs @@ -1,3 +1,5 @@ +use std::marker::PhantomData; + use rocket::Request; use rocket::data::{Data, FromData, Outcome}; use rocket::form::Form; @@ -5,8 +7,6 @@ use rocket::http::ContentType; use rocket::http::Status; use rocket::serde::json::Json; -use std::marker::PhantomData; - #[derive(Debug)] pub struct Api { inner: T, diff --git a/src/ephemeral/session.rs b/src/ephemeral/session.rs index ac1e2a49..db6fc92a 100644 --- a/src/ephemeral/session.rs +++ b/src/ephemeral/session.rs @@ -1,7 +1,10 @@ +use std::str::FromStr; + +use rocket::http::uri::Origin; use rocket::http::{Cookie, CookieJar, Status}; use rocket::outcome::try_outcome; use rocket::request::{FromRequest, Outcome, Request}; -use std::str::FromStr; +use rocket::response::Redirect; use crate::DbConn; use crate::controllers::sessions_controller::rocket_uri_macro_new_session; @@ -9,8 +12,6 @@ use crate::errors::Result; use crate::models::client::Client; use crate::models::session::Session; use crate::models::user::User; -use rocket::http::uri::Origin; -use rocket::response::Redirect; const REDIRECT_COOKIE: &str = "ZAUTH_REDIRECT"; const SESSION_COOKIE: &str = "ZAUTH_SESSION"; diff --git a/src/errors.rs b/src/errors.rs index 8088594b..a0aa58ff 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,15 +1,15 @@ -use askama; -use rocket::Request; -use rocket::http::Status; -use rocket::response::{self, Responder, Response}; -use thiserror::Error; +use std::convert::Infallible; +use askama; use diesel::result::Error::NotFound; use lettre::Message; use log::warn; +use rocket::Request; +use rocket::http::Status; +use rocket::response::{self, Responder, Response}; use rocket::serde::json::Json; use rocket::tokio::sync::mpsc::error::{SendError, TrySendError}; -use std::convert::Infallible; +use thiserror::Error; use validator::ValidationErrors; use webauthn_rs::prelude::WebauthnError; diff --git a/src/http_authentication.rs b/src/http_authentication.rs index 1a507527..8bb53970 100644 --- a/src/http_authentication.rs +++ b/src/http_authentication.rs @@ -1,10 +1,10 @@ +use std::str::FromStr; + use base64::Engine; use base64::prelude::BASE64_STANDARD; use rocket::http::Status; -use rocket::request::{self, FromRequest, Request}; - use rocket::outcome::Outcome; -use std::str::FromStr; +use rocket::request::{self, FromRequest, Request}; #[derive(Debug)] pub struct BasicAuthentication { diff --git a/src/jwt.rs b/src/jwt.rs index a0142b4e..5322dd13 100644 --- a/src/jwt.rs +++ b/src/jwt.rs @@ -1,7 +1,6 @@ -use crate::config::Config; -use crate::errors::{InternalError, LaunchError, Result}; -use crate::models::client::Client; -use crate::models::user::User; +use std::fs::File; +use std::io::Read; + use base64::engine::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; use chrono::Utc; @@ -12,8 +11,11 @@ use jsonwebtoken::{EncodingKey, Header, encode}; use openssl::bn::{BigNum, BigNumContext}; use openssl::ec::EcKey; use serde::Serialize; -use std::fs::File; -use std::io::Read; + +use crate::config::Config; +use crate::errors::{InternalError, LaunchError, Result}; +use crate::models::client::Client; +use crate::models::user::User; pub struct JWTBuilder { pub key: EncodingKey, diff --git a/src/lib.rs b/src/lib.rs index 1d5993d1..b8809413 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,30 +2,30 @@ #![recursion_limit = "256"] extern crate chrono; +#[macro_use] +extern crate diesel; +#[macro_use] +extern crate diesel_migrations; +#[macro_use] +extern crate lazy_static; extern crate lettre; +extern crate log; extern crate pwhash; extern crate rand; extern crate regex; -extern crate simple_logger; -extern crate thiserror; -extern crate toml; -extern crate validator; - #[macro_use] extern crate rocket; extern crate rocket_sync_db_pools; #[macro_use] extern crate serde_derive; -#[macro_use] -extern crate lazy_static; -extern crate log; -#[macro_use] -extern crate diesel; -#[macro_use] -extern crate diesel_migrations; +extern crate simple_logger; +extern crate thiserror; +extern crate toml; +extern crate validator; #[macro_use] pub mod views; + pub mod config; pub mod controllers; pub mod db_seed; @@ -39,6 +39,8 @@ pub mod token_store; pub mod util; pub mod webauthn; +use std::str::FromStr; + use diesel_migrations::MigrationHarness; use jwt::JWTBuilder; use lettre::message::Mailbox; @@ -60,8 +62,6 @@ use crate::errors::{ use crate::mailer::Mailer; use crate::token_store::TokenStore; -use std::str::FromStr; - #[database("postgresql_database")] pub struct DbConn(PgConnection); pub type ConcreteConnection = PgConnection; diff --git a/src/mailer.rs b/src/mailer.rs index dbca3872..b48af64e 100644 --- a/src/mailer.rs +++ b/src/mailer.rs @@ -1,5 +1,5 @@ -use crate::config::Config; -use crate::errors::{InternalError, LaunchError, Result, ZauthError}; +use std::convert::TryInto; +use std::time::Duration; use lettre::message::{Mailbox, header::ContentType}; use lettre::transport::smtp::authentication::Credentials; @@ -9,8 +9,9 @@ use rocket::Config as RocketConfig; use rocket::tokio::sync::mpsc::Receiver; use rocket::tokio::sync::mpsc::{self, UnboundedReceiver}; use rocket::tokio::time::sleep; -use std::convert::TryInto; -use std::time::Duration; + +use crate::config::Config; +use crate::errors::{InternalError, LaunchError, Result, ZauthError}; #[derive(Clone)] pub struct Mailer { diff --git a/src/models/client.rs b/src/models/client.rs index 0c1d03cb..3bd2e021 100644 --- a/src/models/client.rs +++ b/src/models/client.rs @@ -1,15 +1,12 @@ +use chrono::NaiveDateTime; use diesel::{self, prelude::*}; +use validator::Validate; +use super::role::{ClientRole, Role}; use crate::DbConn; use crate::errors::{AuthenticationError, Result, ZauthError}; - use crate::models::schema::{clients, roles}; - use crate::util::random_token; -use chrono::NaiveDateTime; -use validator::Validate; - -use super::role::{ClientRole, Role}; const SECRET_LENGTH: usize = 64; diff --git a/src/models/mail.rs b/src/models/mail.rs index 4bc40a5c..abf2eca4 100644 --- a/src/models/mail.rs +++ b/src/models/mail.rs @@ -1,17 +1,16 @@ use std::cmp::Reverse; -use crate::DbConn; -use crate::errors::{self, ZauthError}; use chrono::NaiveDateTime; +use diesel::result::Error as DieselError; use diesel::{self, prelude::*}; use diesel_derive_enum::DbEnum; -use markdown::{Options, to_html_with_options}; - -use diesel::result::Error as DieselError; +use markdown; use rocket::serde::Serialize; use validator::Validate; use super::schema::mails; +use crate::DbConn; +use crate::errors::{self, ZauthError}; #[derive(DbEnum, Debug, Deserialize, FromFormField, Serialize, Copy, Clone)] #[db_enum(existing_type_path = "crate::models::schema::sql_types::ContentType")] @@ -95,9 +94,9 @@ impl Mail { pub fn render_body(&self) -> errors::Result { match self.content_type { ContentType::Plain => Ok(self.body.clone()), - ContentType::Markdown => to_html_with_options( + ContentType::Markdown => markdown::to_html_with_options( &self.body, - &Options::gfm(), + &markdown::Options::gfm(), ) .map_err(|_| { ZauthError::Unprocessable("could not parse markdown".into()) diff --git a/src/models/role.rs b/src/models/role.rs index a763cc27..b1b30f09 100644 --- a/src/models/role.rs +++ b/src/models/role.rs @@ -1,14 +1,13 @@ -use crate::{ - DbConn, - errors::{Result, ZauthError}, -}; use diesel::{self, prelude::*}; use validator::Validate; +use crate::DbConn; +use crate::errors::{Result, ZauthError}; +use crate::models::client::Client; use crate::models::schema::{ clients, clients_roles, roles, users, users_roles, }; -use crate::models::{client::Client, user::User}; +use crate::models::user::User; #[derive( Deserialize, diff --git a/src/models/session.rs b/src/models/session.rs index 1a0ceb3b..c550a066 100644 --- a/src/models/session.rs +++ b/src/models/session.rs @@ -1,9 +1,8 @@ use chrono::{Duration, NaiveDateTime, Utc}; use diesel::{self, prelude::*}; -use crate::DbConn; - use super::schema::sessions; +use crate::DbConn; use crate::config::Config; use crate::errors::{Result, ZauthError}; use crate::models::client::Client; diff --git a/src/models/user.rs b/src/models/user.rs index 7ccdf6e4..267a3755 100644 --- a/src/models/user.rs +++ b/src/models/user.rs @@ -1,23 +1,23 @@ -use super::schema::{roles, users}; -use crate::DbConn; -use crate::errors::{self, InternalError, LoginError, ZauthError}; -use diesel::{self, prelude::*}; -use diesel_derive_enum::DbEnum; use std::fmt; use std::sync::LazyLock; -use crate::Config; -use crate::util::random_token; use chrono::{NaiveDateTime, Utc}; use diesel::result::{DatabaseErrorKind, Error as DieselError}; +use diesel::{self, prelude::*}; +use diesel_derive_enum::DbEnum; use lettre::message::Mailbox; use pwhash::bcrypt::{self, BcryptSetup}; use regex::Regex; use rocket::{FromFormField, serde::Serialize}; -use std::convert::TryFrom; use validator::{Validate, ValidationError, ValidationErrors}; use super::role::{Role, UserRole}; +use super::schema::roles; +use super::schema::users; +use crate::Config; +use crate::DbConn; +use crate::errors::{self, InternalError, LoginError, ZauthError}; +use crate::util::random_token; #[derive( DbEnum, diff --git a/src/token_store.rs b/src/token_store.rs index df61b18e..74045b64 100644 --- a/src/token_store.rs +++ b/src/token_store.rs @@ -1,8 +1,10 @@ -use crate::config::Config; -use crate::util; +use std::collections::HashMap; + use chrono::{DateTime, Duration, Local}; use rocket::tokio::sync::Mutex; -use std::collections::HashMap; + +use crate::config::Config; +use crate::util; #[derive(Debug)] pub struct Token { diff --git a/src/util.rs b/src/util.rs index b096cb48..7d4f79ea 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,4 +1,5 @@ use core::iter; + use rand::{Rng, distr::Alphanumeric, rng}; pub fn random_token(token_length: usize) -> String { diff --git a/src/views/mod.rs b/src/views/mod.rs index 051dd671..efc2e951 100644 --- a/src/views/mod.rs +++ b/src/views/mod.rs @@ -1,3 +1,4 @@ #[macro_use] pub mod template; + pub mod accepter; diff --git a/src/views/template.rs b/src/views/template.rs index 5e1ddd7f..70eaaf6d 100644 --- a/src/views/template.rs +++ b/src/views/template.rs @@ -1,5 +1,3 @@ -use std::default::Default; - #[derive(Debug)] pub struct CommonTemplateData { pub zauth_version: &'static str, diff --git a/src/webauthn.rs b/src/webauthn.rs index fd9d3825..23172892 100644 --- a/src/webauthn.rs +++ b/src/webauthn.rs @@ -10,7 +10,8 @@ use webauthn_rs::{ }, }; -use crate::{config::Config, errors::Either}; +use crate::config::Config; +use crate::errors::Either; type Authentication = Either; diff --git a/tests/clients.rs b/tests/clients.rs index c5197c7e..1c998448 100644 --- a/tests/clients.rs +++ b/tests/clients.rs @@ -1,17 +1,15 @@ -extern crate diesel; -extern crate rocket; +mod common; -use common::HttpClient; use rocket::http::Accept; use rocket::http::ContentType; use rocket::http::Status; -use zauth::models::user::User; - -mod common; -use crate::common::{config, url}; use zauth::models::client::{Client, NewClient}; use zauth::models::session::Session; +use zauth::models::user::User; + +use crate::common::HttpClient; +use crate::common::{config, url}; #[rocket::async_test] async fn create_and_update_client() { diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 8738730e..7a01286e 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -3,25 +3,25 @@ extern crate diesel; extern crate parking_lot; extern crate rocket; -extern crate tempfile; extern crate urlencoding; extern crate zauth; -use diesel::RunQueryDsl; -use diesel::sql_query; -use parking_lot::Mutex; +use std::future::Future; use std::str::FromStr; +use std::time::Duration; -use crate::common::zauth::DbConn; -use crate::common::zauth::config::Config; -use crate::common::zauth::models::client::*; -use crate::common::zauth::models::user::*; +use diesel::RunQueryDsl; +use diesel::sql_query; use lettre::Address; +use parking_lot::Mutex; use rocket::http::{ContentType, Status}; use rocket::tokio::time::sleep; -use std::future::Future; -use std::time::Duration; + +use zauth::DbConn; +use zauth::config::Config; use zauth::mailer::STUB_MAILER_OUTBOX; +use zauth::models::client::*; +use zauth::models::user::*; pub type HttpClient = rocket::local::asynchronous::Client; diff --git a/tests/mailinglist.rs b/tests/mailinglist.rs index 01a078ad..9fac9445 100644 --- a/tests/mailinglist.rs +++ b/tests/mailinglist.rs @@ -1,19 +1,17 @@ -extern crate diesel; -extern crate rocket; +mod common; -use common::{HttpClient, config}; use rocket::http::Header; use rocket::http::{Accept, ContentType, Status}; use serde_json::Value; -use zauth::models::client::{Client, NewClient}; -use zauth::models::role::NewRole; -use zauth::models::role::Role; use zauth::DbConn; +use zauth::models::client::{Client, NewClient}; use zauth::models::mail::NewMail; +use zauth::models::role::NewRole; +use zauth::models::role::Role; use zauth::models::user::*; -mod common; +use crate::common::{HttpClient, config}; const TEST_USERS: [(&str, UserState, bool); 10] = [ ("valid0", UserState::Active, true), diff --git a/tests/oauth.rs b/tests/oauth.rs index 266e5a4a..eb86dcbb 100644 --- a/tests/oauth.rs +++ b/tests/oauth.rs @@ -1,11 +1,5 @@ -extern crate diesel; -extern crate regex; -extern crate rocket; -extern crate serde_json; -extern crate urlencoding; -extern crate zauth; - -use self::serde_json::{Number, Value}; +mod common; + use base64::Engine; use base64::prelude::BASE64_STANDARD; use common::HttpClient; @@ -16,6 +10,7 @@ use regex::Regex; use rocket::http::Header; use rocket::http::Status; use rocket::http::{Accept, ContentType}; +use serde_json::{Number, Value}; use zauth::DbConn; use zauth::controllers::oauth_controller::UserToken; @@ -25,7 +20,6 @@ use zauth::models::role::Role; use zauth::models::user::{NewUser, User}; use zauth::token_store::TokenStore; -mod common; use crate::common::url; const REDIRECT_URI: &str = "https://example.com/redirect/me/here"; diff --git a/tests/passkeys.rs b/tests/passkeys.rs index 2b5259e4..a0f59e38 100644 --- a/tests/passkeys.rs +++ b/tests/passkeys.rs @@ -1,5 +1,4 @@ -extern crate diesel; -extern crate rocket; +mod common; use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; @@ -12,6 +11,7 @@ use rocket::http::Status; use serde_json::json; use webauthn_rs::prelude::DiscoverableAuthentication; use webauthn_rs::prelude::Uuid; + use zauth::errors::Either; use zauth::models::passkey::NewPassKey; use zauth::models::passkey::PassKey; @@ -19,8 +19,6 @@ use zauth::models::user::NewUser; use zauth::models::user::User; use zauth::webauthn::WebAuthnStore; -mod common; - #[rocket::async_test] async fn register_passkey_as_visitor() { common::as_visitor(async move |http_client: HttpClient, _db| { diff --git a/tests/roles.rs b/tests/roles.rs index aaea051b..8bda563b 100644 --- a/tests/roles.rs +++ b/tests/roles.rs @@ -1,12 +1,12 @@ -use common::{HttpClient, url}; +mod common; + use rocket::http::{Accept, ContentType, Status}; -use zauth::models::{ - client::{Client, NewClient}, - role::{NewRole, Role}, - user::User, -}; -mod common; +use zauth::models::client::{Client, NewClient}; +use zauth::models::role::{NewRole, Role}; +use zauth::models::user::User; + +use crate::common::{HttpClient, url}; #[rocket::async_test] async fn list_roles_as_user() { diff --git a/tests/sessions.rs b/tests/sessions.rs index f5d9b709..bef83b6f 100644 --- a/tests/sessions.rs +++ b/tests/sessions.rs @@ -1,13 +1,11 @@ -extern crate chrono; -extern crate diesel; -extern crate rocket; +mod common; use chrono::{Duration, Utc}; -use common::HttpClient; use rocket::http::Status; -use zauth::models::session::*; -mod common; +use zauth::models::session::Session; + +use crate::common::HttpClient; #[rocket::async_test] async fn valid_user_session() { diff --git a/tests/users.rs b/tests/users.rs index d5f45b79..404e2c57 100644 --- a/tests/users.rs +++ b/tests/users.rs @@ -1,14 +1,12 @@ -extern crate diesel; -extern crate rocket; +mod common; -use common::HttpClient; +use pwhash::bcrypt; use rocket::http::{Accept, ContentType, Status}; use rocket::local::asynchronous::LocalResponse; -use pwhash::bcrypt; use zauth::models::user::*; -mod common; +use crate::common::HttpClient; async fn post_registration<'a>( http_client: &'a common::HttpClient, From 9e11feeaced3252bdc220af7f245eaf5e68b65ea Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:57 +0200 Subject: [PATCH 12/47] build: Make package.json a private module. --- package-lock.json | 5 ++--- package.json | 13 ++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb0bcf71..46fd1426 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,12 @@ { "name": "zauth", - "version": "1.0.0", + "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zauth", - "version": "1.0.0", - "license": "MIT", + "version": "0.0.0", "devDependencies": { "bulma": "^0.9.4", "sass": "^1.58.3" diff --git a/package.json b/package.json index 6b670511..7b2c42f9 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,13 @@ { "name": "zauth", - "version": "1.0.0", - "description": "The name is open for discussion.", - "author": "Zeus WPI ", - "homepage": "https://github.com/ZeusWPI/zauth#readme", + "private": true, + "version": "0.0.0", + "description": "This npm package.json is only used for building the css.", + "type": "module", "scripts": { "build": "sass static/scss/* static/dist/css/application.css --style compressed", "watch": "npm run build -- --watch" }, - "repository": { - "type": "git", - "url": "git+https://github.com/ZeusWPI/zauth.git" - }, - "license": "MIT", "devDependencies": { "sass": "^1.58.3", "bulma": "^0.9.4" From 74b3a33127f2e0d010e4a696a60dd6c9a16437da Mon Sep 17 00:00:00 2001 From: Jonas Meeuws Date: Fri, 24 Apr 2026 20:27:57 +0200 Subject: [PATCH 13/47] style(templates): Use uniform spacing for inline rust code. --- templates/clients/edit_client.html | 10 +++++----- templates/clients/index.html | 4 ++-- templates/mails/confirm_user_registration.txt | 4 ++-- templates/mails/new_user_registration.txt | 4 ++-- templates/mails/password_reset_success.txt | 2 +- templates/mails/password_reset_token.txt | 2 +- templates/mails/user_approved.txt | 2 +- templates/roles/index.html | 6 +++--- templates/roles/show_role.html | 16 ++++++++-------- templates/users/keys.html | 2 +- templates/users/registration_form.html | 8 ++++---- templates/users/show.html | 12 ++++++------ 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/templates/clients/edit_client.html b/templates/clients/edit_client.html index 125db046..a7abed36 100644 --- a/templates/clients/edit_client.html +++ b/templates/clients/edit_client.html @@ -105,12 +105,12 @@ {% else %} {% endif %} - {{ role.name }} - -