From 71f54f7e8433fd1fd86f94e75975852ee4549d28 Mon Sep 17 00:00:00 2001 From: Maurus Decimus <11444311+mdecimus@users.noreply.github.com> Date: Sat, 4 Apr 2026 12:23:30 +0200 Subject: [PATCH] Use `rustls-platform-verifier` for TLS certificate verification instead of `webpki` + Use `aws-lc` for cryptographic operations instead of `ring` --- CHANGELOG.md | 76 +- Cargo.lock | 2396 ++++++++--------- crates/common/Cargo.toml | 23 +- crates/common/src/auth/oauth/crypto.rs | 10 +- crates/common/src/config/inner.rs | 19 +- crates/common/src/config/server/tls.rs | 6 +- crates/common/src/config/smtp/queue.rs | 10 +- crates/common/src/expr/functions/text.rs | 7 +- crates/common/src/manager/defaults.rs | 8 +- crates/common/src/network/acme/directory.rs | 21 +- crates/common/src/network/acme/order.rs | 15 +- crates/common/src/scripts/functions/misc.rs | 7 +- crates/coordinator/Cargo.toml | 6 +- crates/coordinator/src/backend/nats/mod.rs | 4 +- crates/dav-proto/Cargo.toml | 2 +- crates/dav-proto/src/parser/mod.rs | 9 +- crates/dav-proto/src/parser/tokenizer.rs | 3 +- crates/dav/Cargo.toml | 2 +- crates/directory/Cargo.toml | 15 +- crates/directory/src/core/secret.rs | 52 +- crates/directory/src/lib.rs | 2 +- crates/email/Cargo.toml | 8 +- crates/email/src/message/crypto.rs | 7 +- crates/groupware/Cargo.toml | 2 +- crates/http-proto/Cargo.toml | 2 +- crates/http/Cargo.toml | 7 +- crates/http/src/management/diagnose.rs | 5 +- crates/imap-proto/Cargo.toml | 2 +- crates/imap/Cargo.toml | 7 +- crates/jmap-proto/Cargo.toml | 2 +- crates/jmap/Cargo.toml | 15 +- crates/main/Cargo.toml | 2 +- crates/managesieve/Cargo.toml | 7 +- crates/migration/Cargo.toml | 2 +- crates/nlp/Cargo.toml | 2 +- crates/pop3/Cargo.toml | 7 +- crates/services/Cargo.toml | 8 +- crates/services/src/state_manager/ece.rs | 12 +- crates/smtp/Cargo.toml | 15 +- crates/smtp/src/outbound/client.rs | 203 +- crates/smtp/src/outbound/delivery.rs | 3 +- crates/smtp/src/outbound/error.rs | 150 ++ crates/smtp/src/outbound/mod.rs | 47 +- crates/smtp/src/outbound/session.rs | 9 +- crates/spam-filter/Cargo.toml | 9 +- crates/spam-filter/src/modules/pyzor.rs | 66 +- crates/store/Cargo.toml | 21 +- crates/store/src/backend/azure/mod.rs | 13 +- crates/store/src/backend/postgres/main.rs | 6 +- crates/store/src/backend/redis/pool.rs | 2 +- crates/trc/Cargo.toml | 4 +- crates/trc/event-macro/Cargo.toml | 2 +- crates/types/Cargo.toml | 2 +- crates/utils/Cargo.toml | 11 +- crates/utils/proc-macros/Cargo.toml | 2 +- crates/utils/src/lib.rs | 93 +- crates/utils/src/tls.rs | 87 + tests/Cargo.toml | 14 +- tests/resources/smtp/config/if-blocks.toml | 34 - tests/resources/smtp/config/lists.toml | 19 - .../resources/smtp/config/rules-dynvalue.toml | 63 - tests/resources/smtp/config/rules-eval.toml | 34 - tests/resources/smtp/config/rules.toml | 29 - tests/resources/smtp/config/servers.toml | 53 - tests/resources/smtp/config/throttle.toml | 11 - tests/resources/smtp/config/toml-parser.toml | 71 - tests/src/directory/sql.rs | 1 + tests/src/imap/thread.rs | 1 + tests/src/jmap/contacts/contact.rs | 2 + tests/src/smtp/inbound/rewrite.rs | 215 +- tests/src/smtp/management/queue.rs | 2 +- tests/src/smtp/outbound/dane.rs | 2 +- tests/src/smtp/outbound/mta_sts.rs | 2 +- tests/src/store/ops.rs | 3 +- tests/src/store/registry.rs | 6 +- tests/src/system/oidc.rs | 1 - tests/src/utils/cleanup.rs | 2 + tests/src/utils/pop3.rs | 3 +- tests/src/utils/server.rs | 13 +- tests/src/utils/sieve.rs | 3 +- 80 files changed, 1921 insertions(+), 2198 deletions(-) create mode 100644 crates/smtp/src/outbound/error.rs create mode 100644 crates/utils/src/tls.rs delete mode 100644 tests/resources/smtp/config/if-blocks.toml delete mode 100644 tests/resources/smtp/config/lists.toml delete mode 100644 tests/resources/smtp/config/rules-dynvalue.toml delete mode 100644 tests/resources/smtp/config/rules-eval.toml delete mode 100644 tests/resources/smtp/config/rules.toml delete mode 100644 tests/resources/smtp/config/servers.toml delete mode 100644 tests/resources/smtp/config/throttle.toml delete mode 100644 tests/resources/smtp/config/toml-parser.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c398f1d..9d814f77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,24 +7,29 @@ All notable changes to this project will be documented in this file. This projec This version includes **multiple breaking changes**. If you are upgrading from v0.15.x and below, please read the [upgrading documentation](https://github.com/stalwartlabs/stalwart/blob/main/UPGRADING/v0_16.md) for more information on how to upgrade from previous versions. ## Added -- App password enhancements: - - Limited access (#1609) - - Labels (#2255) - - IP address restrictions. - - Expiration dates. -- API key enhancements: - - Limited access. - - Labels. - - IP address restrictions. - - Expiration dates. -- Password enhancements: - - Password strength enforcement using the `zxcvbn` algorithm. - - Expiration and rotation policies. -- Fail2ban: - - Auto-expire bans after a configurable time period (#964). - - Add comments to bans with details about the triggering event (#1321). -- MTA: - - RCPT TO stage settings improvements (#2217 #394) +- Security enhancements: + - Password strength enforcement using the `zxcvbn` algorithm + - Password expiration, rotation policies and IP address restrictions for user accounts + - App Passwords with limited access (#1609), labels (#2255), IP address restrictions and expiration dates + - API keys with limited access, labels, IP address restrictions and expiration dates + - Auto-ban comments and details about the triggering event (#1321) + - Auto-ban expiration after a configurable time period (#964) +- DNS Management: + - Automatic DNS management of `MX`, `TXT`, `CNAME`, `SRV`, `CAA` and `TLSA` records (#463 #1017 #1419 #2438 #1370 #1406 #1371) + - Automatic update of `TLSA` records when ACME certificates change (#1664) + - RFC2136 `SIG(0)` support (#856) + - BunnyDNS provider support + - Porkbun provider support + - DNSimple provider support +- DKIM: + - Automatic DKIM key generation, rotation and DNS management (#368 #961) + - Store DKIM keys in the database (#1264) + - Ignore insecure signatures when verifying DKIM (#1068 #467) +- ACME/TLS: + - `DNS-PERSIST-01` ACME challenge support (#2837) + - Renew certificates on demand, view certificate details (#675 #1162 #2566) + - `CAA` record support (#468) with `accounturi` parameter (#1933) + - `TLSA` records publishing restricted to `3 1 1` and `2 1 1` (#2193) - OIDC: - JWT token validation without requesting userinfo from the OIDC provider. - Audience (`aud`) claim (#2603) and scope validation support. @@ -33,42 +38,28 @@ This version includes **multiple breaking changes**. If you are upgrading from v - Separate filter for groups (#1841) - Improve support for OpenLDAP schemas (#760) - Improve and simplify LDAP settings (#2194 #2174) -- DKIM: - - Store DKIM keys in the database (#1264) - - Ignore insecure signatures when verifying DKIM (#1068 #467) -- DNS Management: - - RFC2136 `SIG(0)` support (#856) - - Auto updating `TLSA` records when certificates change (#1664) - - `CAA` record support (#468) - - Create only `3 1 1` and `2 1 1` `TLSA` records (#2193). - - BunnyDNS provider support - - Porkbun provider support - - DNSimple provider support -- ACME: - - `DNS-PERSIST-01` ACME challenge support (#2837) - - Renew certificates on demand, view certificate details (#675 #1162 #2566) - - `CAA` records with `accounturi` parameter support (#1933) -- Clustering: - - Automatic cluster node ID generation and management. - - Unified cluster management (#960) - - Outbound role (#1692) - Directory: + - Masked email addresses for enhanced privacy (*Enterprise*) - Domain aliases (#583) - - E-mail alias descriptions and disable alias (#506) + - E-mail alias descriptions and option to disable aliases (#506) + - Account archiving and un-deletion (#2767) (*Enterprise*) + - Per-domain directory backends (*Enterprise*) - Account configuration and discovery: - Automatic Configuration of Email, Calendar, and Contact Server Settings ([draft-mailmaint-uaautoconf-04](https://datatracker.ietf.org/doc/html/draft-eggert-mailmaint-uaautoconf-04)) (#2201) - MS Autodiscover V2 support (#679) - Sieve: Allow deactivating scripts without deleting them (#1251). - Tracing: Enable events only mode (#2276) -- Enterprise features: - - Masked email addresses for enhanced privacy. - - Account archiving and undelete features (#2767). - - Per-domain directory backends. +- Clustering: + - Automatic cluster node ID generation and management. + - Unified cluster management (#960) + - Outbound MTA role (#1692) ## Changed - Replaced REST API with JMAP API (#2262 #959 #1480) - Removed support for Authenticated Received Chain (ARC) sealing ([learn more](https://mailarchive.ietf.org/arch/msg/dmarc/KvX3-H1SL0Gh3IDl7FuR2hoR87M/)). - Directory: Removed `smtp`, `imap` and `memory` directory backends. +- Use `aws-lc` for cryptographic operations instead of `ring`. +- Use `rustls-platform-verifier` for TLS certificate verification instead of `webpki` (#247). ## Fixed - Directory: @@ -80,6 +71,7 @@ This version includes **multiple breaking changes**. If you are upgrading from v - New LDAP aliases are rejected (#1318). - Validate account and group names (#2209) - MTA: + - RCPT TO stage settings improvements (#2217 #394) - Relay to IP addresses (#838) - Duplicate delivery inverted check - SASL challenge responses include invalid `Go ahead` text diff --git a/Cargo.lock b/Cargo.lock index 9d2a422e..06b0e16b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,15 +8,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5" -[[package]] -name = "addr2line" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" version = "2.0.1" @@ -35,7 +26,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "generic-array 0.14.7", ] @@ -47,7 +38,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher 0.4.4", - "cpufeatures", + "cpufeatures 0.2.17", "zeroize", ] @@ -120,24 +111,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.101" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" - -[[package]] -name = "arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" -dependencies = [ - "derive_arbitrary", -] +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "arc-swap" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f3647c145568cec02c42054e07bdf9a5a698e15b466fb2341bfc393cd24aa5" +checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207" dependencies = [ "rustversion", ] @@ -156,7 +138,7 @@ checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", - "cpufeatures", + "cpufeatures 0.2.17", "password-hash", ] @@ -211,7 +193,7 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", "synstructure", ] @@ -223,7 +205,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -262,38 +244,31 @@ dependencies = [ [[package]] name = "async-nats" -version = "0.44.2" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f834a80c3ab6109b9c8f5ca6661a578cf31e088e831b6ce07c6b23cca04f6742" +checksum = "07d6f157065c3461096d51aacde0c326fa49f3f6e0199e204c566842cdaa5299" dependencies = [ - "base64 0.22.1", + "aws-lc-rs", "bytes", "futures-util", "memchr", - "nkeys", - "nuid", - "once_cell", "pin-project", "portable-atomic", "rand 0.8.5", "regex", - "ring", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.2.0", - "rustls-webpki 0.102.8", + "rustls-native-certs", + "rustls-pki-types", + "rustls-webpki 0.103.10", "serde", "serde_json", - "serde_nanos", "serde_repr", "thiserror 1.0.69", - "time", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-stream", "tokio-util", "tokio-websockets", "tracing", - "tryhard", "url", ] @@ -305,7 +280,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -327,7 +302,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -338,7 +313,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -349,17 +324,18 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "attohttpc" -version = "0.28.5" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07a9b245ba0739fc90935094c29adbaee3f977218b5fb95e822e261cda7f56a3" +checksum = "16e2cdb6d5ed835199484bb92bb8b3edd526effe995c61732580439c1a67e2e9" dependencies = [ + "base64 0.22.1", "http 1.4.0", "log", - "rustls 0.23.36", + "rustls 0.23.37", "serde", "serde_json", "url", - "webpki-roots 0.26.11", + "webpki-roots 1.0.6", ] [[package]] @@ -370,28 +346,51 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-creds" -version = "0.37.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f84143206b9c72b3c5cb65415de60c7539c79cd1559290fddec657939131be0" +checksum = "ca3b85155d265df828f84e53886ed9e427aed979dd8a39f5b8b2162c77e142d7" dependencies = [ "attohttpc", "home", "log", - "quick-xml 0.32.0", + "quick-xml 0.38.4", "rust-ini", "serde", - "thiserror 1.0.69", + "thiserror 2.0.18", "time", "url", ] [[package]] -name = "aws-region" -version = "0.25.5" +name = "aws-lc-rs" +version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aed3f9c7eac9be28662fdb3b0f4d1951e812f7c64fed4f0327ba702f459b3b" +checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" dependencies = [ - "thiserror 1.0.69", + "aws-lc-sys", + "untrusted 0.7.1", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + +[[package]] +name = "aws-region" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "838b36c8dc927b6db1b6c6b8f5d05865f2213550b9e83bf92fa99ed6525472c0" +dependencies = [ + "thiserror 2.0.18", ] [[package]] @@ -480,21 +479,6 @@ dependencies = [ "time", ] -[[package]] -name = "backtrace" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-link", -] - [[package]] name = "base16ct" version = "0.2.0" @@ -562,9 +546,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.70.1" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ "bitflags", "cexpr", @@ -575,27 +559,9 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", - "syn 2.0.115", -] - -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "proc-macro2", - "quote", - "regex", - "rustc-hash 2.1.1", - "shlex", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -695,16 +661,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.8.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d" +checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq 0.4.2", - "cpufeatures", + "cpufeatures 0.3.0", ] [[package]] @@ -725,6 +691,15 @@ dependencies = [ "generic-array 0.14.7", ] +[[package]] +name = "block-buffer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +dependencies = [ + "hybrid-array", +] + [[package]] name = "block-padding" version = "0.3.3" @@ -775,9 +750,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.1" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "bytecheck" @@ -799,7 +774,7 @@ checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -915,9 +890,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.56" +version = "1.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" +checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" dependencies = [ "find-msvc-tools", "jobserver", @@ -982,10 +957,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "chrono" -version = "0.4.43" +name = "chacha20" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.0", +] + +[[package]] +name = "chrono" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ "iana-time-zone", "js-sys", @@ -993,7 +979,7 @@ dependencies = [ "pure-rust-locales", "serde", "wasm-bindgen", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -1021,7 +1007,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "inout", "zeroize", ] @@ -1050,13 +1036,19 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" dependencies = [ "cc", ] +[[package]] +name = "cmov" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746" + [[package]] name = "combine" version = "4.6.7" @@ -1073,7 +1065,7 @@ dependencies = [ [[package]] name = "common" -version = "0.15.5" +version = "0.16.0" dependencies = [ "aes-gcm-siv", "ahash", @@ -1092,11 +1084,11 @@ dependencies = [ "hashify", "hickory-proto 0.25.2", "hostname", - "hyper 1.8.1", + "hyper", "idna", "imagesize", "imap_proto", - "indexmap 2.13.0", + "indexmap 2.13.1", "infer 0.19.0", "jmap_proto", "libc", @@ -1104,8 +1096,7 @@ dependencies = [ "mail-auth", "mail-builder", "mail-parser", - "mail-send", - "md5 0.8.0", + "md5", "nlp", "nohash-hasher", "num_cpus", @@ -1123,32 +1114,32 @@ dependencies = [ "proxy-header", "psl", "pwhash", - "quick-xml 0.39.0", + "quick-xml 0.39.2", "quick_cache", "rasn", "rasn-cms", "rasn-pkix", - "rcgen 0.12.1", + "rcgen", "regex", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "ring", "rkyv", "rsa", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "rustls-pki-types", "sequoia-openpgp", "serde", "serde_json", - "sha1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2 0.11.0", "sieve-rs", "smtp-proto", "store", "tinyvec", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", "types", "unicode-security", @@ -1156,7 +1147,7 @@ dependencies = [ "whatlang", "x509-parser", "xxhash-rust", - "zip 8.5.0", + "zip", "zxcvbn", ] @@ -1208,6 +1199,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "const-random" version = "0.1.18" @@ -1248,15 +1245,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "const_panic" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e262cdaac42494e3ae34c43969f9cdeb7da178bdb4b66fa6a1ea2edb4c8ae652" -dependencies = [ - "typewit", -] - [[package]] name = "constant_time_eq" version = "0.3.1" @@ -1285,16 +1273,6 @@ dependencies = [ "zenoh", ] -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation" version = "0.10.1" @@ -1329,6 +1307,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc16" version = "0.4.0" @@ -1435,6 +1422,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +dependencies = [ + "hybrid-array", +] + [[package]] name = "crypto-mac" version = "0.10.0" @@ -1475,6 +1471,15 @@ dependencies = [ "cipher 0.4.4", ] +[[package]] +name = "ctutils" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +dependencies = [ + "cmov", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1482,7 +1487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", @@ -1499,7 +1504,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -1514,12 +1519,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" dependencies = [ - "darling_core 0.21.3", - "darling_macro 0.21.3", + "darling_core 0.23.0", + "darling_macro 0.23.0", ] [[package]] @@ -1533,21 +1538,20 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] name = "darling_core" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" dependencies = [ - "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -1558,18 +1562,18 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] name = "darling_macro" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ - "darling_core 0.21.3", + "darling_core 0.23.0", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -1586,7 +1590,7 @@ checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" [[package]] name = "dav" -version = "0.15.5" +version = "0.16.0" dependencies = [ "calcard 0.3.2", "chrono", @@ -1597,7 +1601,7 @@ dependencies = [ "groupware", "hashify", "http_proto", - "hyper 1.8.1", + "hyper", "percent-encoding", "registry", "rkyv", @@ -1609,15 +1613,15 @@ dependencies = [ [[package]] name = "dav-proto" -version = "0.15.5" +version = "0.16.0" dependencies = [ "calcard 0.3.2", "chrono", "compact_str", "hashify", - "hyper 1.8.1", + "hyper", "mail-parser", - "quick-xml 0.39.0", + "quick-xml 0.39.2", "rkyv", "serde", "serde_json", @@ -1693,9 +1697,9 @@ dependencies = [ [[package]] name = "deflate64" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" +checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2" [[package]] name = "der" @@ -1703,7 +1707,7 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ - "const-oid", + "const-oid 0.9.6", "pem-rfc7468", "zeroize", ] @@ -1724,25 +1728,14 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", "serde_core", ] -[[package]] -name = "derive_arbitrary" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.115", -] - [[package]] name = "derive_builder" version = "0.20.2" @@ -1761,7 +1754,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -1771,7 +1764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -1799,14 +1792,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid", - "crypto-common", + "const-oid 0.9.6", + "crypto-common 0.1.7", "subtle", ] +[[package]] +name = "digest" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +dependencies = [ + "block-buffer 0.12.0", + "const-oid 0.10.2", + "crypto-common 0.2.1", + "ctutils", +] + [[package]] name = "directory" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "argon2", @@ -1819,27 +1824,26 @@ dependencies = [ "ldap3", "mail-builder", "mail-parser", - "md5 0.8.0", + "md5", "nlp", "nohash-hasher", - "password-hash", "pbkdf2", "proc_macros", "pwhash", "regex", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "rkyv", - "rustls 0.23.36", + "rustls 0.23.37", "rustls-pki-types", "scrypt", "serde", "serde_json", - "sha1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2 0.11.0", "store", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "totp-rs", "trc", "types", @@ -1875,7 +1879,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -1891,22 +1895,16 @@ dependencies = [ name = "dns-update" version = "0.2.0" dependencies = [ + "aws-lc-rs", "hickory-client", "reqwest 0.13.2", - "ring", - "rustls 0.23.36", + "rustls 0.23.37", "serde", "serde_json", "serde_urlencoded", "tokio", ] -[[package]] -name = "doc-comment" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9" - [[package]] name = "dsa" version = "0.6.3" @@ -1923,6 +1921,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dyn-clone" version = "1.0.20" @@ -1974,7 +1978,7 @@ dependencies = [ "base64 0.21.7", "byteorder", "hex", - "hkdf", + "hkdf 0.12.4", "lazy_static", "once_cell", "openssl", @@ -2004,7 +2008,6 @@ dependencies = [ "rand_core 0.6.4", "serde", "sha2 0.10.9", - "signature", "subtle", "zeroize", ] @@ -2027,7 +2030,7 @@ dependencies = [ "ff", "generic-array 0.14.7", "group", - "hkdf", + "hkdf 0.12.4", "pem-rfc7468", "pkcs8", "rand_core 0.6.4", @@ -2038,7 +2041,7 @@ dependencies = [ [[package]] name = "email" -version = "0.15.5" +version = "0.16.0" dependencies = [ "aes", "aes-gcm", @@ -2102,10 +2105,10 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -2153,11 +2156,11 @@ dependencies = [ [[package]] name = "event_macro" -version = "0.15.5" +version = "0.16.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -2351,9 +2354,9 @@ dependencies = [ [[package]] name = "foundationdb" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514aeffe12bbcf2f64a746793cc1c2602006c705d3fc6285df024303d008cccf" +checksum = "310c638e34e54f56daa986ed6c8dadecf4e4825245b73e577feb25c808222ae8" dependencies = [ "async-recursion", "async-trait", @@ -2362,8 +2365,7 @@ dependencies = [ "foundationdb-sys", "foundationdb-tuple", "futures", - "memchr", - "rand 0.8.5", + "rand 0.9.2", "serde", "serde_bytes", "serde_json", @@ -2373,9 +2375,9 @@ dependencies = [ [[package]] name = "foundationdb-gen" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d854866df33e1f4099769e2b9fa8bf8cf3bca707029ae6298d0e61bcae358" +checksum = "b749fc82bb7576794d4679f166a5cfa0a856122e05635437f7231e5e679fa2f6" dependencies = [ "xml-rs", ] @@ -2388,30 +2390,36 @@ checksum = "c4ca5370149145ec3741cd7e82832f17f893b9421ee4e484d9511c6702bd9911" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", "try_map", ] [[package]] name = "foundationdb-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bae14dba30b8dcc4905a9189ebb18bc9db9744ef0ad8f2b94ef00d21e176964" +checksum = "c0f3f231ff5b8465063b2bf8af3b975222b4fa3cc8c07b43d01fe8e0ae15c9dd" dependencies = [ - "bindgen 0.70.1", + "bindgen", "libc", ] [[package]] name = "foundationdb-tuple" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1832c1fbe592de718893f7c3b48179a47757f8974d1498fece997454c2b0fa" +checksum = "a8cd42c159de9b90a91efc0ce350e3142099571ef498e7fa1a1dcc1d1eeccd9d" dependencies = [ "memchr", "uuid", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -2489,7 +2497,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -2549,7 +2557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ "rustix", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -2585,21 +2593,22 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi", + "r-efi 6.0.0", + "rand_core 0.10.0", "wasip2", "wasip3", "wasm-bindgen", @@ -2615,12 +2624,6 @@ dependencies = [ "polyval", ] -[[package]] -name = "gimli" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - [[package]] name = "git-version" version = "0.3.9" @@ -2638,7 +2641,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -2660,7 +2663,7 @@ dependencies = [ [[package]] name = "groupware" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "calcard 0.3.2", @@ -2694,7 +2697,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.4.0", - "indexmap 2.13.0", + "indexmap 2.13.1", "slab", "tokio", "tokio-util", @@ -2741,30 +2744,25 @@ dependencies = [ [[package]] name = "hashify" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "149e3ea90eb5a26ad354cfe3cb7f7401b9329032d0235f2687d03a35f30e5d4c" +checksum = "dd1246c0e5493286aeb2dde35b1f4eb9c4ce00e628641210a5e553fc001a1f26" dependencies = [ + "indexmap 2.13.1", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] name = "hashlink" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +checksum = "ea0b22561a9c04a7cb1a302c013e0259cd3b4bb619f145b32f72b8b4bcbed230" dependencies = [ - "hashbrown 0.15.5", + "hashbrown 0.16.1", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -2809,6 +2807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" dependencies = [ "async-trait", + "aws-lc-rs", "bitflags", "bytes", "cfg-if", @@ -2824,13 +2823,13 @@ dependencies = [ "once_cell", "rand 0.9.2", "ring", - "rustls 0.23.36", + "rustls 0.23.37", "rustls-pki-types", "thiserror 2.0.18", "time", "tinyvec", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tracing", "url", ] @@ -2842,6 +2841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62d7684f766b0f96344be88c023f9b6650039aea09d526b4974cce302eb61b1" dependencies = [ "async-trait", + "aws-lc-rs", "bitflags", "bytes", "cfg-if", @@ -2855,13 +2855,13 @@ dependencies = [ "once_cell", "rand 0.9.2", "ring", - "rustls 0.23.36", + "rustls 0.23.37", "rustls-pki-types", "thiserror 2.0.18", "time", "tinyvec", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tracing", "url", ] @@ -2881,11 +2881,11 @@ dependencies = [ "parking_lot", "rand 0.9.2", "resolv-conf", - "rustls 0.23.36", + "rustls 0.23.37", "smallvec", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tracing", ] @@ -2898,6 +2898,15 @@ dependencies = [ "hmac 0.12.1", ] +[[package]] +name = "hkdf" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018" +dependencies = [ + "hmac 0.13.0", +] + [[package]] name = "hmac" version = "0.10.1" @@ -2917,6 +2926,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "hmac" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" +dependencies = [ + "digest 0.11.2", +] + [[package]] name = "home" version = "0.5.12" @@ -2934,23 +2952,12 @@ checksum = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" dependencies = [ "cfg-if", "libc", - "windows-link", + "windows-link 0.2.1", ] [[package]] name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "0.15.5" +version = "0.16.0" dependencies = [ "async-stream", "base64 0.22.1", @@ -2965,25 +2972,24 @@ dependencies = [ "hashify", "http-body-util", "http_proto", - "hyper 1.8.1", + "hyper", "hyper-util", "jmap", "jmap_proto", "mail-auth", "mail-builder", "mail-parser", - "mail-send", "mime", "pkcs8", - "quick-xml 0.39.0", + "quick-xml 0.39.2", "registry", "rkyv", "rsa", "serde", "serde_json", "services", - "sha1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2 0.11.0", "smtp", "smtp-proto", "spam-filter", @@ -3005,17 +3011,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -3035,7 +3030,7 @@ dependencies = [ "bytes", "futures-core", "http 1.4.0", - "http-body 1.0.1", + "http-body", "pin-project-lite", ] @@ -3061,13 +3056,13 @@ dependencies = [ [[package]] name = "http_proto" -version = "0.15.5" +version = "0.16.0" dependencies = [ "common", "compact_str", "form_urlencoded", "http-body-util", - "hyper 1.8.1", + "hyper", "hyper-util", "percent-encoding", "registry", @@ -3095,33 +3090,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] -name = "hyper" -version = "0.14.32" +name = "hybrid-array" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.10", - "tokio", - "tower-service", - "tracing", - "want", + "typenum", ] [[package]] name = "hyper" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" dependencies = [ "atomic-waker", "bytes", @@ -3129,31 +3110,16 @@ dependencies = [ "futures-core", "h2", "http 1.4.0", - "http-body 1.0.1", + "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "pin-utils", "smallvec", "tokio", "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.32", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.7" @@ -3161,12 +3127,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ "http 1.4.0", - "hyper 1.8.1", + "hyper", "hyper-util", - "rustls 0.23.36", + "rustls 0.23.37", + "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tower-service", "webpki-roots 1.0.6", ] @@ -3177,29 +3144,13 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 1.8.1", + "hyper", "hyper-util", "pin-project-lite", "tokio", "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.8.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.20" @@ -3211,13 +3162,13 @@ dependencies = [ "futures-channel", "futures-util", "http 1.4.0", - "http-body 1.0.1", - "hyper 1.8.1", + "http-body", + "hyper", "ipnet", "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.2", + "socket2 0.6.3", "tokio", "tower-service", "tracing", @@ -3235,7 +3186,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core", + "windows-core 0.62.2", ] [[package]] @@ -3249,12 +3200,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", @@ -3262,9 +3214,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", @@ -3275,9 +3227,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", @@ -3289,15 +3241,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.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" dependencies = [ "icu_collections", "icu_locale_core", @@ -3309,15 +3261,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" +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", @@ -3378,7 +3330,7 @@ checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c" [[package]] name = "imap" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "common", @@ -3386,19 +3338,18 @@ dependencies = [ "directory", "email", "imap_proto", - "indexmap 2.13.0", + "indexmap 2.13.1", "mail-parser", - "mail-send", - "md5 0.8.0", + "md5", "nlp", "parking_lot", "rand 0.9.2", "registry", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "store", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", "types", "utils", @@ -3406,7 +3357,7 @@ dependencies = [ [[package]] name = "imap_proto" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "chrono", @@ -3421,36 +3372,32 @@ dependencies = [ [[package]] name = "include-flate" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01b7cb6ca682a621e7cda1c358c9724b53a7b4409be9be1dd443b7f3a26f998" +checksum = "8a05fb00d9abc625268e0573a519506b264a7d6965de09bac13201bfb44e723d" dependencies = [ "include-flate-codegen", "include-flate-compress", - "libflate", - "zstd", ] [[package]] name = "include-flate-codegen" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f49bf5274aebe468d6e6eba14a977eaf1efa481dc173f361020de70c1c48050" +checksum = "92c3c319a7527668538a8530c541e74e881e94c4f41e1425622d0a41c16468af" dependencies = [ "include-flate-compress", - "libflate", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.115", - "zstd", + "syn 2.0.117", ] [[package]] name = "include-flate-compress" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae6a40e716bcd5931f5dbb79cd921512a4f647e2e9413fded3171fca3824dbc" +checksum = "ed0bd9ea81b94169d61c5a397e9faef02153d3711fc62d3270bcde3ac85380d9" dependencies = [ "libflate", "zstd", @@ -3469,9 +3416,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -3515,21 +3462,22 @@ dependencies = [ [[package]] name = "ipconfig" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222" dependencies = [ - "socket2 0.5.10", + "socket2 0.6.3", "widestring", - "windows-sys 0.48.0", - "winreg", + "windows-registry", + "windows-result 0.4.1", + "windows-sys 0.61.2", ] [[package]] name = "ipnet" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" [[package]] name = "ipnetwork" @@ -3542,23 +3490,14 @@ dependencies = [ [[package]] name = "iri-string" -version = "0.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" +checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" dependencies = [ "memchr", "serde", ] -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -3579,9 +3518,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jemalloc-sys" @@ -3623,12 +3562,12 @@ dependencies = [ "jieba-macros", "phf 0.13.1", "regex", - "rustc-hash 2.1.1", + "rustc-hash", ] [[package]] name = "jmap" -version = "0.15.5" +version = "0.16.0" dependencies = [ "aes-gcm", "aes-gcm-siv", @@ -3643,10 +3582,10 @@ dependencies = [ "futures-util", "groupware", "hashify", - "hkdf", + "hkdf 0.13.0", "http-body-util", "http_proto", - "hyper 1.8.1", + "hyper", "hyper-util", "jmap-tools", "jmap_proto", @@ -3654,20 +3593,19 @@ dependencies = [ "mail-auth", "mail-builder", "mail-parser", - "mail-send", "nlp", "p256", "pkcs8", "rand 0.9.2", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "rkyv", "rsa", "serde", "serde_json", "services", - "sha1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2 0.11.0", "sieve-rs", "smtp", "smtp-proto", @@ -3683,19 +3621,17 @@ dependencies = [ [[package]] name = "jmap-client" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a269c4668bc7c12c61bf142f4f30c8d568d5afa8472f9dd881d83d2551323a" +version = "0.4.1" dependencies = [ "ahash", "async-stream", - "base64 0.13.1", + "base64 0.22.1", "chrono", "futures-util", "maybe-async", "parking_lot", - "reqwest 0.12.28", - "rustls 0.23.36", + "reqwest 0.13.2", + "rustls 0.23.37", "rustls-pki-types", "serde", "serde_json", @@ -3717,7 +3653,7 @@ dependencies = [ [[package]] name = "jmap_proto" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "calcard 0.3.2", @@ -3744,7 +3680,7 @@ dependencies = [ "cesu8", "cfg-if", "combine", - "jni-sys", + "jni-sys 0.3.1", "log", "thiserror 1.0.69", "walkdir", @@ -3753,9 +3689,31 @@ dependencies = [ [[package]] name = "jni-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" +dependencies = [ + "jni-sys 0.4.1", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.117", +] [[package]] name = "jobserver" @@ -3769,10 +3727,12 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.85" +version = "0.3.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" dependencies = [ + "cfg-if", + "futures-util", "once_cell", "wasm-bindgen", ] @@ -3817,7 +3777,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -3835,27 +3795,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" dependencies = [ - "indexmap 2.13.0", -] - -[[package]] -name = "konst" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4381b9b00c55f251f2ebe9473aef7c117e96828def1a7cb3bd3f0f903c6894e9" -dependencies = [ - "const_panic", - "konst_kernel", - "typewit", -] - -[[package]] -name = "konst_kernel" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b1eb7788f3824c629b1116a7a9060d6e898c358ebff59070093d51103dcc3c" -dependencies = [ - "typewit", + "indexmap 2.13.1", ] [[package]] @@ -3922,11 +3862,11 @@ dependencies = [ "log", "nom", "percent-encoding", - "rustls 0.23.36", - "rustls-native-certs 0.8.3", + "rustls 0.23.37", + "rustls-native-certs", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-stream", "tokio-util", "url", @@ -3947,9 +3887,9 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" -version = "0.2.182" +version = "0.2.184" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" +checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" [[package]] name = "libflate" @@ -3982,7 +3922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -3993,11 +3933,10 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.12" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" +checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" dependencies = [ - "bitflags", "libc", ] @@ -4007,7 +3946,7 @@ version = "0.17.3+10.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cef2a00ee60fe526157c9023edab23943fae1ce2ab6f4abb2a807c1746835de9" dependencies = [ - "bindgen 0.72.1", + "bindgen", "bzip2-sys", "cc", "libc", @@ -4018,9 +3957,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" +checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1" dependencies = [ "cc", "pkg-config", @@ -4029,9 +3968,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.23" +version = "1.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" +checksum = "d52f4c29e2a68ac30c9087e1b772dc9f44a2b66ed44edf2266cf2be9b03dafc1" dependencies = [ "cc", "libc", @@ -4047,15 +3986,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[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" @@ -4074,11 +4013,11 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru" -version = "0.14.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" +checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" dependencies = [ - "hashbrown 0.15.5", + "hashbrown 0.16.1", ] [[package]] @@ -4108,9 +4047,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" +checksum = "373f5eceeeab7925e0c1098212f2fbc4d416adec9d35051a6ab251e824c1854a" dependencies = [ "twox-hash", ] @@ -4142,7 +4081,7 @@ dependencies = [ "hickory-resolver", "mail-builder", "mail-parser", - "quick-xml 0.39.0", + "quick-xml 0.39.2", "rand 0.8.5", "ring", "rkyv", @@ -4150,7 +4089,7 @@ dependencies = [ "rustls-pki-types", "serde", "serde_json", - "zip 6.0.0", + "zip", ] [[package]] @@ -4174,26 +4113,9 @@ dependencies = [ "serde", ] -[[package]] -name = "mail-send" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114a4e27f3cfaf8918783e8fa4149b820c813b1bedc7755e20e12eff4518331e" -dependencies = [ - "base64 0.22.1", - "gethostname", - "md5 0.8.0", - "rustls 0.23.36", - "rustls-pki-types", - "smtp-proto", - "tokio", - "tokio-rustls 0.26.4", - "webpki-roots 1.0.6", -] - [[package]] name = "managesieve" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "common", @@ -4204,17 +4126,16 @@ dependencies = [ "imap_proto", "jmap_proto", "mail-parser", - "mail-send", - "md5 0.8.0", + "md5", "parking_lot", "registry", "rkyv", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "sieve-rs", "store", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", "types", "utils", @@ -4243,7 +4164,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -4268,10 +4189,14 @@ dependencies = [ ] [[package]] -name = "md5" -version = "0.7.0" +name = "md-5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +dependencies = [ + "cfg-if", + "digest 0.11.2", +] [[package]] name = "md5" @@ -4303,7 +4228,7 @@ checksum = "c797b9d6bb23aab2fc369c65f871be49214f5c759af65bde26ffaaa2b646b492" [[package]] name = "migration" -version = "0.15.5" +version = "0.16.0" dependencies = [ "base64 0.22.1", "bincode 1.3.3", @@ -4369,9 +4294,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", "wasi 0.11.1+wasi-snapshot-preview1", @@ -4380,9 +4305,9 @@ dependencies = [ [[package]] name = "moka" -version = "0.12.13" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac832c50ced444ef6be0767a008b02c106a909ba79d1d830501e94b96f6b7e" +checksum = "957228ad12042ee839f93c8f257b62b4c0ab5eaae1d4fa60de53b27c9d7c5046" dependencies = [ "crossbeam-channel", "crossbeam-epoch", @@ -4412,7 +4337,7 @@ checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -4422,22 +4347,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66f62cad7623a9cb6f8f64037f0c4f69c8db8e82914334a83c9788201c2c1bfa" dependencies = [ "darling 0.20.11", - "heck 0.5.0", + "heck", "num-bigint", "proc-macro-crate", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", "termcolor", "thiserror 2.0.18", ] [[package]] name = "mysql_async" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277ce2f2459b2af4cc6d0a0b7892381f80800832f57c533f03e2845f4ea331ea" +checksum = "d1d9585dc9058886ff3a1f48a23024dd1d054264dee7c5ae0e4bd640c953bee5" dependencies = [ "bytes", "crossbeam-queue", @@ -4451,14 +4376,14 @@ dependencies = [ "pem", "percent-encoding", "rand 0.9.2", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "serde", "serde_json", "socket2 0.5.10", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-util", "twox-hash", "url", @@ -4486,7 +4411,7 @@ dependencies = [ "saturating", "serde", "serde_json", - "sha1", + "sha1 0.10.6", "sha2 0.10.9", "thiserror 2.0.18", "uuid", @@ -4501,23 +4426,6 @@ dependencies = [ "getrandom 0.2.17", ] -[[package]] -name = "native-tls" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe 0.2.1", - "openssl-sys", - "schannel", - "security-framework 3.6.0", - "security-framework-sys", - "tempfile", -] - [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -4545,24 +4453,9 @@ dependencies = [ "libc", ] -[[package]] -name = "nkeys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879011babc47a1c7fdf5a935ae3cfe94f34645ca0cac1c7f6424b36fc743d1bf" -dependencies = [ - "data-encoding", - "ed25519", - "ed25519-dalek", - "getrandom 0.2.17", - "log", - "rand 0.8.5", - "signatory", -] - [[package]] name = "nlp" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "bincode 1.3.3", @@ -4620,6 +4513,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ntapi" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" +dependencies = [ + "winapi", +] + [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -4629,15 +4531,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "nuid" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc895af95856f929163a0aa20c26a78d26bfdc839f51b9d5aa7a5b79e52b7e83" -dependencies = [ - "rand 0.8.5", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -4666,9 +4559,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" [[package]] name = "num-integer" @@ -4712,9 +4605,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26" dependencies = [ "num_enum_derive", "rustversion", @@ -4722,14 +4615,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -4741,6 +4634,16 @@ dependencies = [ "bitflags", ] +[[package]] +name = "objc2-io-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15" +dependencies = [ + "libc", + "objc2-core-foundation", +] + [[package]] name = "objc2-system-configuration" version = "0.3.2" @@ -4750,15 +4653,6 @@ dependencies = [ "objc2-core-foundation", ] -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "ocb3" version = "0.1.0" @@ -4782,9 +4676,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" dependencies = [ "critical-section", "portable-atomic", @@ -4798,9 +4692,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", @@ -4819,15 +4713,9 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - [[package]] name = "openssl-probe" version = "0.2.1" @@ -4836,9 +4724,9 @@ 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", @@ -5010,7 +4898,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -5097,7 +4985,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -5117,7 +5005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" dependencies = [ "fixedbitset", - "indexmap 2.13.0", + "indexmap 2.13.1", ] [[package]] @@ -5128,7 +5016,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ "fixedbitset", "hashbrown 0.15.5", - "indexmap 2.13.0", + "indexmap 2.13.1", "serde", ] @@ -5182,7 +5070,7 @@ dependencies = [ "phf_shared 0.13.1", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -5214,35 +5102,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkcs1" @@ -5310,26 +5192,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "opaque-debug", "universal-hash", ] [[package]] name = "pop3" -version = "0.15.5" +version = "0.16.0" dependencies = [ "common", "directory", "email", "imap", "mail-parser", - "mail-send", "registry", - "rustls 0.23.36", + "rustls 0.23.37", "store", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", "types", "utils", @@ -5343,27 +5224,27 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "postgres-protocol" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee9dd5fe15055d2b6806f4736aa0c9637217074e224bbec46d4041b91bb9491" +checksum = "56201207dac53e2f38e848e31b4b91616a6bb6e0c7205b77718994a7f49e70fc" dependencies = [ "base64 0.22.1", "byteorder", "bytes", "fallible-iterator 0.2.0", - "hmac 0.12.1", - "md-5 0.10.6", + "hmac 0.13.0", + "md-5 0.11.0", "memchr", - "rand 0.9.2", - "sha2 0.10.9", + "rand 0.10.0", + "sha2 0.11.0", "stringprep", ] [[package]] name = "postgres-types" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b858f82211e84682fecd373f68e1ceae642d8d751a1ebd13f33de6257b3e20" +checksum = "8dc729a129e682e8d24170cd30ae1aa01b336b096cbb56df6d534ffec133d186" dependencies = [ "bytes", "fallible-iterator 0.2.0", @@ -5374,9 +5255,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", ] @@ -5415,7 +5296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -5439,37 +5320,13 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -5489,7 +5346,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -5503,11 +5360,11 @@ dependencies = [ [[package]] name = "proc_macros" -version = "0.15.5" +version = "0.16.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -5544,7 +5401,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -5559,9 +5416,9 @@ dependencies = [ [[package]] name = "psl" -version = "2.1.190" +version = "2.1.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fed3dc7578357ff12137c75eac73413b6aba9a7204916c19f2a0e9e1e920e0" +checksum = "aeecfb788a39437717879e1055237308caaa520a0041bb9536899dff28bf24a6" dependencies = [ "psl-types", ] @@ -5589,7 +5446,7 @@ checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -5625,9 +5482,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.32.0" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" dependencies = [ "memchr", "serde", @@ -5635,18 +5492,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.0" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e3bf4aa9d243beeb01a7b3bc30b77cfe2c44e24ec02d751a7104a53c2c49a1" +checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" dependencies = [ "memchr", ] [[package]] name = "quick_cache" -version = "0.6.18" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ada44a88ef953a3294f6eb55d2007ba44646015e18613d2f213016379203ef3" +checksum = "5a70b1b8b47e31d0498ecbc3c5470bb931399a8bfed1fd79d1717a61ce7f96e3" dependencies = [ "ahash", "equivalent", @@ -5665,9 +5522,9 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", - "rustls 0.23.36", - "socket2 0.6.2", + "rustc-hash", + "rustls 0.23.37", + "socket2 0.6.3", "thiserror 2.0.18", "tokio", "tracing", @@ -5676,18 +5533,19 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ + "aws-lc-rs", "bytes", "fastbloom", "getrandom 0.3.4", "lru-slab", "rand 0.9.2", "ring", - "rustc-hash 2.1.1", - "rustls 0.23.36", + "rustc-hash", + "rustls 0.23.37", "rustls-pki-types", "rustls-platform-verifier", "slab", @@ -5706,16 +5564,16 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.2", + "socket2 0.6.3", "tracing", "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -5726,6 +5584,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" @@ -5802,6 +5666,17 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +dependencies = [ + "chacha20", + "getrandom 0.4.2", + "rand_core 0.10.0", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -5859,6 +5734,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" + [[package]] name = "rand_hc" version = "0.2.0" @@ -5870,31 +5751,32 @@ dependencies = [ [[package]] name = "rasn" -version = "0.10.6" +version = "0.28.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76def3a472085e40dae01e4eeb106f2ed70f8c7dabe041faed1668a00ee143ef" +checksum = "891614cb7ad883e74f7ccc47472b49d1bb50150e3d1cc62ed78a3f0665d8985e" dependencies = [ - "arrayvec", "bitvec", "bitvec-nom2", "bytes", + "cfg-if", "chrono", "either", - "konst", "nom", "num-bigint", "num-integer", "num-traits", "once_cell", "rasn-derive", + "serde_json", "snafu", + "xml-no-std", ] [[package]] name = "rasn-cms" -version = "0.10.6" +version = "0.28.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d45b1b6c0bfb41d1023246a3853a82d158d7e6690698ad4acac009f2f09380" +checksum = "6b94e9087fd91435e1494e10f28bffe9ea3a38f514711138e686b9ef3dbff26e" dependencies = [ "rasn", "rasn-pkix", @@ -5902,24 +5784,34 @@ dependencies = [ [[package]] name = "rasn-derive" -version = "0.10.6" +version = "0.28.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1fd02e16232e942b5e7ce305b447c550d09a9146255a3e8a2cf62a0e2ac2d" +checksum = "68ff97b92a60f72686b2e9bcb94803c511554391972f70bc7efa7e0674971fbb" +dependencies = [ + "proc-macro2", + "rasn-derive-impl", + "syn 2.0.117", +] + +[[package]] +name = "rasn-derive-impl" +version = "0.28.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6ac4350890433832fe54b49f634b10be1a57fcdb53f0a6dc4e397f413b55a1" dependencies = [ "either", - "itertools 0.10.5", + "itertools 0.13.0", "proc-macro2", "quote", - "rayon", - "syn 1.0.109", + "syn 2.0.117", "uuid", ] [[package]] name = "rasn-pkix" -version = "0.10.6" +version = "0.28.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c825c4183e8f4db9bd772206d7d0fa10f3df35b6ed5bcb8f6cb50fd1166f8e9" +checksum = "0d605209c02f614485e3b3d7048045a92b8dbfdafb175a2dc085332b0d0b5a5b" dependencies = [ "rasn", ] @@ -5944,18 +5836,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" -dependencies = [ - "pem", - "ring", - "time", - "yasna", -] - [[package]] name = "rcgen" version = "0.14.7" @@ -5972,9 +5852,9 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1856d72dbbbea0d2a5b2eaf6af7fb3847ef2746e883b11781446a51dbc85c0" +checksum = "d7956f9ac12b5712e50372d9749a3102f4810a8d42481c5eae3748d36d585bcf" dependencies = [ "futures-channel", "futures-util", @@ -6003,15 +5883,16 @@ dependencies = [ [[package]] name = "redis" -version = "0.32.7" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "014cc767fefab6a3e798ca45112bccad9c6e0e218fbd49720042716c73cfef44" +checksum = "d76e41a79ae5cbb41257d84cf4cf0db0bb5a95b11bf05c62c351de4fe748620d" dependencies = [ + "arcstr", + "async-lock", "bytes", "cfg-if", "combine", "crc16", - "futures-sink", "futures-util", "itoa", "log", @@ -6019,16 +5900,16 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rand 0.9.2", - "rustls 0.23.36", - "rustls-native-certs 0.8.3", + "rustls 0.23.37", + "rustls-native-certs", "ryu", "sha1_smol", - "socket2 0.6.2", + "socket2 0.6.3", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-util", "url", - "webpki-roots 1.0.6", + "xxhash-rust", ] [[package]] @@ -6068,7 +5949,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -6096,9 +5977,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "registry" @@ -6137,27 +6018,26 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", - "hyper 1.8.1", - "hyper-rustls 0.27.7", + "hyper", + "hyper-rustls", "hyper-util", "js-sys", "log", - "mime_guess", "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.36", + "rustls 0.23.37", + "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-util", "tower 0.5.3", "tower-http", @@ -6165,7 +6045,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", + "wasm-streams 0.4.2", "web-sys", "webpki-roots 1.0.6", ] @@ -6179,29 +6059,36 @@ dependencies = [ "base64 0.22.1", "bytes", "futures-core", + "futures-util", "h2", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", - "hyper 1.8.1", - "hyper-rustls 0.27.7", - "hyper-tls", + "hyper", + "hyper-rustls", "hyper-util", "js-sys", "log", - "native-tls", + "mime_guess", "percent-encoding", "pin-project-lite", + "quinn", + "rustls 0.23.37", "rustls-pki-types", + "rustls-platform-verifier", + "serde", + "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-native-tls", + "tokio-rustls", + "tokio-util", "tower 0.5.3", "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams 0.5.0", "web-sys", ] @@ -6231,7 +6118,7 @@ dependencies = [ "cfg-if", "getrandom 0.2.17", "libc", - "untrusted", + "untrusted 0.9.0", "windows-sys 0.52.0", ] @@ -6263,7 +6150,7 @@ dependencies = [ "bytecheck", "bytes", "hashbrown 0.16.1", - "indexmap 2.13.0", + "indexmap 2.13.1", "munge", "ptr_meta", "rancor", @@ -6281,7 +6168,7 @@ checksum = "8100bb34c0a1d0f907143db3149e6b4eea3c33b9ee8b189720168e818303986f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -6312,9 +6199,9 @@ dependencies = [ [[package]] name = "ron" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32" +checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc" dependencies = [ "bitflags", "once_cell", @@ -6330,7 +6217,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" dependencies = [ - "const-oid", + "const-oid 0.9.6", "digest 0.10.7", "num-bigint-dig", "num-integer", @@ -6345,16 +6232,26 @@ dependencies = [ ] [[package]] -name = "rtrb" -version = "0.3.2" +name = "rsqlite-vfs" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8388ea1a9e0ea807e442e8263a699e7edcb320ecbcd21b4fa8ff859acce3ba" +checksum = "a8a1f2315036ef6b1fbacd1972e8ee7688030b0a2121edfc2a6550febd41574d" +dependencies = [ + "hashbrown 0.16.1", + "thiserror 2.0.18", +] + +[[package]] +name = "rtrb" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7204ed6420f698836b76d4d5c2ec5dec7585fd5c3a788fd1cde855d1de598239" [[package]] name = "rusqlite" -version = "0.37.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" +checksum = "a0d2b0146dd9661bf67bb107c0bb2a55064d556eeb3fc314151b957f313bcd4e" dependencies = [ "bitflags", "fallible-iterator 0.3.0", @@ -6362,6 +6259,7 @@ dependencies = [ "hashlink", "libsqlite3-sys", "smallvec", + "sqlite-wasm-rs", ] [[package]] @@ -6376,9 +6274,9 @@ dependencies = [ [[package]] name = "rust-s3" -version = "0.35.1" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3df3f353b1f4209dcf437d777cda90279c397ab15a0cd6fd06bd32c88591533" +checksum = "4af74047374528b627109d579ce86b23ccf6ffba7ff363c807126c1aff69e1bb" dependencies = [ "async-trait", "aws-creds", @@ -6386,27 +6284,24 @@ dependencies = [ "base64 0.22.1", "bytes", "cfg-if", - "futures", + "futures-util", "hex", "hmac 0.12.1", - "http 0.2.12", - "hyper 0.14.32", - "hyper-rustls 0.24.2", + "http 1.4.0", "log", "maybe-async", - "md5 0.7.0", + "md5", "percent-encoding", - "quick-xml 0.32.0", - "rustls 0.21.12", - "rustls-native-certs 0.6.3", + "quick-xml 0.38.4", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", "sha2 0.10.9", - "thiserror 1.0.69", + "sysinfo", + "thiserror 2.0.18", "time", "tokio", - "tokio-rustls 0.24.1", "tokio-stream", "url", ] @@ -6421,23 +6316,11 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "rustc-demangle" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" - [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" [[package]] name = "rustc_version" @@ -6459,9 +6342,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags", "errno", @@ -6476,7 +6359,6 @@ version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ - "log", "ring", "rustls-webpki 0.101.7", "sct", @@ -6484,63 +6366,30 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.36" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ + "aws-lc-rs", "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.9", + "rustls-webpki 0.103.10", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe 0.1.6", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework 2.11.1", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe 0.1.6", - "rustls-pemfile 2.2.0", - "rustls-pki-types", - "schannel", - "security-framework 2.11.1", -] - [[package]] name = "rustls-native-certs" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe 0.2.1", + "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.6.0", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", + "security-framework", ] [[package]] @@ -6568,16 +6417,16 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" dependencies = [ - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "jni", "log", "once_cell", - "rustls 0.23.36", - "rustls-native-certs 0.8.3", + "rustls 0.23.37", + "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.9", - "security-framework 3.6.0", + "rustls-webpki 0.103.10", + "security-framework", "security-framework-sys", "webpki-root-certs", "windows-sys 0.61.2", @@ -6596,28 +6445,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", - "untrusted", + "untrusted 0.9.0", ] [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.103.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" +checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", - "untrusted", + "untrusted 0.9.0", ] [[package]] @@ -6667,9 +6507,9 @@ dependencies = [ [[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", ] @@ -6718,7 +6558,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -6746,7 +6586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", - "untrusted", + "untrusted 0.9.0", ] [[package]] @@ -6781,25 +6621,12 @@ dependencies = [ [[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 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38" -dependencies = [ - "bitflags", - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", @@ -6807,9 +6634,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.16.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321c8673b092a9a42605034a9879d73cb79101ed5fd117bc9a597b89b4e9e61a" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -6817,9 +6644,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "sequoia-openpgp" @@ -6851,7 +6678,7 @@ dependencies = [ "ed25519", "ed25519-dalek", "getrandom 0.2.17", - "hkdf", + "hkdf 0.12.4", "idea", "idna", "lalrpop", @@ -6917,7 +6744,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -6928,7 +6755,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -6937,7 +6764,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.13.1", "itoa", "memchr", "serde", @@ -6945,15 +6772,6 @@ dependencies = [ "zmij", ] -[[package]] -name = "serde_nanos" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93142f0367a4cc53ae0fead1bcda39e85beccfad3dcd717656cacab94b12985" -dependencies = [ - "serde", -] - [[package]] name = "serde_qs" version = "0.8.5" @@ -6973,7 +6791,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -6990,15 +6808,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.16.1" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" +checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.13.0", + "indexmap 2.13.1", "schemars 0.9.0", "schemars 1.2.1", "serde_core", @@ -7009,14 +6827,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.16.1" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" +checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" dependencies = [ - "darling 0.21.3", + "darling 0.23.0", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -7025,7 +6843,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.13.1", "itoa", "ryu", "serde", @@ -7034,9 +6852,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555" +checksum = "911bd979bf1070a3f3aa7b691a3b3e9968f339ceeec89e08c280a8a22207a32f" dependencies = [ "futures-executor", "futures-util", @@ -7049,18 +6867,18 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83" +checksum = "0a7d91949b85b0d2fb687445e448b40d322b6b3e4af6b44a29b21d9a5f33e6d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] name = "services" -version = "0.15.5" +version = "0.16.0" dependencies = [ "aes-gcm", "aes-gcm-siv", @@ -7073,18 +6891,18 @@ dependencies = [ "dns-update", "email", "groupware", - "hkdf", + "hkdf 0.13.0", "jmap_proto", "mail-builder", "mail-parser", "memory-stats", "p256", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "rsa", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.11.0", "smtp", "smtp-proto", "spam-filter", @@ -7103,7 +6921,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -7115,10 +6933,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.2", +] + [[package]] name = "sha1_smol" version = "1.0.1" @@ -7131,7 +6960,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f606421e4a6012877e893c399822a4ed4b089164c5969424e1b9d1e66e6964b" dependencies = [ - "const-oid", + "const-oid 0.9.6", "digest 0.10.7", "generic-array 1.3.5", ] @@ -7144,7 +6973,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -7156,10 +6985,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.2", +] + [[package]] name = "sha2-const-stable" version = "0.1.0" @@ -7187,9 +7027,9 @@ dependencies = [ [[package]] name = "shellexpand" -version = "3.1.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" +checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8" dependencies = [ "dirs", ] @@ -7226,18 +7066,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signatory" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e303f8205714074f6068773f0e29527e0453937fe837c9717d066635b65f31" -dependencies = [ - "pkcs8", - "rand_core 0.6.4", - "signature", - "zeroize", -] - [[package]] name = "signature" version = "2.2.0" @@ -7250,9 +7078,9 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "simdutf8" @@ -7292,9 +7120,10 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "smtp" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", + "base64 0.22.1", "blake3", "chrono", "common", @@ -7304,14 +7133,13 @@ dependencies = [ "form_urlencoded", "hashify", "http-body-util", - "hyper 1.8.1", + "hyper", "hyper-util", "lru-cache", "mail-auth", "mail-builder", "mail-parser", - "mail-send", - "md5 0.8.0", + "md5", "nlp", "num_cpus", "parking_lot", @@ -7319,33 +7147,32 @@ dependencies = [ "rayon", "regex", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "rkyv", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", - "sha1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2 0.11.0", "sieve-rs", "smtp-proto", "spam-filter", "store", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", "types", "utils", - "webpki-roots 1.0.6", "x509-parser", ] [[package]] name = "smtp-proto" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d55cc1c74d3b758d7dd1fa4dc4cf694cad2732cac14f304228477c2b0ce6233a" +checksum = "97c9f5dd7ec5cc6d743f33fcb96de4eb91bb1cc51c5e0ba40cb285a9012043da" dependencies = [ "rkyv", "serde", @@ -7353,25 +7180,23 @@ dependencies = [ [[package]] name = "snafu" -version = "0.7.5" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2" dependencies = [ - "backtrace", - "doc-comment", "snafu-derive", ] [[package]] name = "snafu-derive" -version = "0.7.5" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] @@ -7386,36 +7211,35 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "spam-filter" -version = "0.15.5" +version = "0.16.0" dependencies = [ "common", "compact_str", "decancer", - "hyper 1.8.1", + "hyper", "idna", "infer 0.19.0", "mail-auth", "mail-builder", "mail-parser", - "mail-send", "nlp", "psl", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "rkyv", "serde", - "sha1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2 0.11.0", "smtp-proto", "store", "tokio", @@ -7452,6 +7276,18 @@ dependencies = [ "der", ] +[[package]] +name = "sqlite-wasm-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4206ed3a67690b9c29b77d728f6acc3ce78f16bf846d83c94f76400320181b" +dependencies = [ + "cc", + "js-sys", + "rsqlite-vfs", + "wasm-bindgen", +] + [[package]] name = "stabby" version = "72.1.1" @@ -7495,7 +7331,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stalwart" -version = "0.15.5" +version = "0.16.0" dependencies = [ "common", "coordinator", @@ -7503,7 +7339,7 @@ dependencies = [ "directory", "email", "groupware", - "http 0.15.5", + "http 0.16.0", "imap", "jemallocator", "jmap", @@ -7528,7 +7364,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "arc-swap", @@ -7560,7 +7396,7 @@ dependencies = [ "redis", "regex", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "ring", "rkyv", "roaring", @@ -7568,13 +7404,13 @@ dependencies = [ "rusqlite", "rust-s3", "rustls 0.21.12", - "rustls 0.23.36", + "rustls 0.23.37", "rustls-pki-types", "serde", "serde_json", "tokio", "tokio-postgres", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", "types", "utils", @@ -7629,9 +7465,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.115" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -7655,7 +7491,21 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", +] + +[[package]] +name = "sysinfo" +version = "0.37.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f" +dependencies = [ + "libc", + "memchr", + "ntapi", + "objc2-core-foundation", + "objc2-io-kit", + "windows", ] [[package]] @@ -7670,19 +7520,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "tempfile" -version = "3.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1" -dependencies = [ - "fastrand 2.3.0", - "getrandom 0.4.1", - "once_cell", - "rustix", - "windows-sys 0.61.2", -] - [[package]] name = "term" version = "1.2.1" @@ -7703,7 +7540,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "async-trait", @@ -7726,10 +7563,10 @@ dependencies = [ "form_urlencoded", "futures", "groupware", - "http 0.15.5", + "http 0.16.0", "http-body-util", "http_proto", - "hyper 1.8.1", + "hyper", "hyper-util", "imap", "imap_proto", @@ -7741,20 +7578,19 @@ dependencies = [ "mail-auth", "mail-builder", "mail-parser", - "mail-send", "managesieve", "migration", "nlp", "num_cpus", "pop3", - "quick-xml 0.39.0", + "quick-xml 0.39.2", "rayon", "registry", - "reqwest 0.12.28", + "reqwest 0.13.2", "ring", "rkyv", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -7766,7 +7602,7 @@ dependencies = [ "spam-filter", "store", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", "types", "utils", @@ -7799,7 +7635,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -7810,7 +7646,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -7865,9 +7701,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", @@ -7875,9 +7711,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" dependencies = [ "tinyvec_macros", ] @@ -7898,7 +7734,7 @@ dependencies = [ "pin-project-lite", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", ] [[package]] @@ -7914,9 +7750,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.49.0" +version = "1.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd" dependencies = [ "bytes", "libc", @@ -7924,37 +7760,27 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.2", + "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", - "syn 2.0.115", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", + "syn 2.0.117", ] [[package]] name = "tokio-postgres" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcea47c8f71744367793f16c2db1f11cb859d28f436bdb4ca9193eb1f787ee42" +checksum = "4dd8df5ef180f6364759a6f00f7aadda4fbbac86cdee37480826a6ff9f3574ce" dependencies = [ "async-trait", "byteorder", @@ -7969,30 +7795,20 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "rand 0.9.2", - "socket2 0.6.2", + "rand 0.10.0", + "socket2 0.6.3", "tokio", "tokio-util", "whoami", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.36", + "rustls 0.23.37", "tokio", ] @@ -8009,18 +7825,18 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" +checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c" dependencies = [ "futures-util", "log", - "rustls 0.23.36", + "rustls 0.23.37", + "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tungstenite", - "webpki-roots 0.26.11", ] [[package]] @@ -8043,6 +7859,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f591660438b3038dd04d16c938271c79e7e06260ad2ea2885a4861bfb238605d" dependencies = [ + "aws-lc-rs", "base64 0.22.1", "bytes", "futures-core", @@ -8050,30 +7867,29 @@ dependencies = [ "http 1.4.0", "httparse", "rand 0.8.5", - "ring", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-util", "webpki-roots 0.26.11", ] [[package]] name = "toml_datetime" -version = "0.7.5+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.23.10+spec-1.0.0" +version = "0.25.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.13.1", "toml_datetime", "toml_parser", "winnow", @@ -8081,9 +7897,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.8+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0742ff5ff03ea7e67c8ae6c93cac239e0d9784833362da3f9a9c1da8dfefcbdc" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ "winnow", ] @@ -8098,35 +7914,35 @@ dependencies = [ "base64 0.22.1", "bytes", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", - "hyper 1.8.1", + "hyper", "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", "prost", - "rustls-pemfile 2.2.0", + "rustls-native-certs", + "rustls-pemfile", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-stream", "tower 0.4.13", "tower-layer", "tower-service", "tracing", - "webpki-roots 0.26.11", ] [[package]] name = "totp-rs" -version = "5.7.0" +version = "5.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f124352108f58ef88299e909f6e9470f1cdc8d2a1397963901b4a6366206bf72" +checksum = "a2b36a9dd327e9f401320a2cb4572cc76ff43742bcfc3291f871691050f140ba" dependencies = [ "base32", "constant_time_eq 0.3.1", "hmac 0.12.1", - "sha1", + "sha1 0.10.6", "sha2 0.10.9", "url", "urlencoding", @@ -8179,7 +7995,7 @@ dependencies = [ "futures-core", "futures-util", "http 1.4.0", - "http-body 1.0.1", + "http-body", "http-body-util", "iri-string", "pin-project-lite", @@ -8222,7 +8038,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -8258,9 +8074,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", @@ -8279,7 +8095,7 @@ dependencies = [ [[package]] name = "trc" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "base64 0.22.1", @@ -8289,7 +8105,7 @@ dependencies = [ "mail-auth", "mail-parser", "parking_lot", - "reqwest 0.12.28", + "reqwest 0.13.2", "rkyv", "rtrb", "serde", @@ -8309,21 +8125,11 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580" -[[package]] -name = "tryhard" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe58ebd5edd976e0fe0f8a14d2a04b7c81ef153ea9a54eebc42e67c2c23b4e5" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tungstenite" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" +checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8" dependencies = [ "bytes", "data-encoding", @@ -8331,11 +8137,10 @@ dependencies = [ "httparse", "log", "rand 0.9.2", - "rustls 0.23.36", + "rustls 0.23.37", "rustls-pki-types", - "sha1", + "sha1 0.10.6", "thiserror 2.0.18", - "utf-8", ] [[package]] @@ -8373,7 +8178,7 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "types" -version = "0.15.5" +version = "0.16.0" dependencies = [ "blake3", "compact_str", @@ -8385,21 +8190,6 @@ dependencies = [ "utils", ] -[[package]] -name = "typewit" -version = "1.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c1ae7cc0fdb8b842d65d127cb981574b0d2b249b74d1c7a2986863dc134f71" -dependencies = [ - "typewit_proc_macros", -] - -[[package]] -name = "typewit_proc_macros" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" - [[package]] name = "ucd-trie" version = "0.1.7" @@ -8440,9 +8230,9 @@ checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f" [[package]] name = "unicode-ident" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-normalization" @@ -8487,7 +8277,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "subtle", ] @@ -8497,6 +8287,12 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "untrusted" version = "0.9.0" @@ -8517,7 +8313,7 @@ checksum = "3b5bb2756c16fb66f80cfbf5fb0e0c09a7001e739f453c9ec241b9c8b1556fda" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -8539,12 +8335,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -8553,7 +8343,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utils" -version = "0.15.5" +version = "0.16.0" dependencies = [ "ahash", "arcstr", @@ -8567,7 +8357,6 @@ dependencies = [ "futures", "http-body-util", "mail-auth", - "mail-send", "nohash-hasher", "parking_lot", "pem", @@ -8575,32 +8364,32 @@ dependencies = [ "psl", "quick_cache", "rand 0.9.2", - "rcgen 0.14.7", + "rcgen", "regex", - "reqwest 0.12.28", + "reqwest 0.13.2", "ring", "rkyv", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "rustls-pki-types", + "rustls-platform-verifier", "serde", "serde_json", "smtp-proto", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "trc", - "webpki-roots 1.0.6", "x509-parser", "xxhash-rust", ] [[package]] name = "uuid" -version = "1.21.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb" +checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" dependencies = [ - "getrandom 0.4.1", + "getrandom 0.4.2", "js-sys", "serde_core", "sha1_smol", @@ -8627,7 +8416,7 @@ checksum = "8c44ce98e7227a04eeb4cf9c784109a5c9710e54849ceb4f09f8597247897f1e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", "unzip-n", ] @@ -8736,9 +8525,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.108" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" dependencies = [ "cfg-if", "once_cell", @@ -8749,23 +8538,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.58" +version = "0.4.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" +checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e" dependencies = [ - "cfg-if", - "futures-util", "js-sys", - "once_cell", "wasm-bindgen", - "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.108" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8773,22 +8558,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.108" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.108" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" dependencies = [ "unicode-ident", ] @@ -8810,7 +8595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.0", + "indexmap 2.13.1", "wasm-encoder", "wasmparser", ] @@ -8828,6 +8613,19 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasm-streams" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmparser" version = "0.244.0" @@ -8836,15 +8634,15 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags", "hashbrown 0.15.5", - "indexmap 2.13.0", + "indexmap 2.13.1", "semver", ] [[package]] name = "web-sys" -version = "0.3.85" +version = "0.3.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" +checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a" dependencies = [ "js-sys", "wasm-bindgen", @@ -8946,6 +8744,41 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.61.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link 0.1.3", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + [[package]] name = "windows-core" version = "0.62.2" @@ -8954,9 +8787,20 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link", - "windows-result", - "windows-strings", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", + "windows-threading", ] [[package]] @@ -8967,7 +8811,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[package]] @@ -8978,22 +8822,67 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] +[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows-result" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", ] [[package]] @@ -9002,7 +8891,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -9014,15 +8903,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -9047,7 +8927,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -9065,21 +8945,6 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - [[package]] name = "windows-targets" version = "0.52.6" @@ -9102,7 +8967,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link", + "windows-link 0.2.1", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -9113,18 +8978,21 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -9143,12 +9011,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -9167,12 +9029,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -9203,12 +9059,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -9227,12 +9077,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -9251,12 +9095,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -9275,12 +9113,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -9295,23 +9127,13 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.14" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wit-bindgen" version = "0.51.0" @@ -9328,7 +9150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" dependencies = [ "anyhow", - "heck 0.5.0", + "heck", "wit-parser", ] @@ -9339,10 +9161,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", - "heck 0.5.0", - "indexmap 2.13.0", + "heck", + "indexmap 2.13.1", "prettyplease", - "syn 2.0.115", + "syn 2.0.117", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -9358,7 +9180,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -9371,7 +9193,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags", - "indexmap 2.13.0", + "indexmap 2.13.1", "log", "serde", "serde_derive", @@ -9390,7 +9212,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.0", + "indexmap 2.13.1", "log", "semver", "serde", @@ -9402,9 +9224,9 @@ dependencies = [ [[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 = "wyz" @@ -9445,10 +9267,25 @@ dependencies = [ ] [[package]] -name = "xml-rs" -version = "0.8.28" +name = "xml" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" +checksum = "b8aa498d22c9bbaf482329839bc5620c46be275a19a812e9a22a2b07529a642a" + +[[package]] +name = "xml-no-std" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd223bc94c615fc02bf2f4bbc22a4a9bfe489c2add3ec10b1038df3aca44cac7" + +[[package]] +name = "xml-rs" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a56132a0d6ecbe77352edc10232f788fc4ceefefff4cab784a98e0e16b6b51" +dependencies = [ + "xml", +] [[package]] name = "xxhash-rust" @@ -9467,9 +9304,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", @@ -9478,21 +9315,21 @@ 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", - "syn 2.0.115", + "syn 2.0.117", "synstructure", ] [[package]] name = "zenoh" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9ff8cb89f5267b8486a69466bc42f240f1ee2d5089e72395a23094e7b74f21" +checksum = "7717b0e6a0a3463680b70e567496a7e26f10dbc2584fd79af922a530f596fcf0" dependencies = [ "ahash", "arc-swap", @@ -9511,7 +9348,6 @@ dependencies = [ "petgraph 0.8.3", "phf 0.13.1", "rand 0.8.5", - "ref-cast", "rustc_version", "serde", "serde_json", @@ -9542,18 +9378,18 @@ dependencies = [ [[package]] name = "zenoh-buffers" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9216c3d6c84b56f3e3be634e52365022038e1ac1b9f662f10d425cbf6c0fa8" +checksum = "8bcbe41150794b2c49f6aa107e56a9a995cad538ea6a9cd20f1e127181330c55" dependencies = [ "zenoh-collections", ] [[package]] name = "zenoh-codec" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14bc6747664aa9ecf17becd6e9a29282e535a350cd7c6bd8de7bf2dc662fb93d" +checksum = "6c92a5f6928fb4d6d33ef34c1818266720885409521f9f3016d0e57f90abe9d1" dependencies = [ "tracing", "uhlc", @@ -9563,18 +9399,18 @@ dependencies = [ [[package]] name = "zenoh-collections" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d642ecfe0d85f0cd846be9bc92805d926c092a6e6c7a575b6346752f8c3ae16" +checksum = "fb87ed45b3cba05fdb53fddc0644ef4eaa1a6ed68e944f7d761b483c4571a0ce" dependencies = [ "ahash", ] [[package]] name = "zenoh-config" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39765a5f9975aba204c99f2f65308db4952dbea8e5ac79c78ac1eaf5711e970a" +checksum = "654d7a535f32d8bf5b1bfd0e21431a495d3ff60cfd2a7bc0f27172fa3caaa88e" dependencies = [ "json5", "nonempty-collections", @@ -9597,9 +9433,9 @@ dependencies = [ [[package]] name = "zenoh-core" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c0c1388dccf287aec4e9d5e638630dc9d536db9f1da3522889b42697723b9b" +checksum = "3f0fccee692fa37f7585f0b2d1b3153203ae6073293bc13fe0d5bc5dd12ca1fd" dependencies = [ "lazy_static", "tokio", @@ -9609,9 +9445,9 @@ dependencies = [ [[package]] name = "zenoh-crypto" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b433e08df3b03f2af2d23bd29a32aa5f5522c52e66d63e3d135bfa66373736dd" +checksum = "ae0e4d9b102043c6229f4a6d4e760ba96b10f02abef3bbd646f0ea431eec76e8" dependencies = [ "aes", "hmac 0.12.1", @@ -9623,9 +9459,9 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a3c47c89cb55ea45a1b3fe7d1fe8682ea93530b1fc5245257812db14b55b3d" +checksum = "5328ae37471ae54300a354107c625a864a8e8cd074ecaf9e6e9286f78d1dd021" dependencies = [ "getrandom 0.2.17", "hashbrown 0.16.1", @@ -9639,9 +9475,9 @@ dependencies = [ [[package]] name = "zenoh-link" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6218cecab58435f31fb8b2e185f74f35af8aedd96e8bdd3557b333206b1acfda" +checksum = "80440bf41c90987e5b1c1b02f42ab475ba616d7115d180c26ef4cdeb3f6afe7a" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -9655,19 +9491,19 @@ dependencies = [ [[package]] name = "zenoh-link-commons" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98adc618f7edb570b9333ce583934a7c63e3a619cb49666515bfc06a000d7b6" +checksum = "c6b104d459fa6e1abec12bce867ac845444b20b4e1a7f8ca8533b4c9edd2b00c" dependencies = [ "async-trait", "base64 0.22.1", "flume", "futures", "quinn", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "rustls-pki-types", - "rustls-webpki 0.103.9", + "rustls-webpki 0.103.10", "secrecy", "serde", "socket2 0.5.10", @@ -9689,16 +9525,16 @@ dependencies = [ [[package]] name = "zenoh-link-quic" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0c25d681db958b7714370d5e1d72a523129633d9262b098e18d44824d39893" +checksum = "69e02852210b8ce8c93008e7e60f806e38eee8e57e0dcb362a9a8547ce308b97" dependencies = [ "async-trait", "base64 0.22.1", "quinn", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", - "rustls-webpki 0.103.9", + "rustls 0.23.37", + "rustls-pemfile", + "rustls-webpki 0.103.10", "secrecy", "time", "tokio", @@ -9715,9 +9551,9 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f23bd5d06a0014ce5a205961d6d47c8e8d792d9fd050ae9d0c9b609a187995" +checksum = "af351f5b66df749677f8fc6e6a1ee4c15f004439791540f38c737e7c5e764be1" dependencies = [ "async-trait", "socket2 0.5.10", @@ -9733,22 +9569,22 @@ dependencies = [ [[package]] name = "zenoh-link-tls" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17544cde682dbcd2a712114786feee14295c28a9f66fc1021637355511e32fa9" +checksum = "f36da0bed1d9a7231fac2bb0d86ee6b08e7239fe42b36d0e877c7c3dd858ec00" dependencies = [ "async-trait", "base64 0.22.1", - "rustls 0.23.36", - "rustls-pemfile 2.2.0", + "rustls 0.23.37", + "rustls-pemfile", "rustls-pki-types", - "rustls-webpki 0.103.9", + "rustls-webpki 0.103.10", "secrecy", "socket2 0.5.10", "time", "tls-listener", "tokio", - "tokio-rustls 0.26.4", + "tokio-rustls", "tokio-util", "tracing", "webpki-roots 1.0.6", @@ -9763,9 +9599,9 @@ dependencies = [ [[package]] name = "zenoh-link-udp" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "587ca1de1caa0b444106d31c26801f4e87b354293d2d37afd8f70d9e793fe35e" +checksum = "30c279cd4144cb2ab14eba32cab956c03869d7e02b088a8a9965c070f6512805" dependencies = [ "async-trait", "libc", @@ -9785,21 +9621,21 @@ dependencies = [ [[package]] name = "zenoh-macros" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b760a458cd906ac888b37fd1abdb21a0f58ecc64cc3882f83a976cb5ca8e0632" +checksum = "21523a418d0c52310ed9f3127099a40244040ea1dc3d420f5b4fa3178e27a8ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", "zenoh-keyexpr", ] [[package]] name = "zenoh-plugin-trait" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7325b773c43a86a94f800cb971ab7e4b7e01ce76819c9c100ea783a47c3a25e4" +checksum = "9f54cb62ce3d7b8c2261f091f7f0ba855780f70690e7e8238e2deb490cdf8260" dependencies = [ "git-version", "libloading", @@ -9815,9 +9651,9 @@ dependencies = [ [[package]] name = "zenoh-protocol" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4d3dad7aeeea780495692b195cd56515569c32b76b9dd077cc408c3ebca03f" +checksum = "8688f5f4748123ac6e5950c51c281ba65ad444f4435624e1f93112d94f4809db" dependencies = [ "const_format", "rand 0.8.5", @@ -9825,23 +9661,24 @@ dependencies = [ "uhlc", "zenoh-buffers", "zenoh-keyexpr", + "zenoh-macros", "zenoh-result", ] [[package]] name = "zenoh-result" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b4dbfea68b947a790d5525bcf061e91e2fdc2798bce619851919b353a8580fa" +checksum = "a1f04e46152cf494d1bc3e35948fed82cf5e57e559e5f2c4ff4223d0984b537d" dependencies = [ "anyhow", ] [[package]] name = "zenoh-runtime" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760a1f7880f98427ad849d600257d1455a18afe981681f362684a3f91042537e" +checksum = "63259ecef5e54b5875ffb4ac4aff6d31680cfac4c78cdc6f9a385f8f28fc5396" dependencies = [ "lazy_static", "ron", @@ -9854,9 +9691,9 @@ dependencies = [ [[package]] name = "zenoh-sync" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f132137bb003f10b7fff086cb18addf8e8273b9c0d2722a53b5074c8a79965" +checksum = "17ba3547e15ebfe1799d84b5e6861502f026b967508601f4f344b1edfc42d946" dependencies = [ "arc-swap", "event-listener 5.4.1", @@ -9869,9 +9706,9 @@ dependencies = [ [[package]] name = "zenoh-task" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b17d10136fdabec7e21a3fcef568c210ee6a2d71cde6adcde99e9236584f3a1" +checksum = "b888098524b4ed57978e899f35d16250cf7805bbcc962312be7e1d5d60c1dcf4" dependencies = [ "futures", "tokio", @@ -9883,15 +9720,15 @@ dependencies = [ [[package]] name = "zenoh-transport" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50739b4c45e0963df8377abddb74701a4b708b178590eae92f27a604e25daf44" +checksum = "a7c32b85396519616c4088ca973fa5ec4f798fdd49aa203b3bb2b60e468cd587" dependencies = [ "async-trait", "crossbeam-utils", "flume", "lazy_static", - "lz4_flex 0.11.5", + "lz4_flex 0.11.6", "rand 0.8.5", "ringbuffer-spsc", "rsa", @@ -9917,9 +9754,9 @@ dependencies = [ [[package]] name = "zenoh-util" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9512987c13925d32d3331507c8807853d5b682ea8da94d0ba6534c7a8ace48aa" +checksum = "1b3ee5dc455e67c571bd0d6177a5da0e744fdd544817799cc7d7d83adea94172" dependencies = [ "async-trait", "const_format", @@ -9944,42 +9781,42 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.39" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.39" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[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", - "syn 2.0.115", + "syn 2.0.117", "synstructure", ] @@ -10000,14 +9837,14 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.115", + "syn 2.0.117", ] [[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", @@ -10016,9 +9853,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", @@ -10027,26 +9864,13 @@ 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 2.0.115", -] - -[[package]] -name = "zip" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b" -dependencies = [ - "arbitrary", - "crc32fast", - "flate2", - "indexmap 2.13.0", - "memchr", + "syn 2.0.117", ] [[package]] @@ -10061,14 +9885,14 @@ dependencies = [ "crc32fast", "deflate64", "flate2", - "getrandom 0.4.1", + "getrandom 0.4.2", "hmac 0.12.1", - "indexmap 2.13.0", + "indexmap 2.13.1", "lzma-rust2", "memchr", "pbkdf2", "ppmd-rust", - "sha1", + "sha1 0.10.6", "time", "typed-path", "zeroize", @@ -10078,9 +9902,9 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7948af682ccbc3342b6e9420e8c51c1fe5d7bf7756002b4a3c6cabfe96a7e3c" +checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" [[package]] name = "zmij" diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index 6e1b75d1..03abb52a 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common" -version = "0.15.5" +version = "0.16.0" edition = "2024" build = "build.rs" @@ -19,7 +19,6 @@ sieve-rs = { version = "0.7", features = ["rkyv", "serde"] } mail-parser = { version = "0.11", features = ["full_encoding"] } mail-builder = { version = "0.4" } mail-auth = { path = "/Users/me/code/mail-auth" } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } smtp-proto = { version = "0.2", features = ["rkyv"] } dns-update = { path = "/Users/me/code/dns-update" } calcard = { version = "0.3", features = ["rkyv"] } @@ -28,15 +27,15 @@ parking_lot = "0.12.1" regex = "1.7.0" proxy-header = { version = "0.1.0", features = ["tokio"] } arc-swap = "1.6.0" -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pemfile = "2.0" rustls-pki-types = { version = "1" } ring = { version = "0.17" } tokio = { version = "1.47", features = ["net", "macros"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } futures = "0.3" -rcgen = "0.12" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2", "stream"]} +rcgen = "0.14" +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2", "stream"]} serde = { version = "1.0", features = ["derive"]} serde_json = "1.0" base64 = "0.22" @@ -46,12 +45,12 @@ chrono = { version = "0.4", features = ["serde"] } hyper = { version = "1.0.1", features = ["server", "http1", "http2"] } opentelemetry = { version = "0.29" } opentelemetry_sdk = { version = "0.29" } -opentelemetry-otlp = { version = "0.29", default-features = false, features = ["reqwest-client", "http-proto", "trace", "metrics", "logs", "internal-logs", "grpc-tonic", "tls-webpki-roots", "reqwest-rustls-webpki-roots"] } +opentelemetry-otlp = { version = "0.29", default-features = false, features = ["reqwest-client", "http-proto", "trace", "metrics", "logs", "internal-logs", "grpc-tonic", "tls-roots", "reqwest-rustls"] } opentelemetry-semantic-conventions = { version = "0.29.0" } prometheus = { version = "0.14", default-features = false } imagesize = "0.14" -sha1 = "0.10" -sha2 = "0.10.6" +sha1 = "0.11" +sha2 = "0.11" md5 = "0.8.0" whatlang = "0.18" idna = "1.0" @@ -79,9 +78,9 @@ lz4_flex = { version = "0.13", features = ["frame"], default-features = false } hickory-proto = "0.25" nohash-hasher = "0.2.0" quick_cache = "0.6.9" -rasn = "0.10" -rasn-cms = "0.10" -rasn-pkix = "0.10" +rasn = "0.28" +rasn-cms = "0.28" +rasn-pkix = "0.28" sequoia-openpgp = { version = "2.0", default-features = false, features = ["crypto-rust", "allow-experimental-crypto", "allow-variable-time-crypto"] } zxcvbn = "3.1.0" pkcs8 = { version = "0.10.2", features = ["alloc", "std"] } diff --git a/crates/common/src/auth/oauth/crypto.rs b/crates/common/src/auth/oauth/crypto.rs index e80a2f0f..e54d5e02 100644 --- a/crates/common/src/auth/oauth/crypto.rs +++ b/crates/common/src/auth/oauth/crypto.rs @@ -4,7 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL */ -use aes_gcm_siv::{AeadInPlace, Aes256GcmSiv, KeyInit, Nonce, aead::Aead}; +use aes_gcm_siv::{AeadInPlace, Aes256GcmSiv, Key, KeyInit, Nonce, aead::Aead}; use store::blake3; pub struct SymmetricEncrypt { @@ -19,11 +19,9 @@ impl SymmetricEncrypt { pub fn new(key: &[u8], context: &str) -> Self { SymmetricEncrypt { - aes: Aes256GcmSiv::new( - &sha1::digest::generic_array::GenericArray::clone_from_slice( - &blake3::derive_key(context, key)[..], - ), - ), + aes: Aes256GcmSiv::new(Key::::from_slice(&blake3::derive_key( + context, key, + ))), } } diff --git a/crates/common/src/config/inner.rs b/crates/common/src/config/inner.rs index c88b2fae..814e40c1 100644 --- a/crates/common/src/config/inner.rs +++ b/crates/common/src/config/inner.rs @@ -22,7 +22,6 @@ use crate::{ use ahash::{AHashMap, AHashSet}; use arc_swap::ArcSwap; use mail_auth::{MX, Parameters, Txt}; -use mail_send::smtp::tls::build_tls_connector; use parking_lot::RwLock; use registry::schema::{prelude::ObjectType, structs}; use std::{ @@ -31,8 +30,10 @@ use std::{ }; use store::{LookupStores, registry::bootstrap::Bootstrap}; use utils::{ + UnwrapFailure, cache::{Cache, CacheWithTtl}, snowflake::SnowflakeIdGenerator, + tls::build_tls_connector, }; impl Data { @@ -85,7 +86,7 @@ impl Data { queue_status: true.into(), applications: Default::default(), logos: Default::default(), - smtp_connectors: TlsConnectors::default(), + smtp_connectors: TlsConnectors::try_new().failed("Failed to build TLS connectors"), asn_geo_data: Default::default(), } } @@ -225,18 +226,18 @@ impl Default for Data { queue_status: true.into(), applications: Default::default(), logos: Default::default(), - smtp_connectors: Default::default(), + smtp_connectors: TlsConnectors::try_new().unwrap(), asn_geo_data: Default::default(), lookup_stores: Default::default(), } } } -impl Default for TlsConnectors { - fn default() -> Self { - TlsConnectors { - pki_verify: build_tls_connector(false), - dummy_verify: build_tls_connector(true), - } +impl TlsConnectors { + fn try_new() -> Result { + Ok(TlsConnectors { + pki_verify: build_tls_connector(false)?, + dummy_verify: build_tls_connector(true)?, + }) } } diff --git a/crates/common/src/config/server/tls.rs b/crates/common/src/config/server/tls.rs index 7c352e41..ec19db3f 100644 --- a/crates/common/src/config/server/tls.rs +++ b/crates/common/src/config/server/tls.rs @@ -189,10 +189,10 @@ pub(crate) fn build_certified_key( pub(crate) fn build_self_signed_cert( domains: impl Into>, ) -> Result { - let cert = generate_simple_self_signed(domains) + let rcgen::CertifiedKey { cert, signing_key } = generate_simple_self_signed(domains) .map_err(|err| format!("Failed to generate self-signed certificate: {err}",))?; build_certified_key( - cert.serialize_pem().unwrap().into_bytes(), - cert.serialize_private_key_pem().into_bytes(), + cert.pem().into_bytes(), + signing_key.serialize_pem().into_bytes(), ) } diff --git a/crates/common/src/config/smtp/queue.rs b/crates/common/src/config/smtp/queue.rs index 8fd039bc..2ba11e5d 100644 --- a/crates/common/src/config/smtp/queue.rs +++ b/crates/common/src/config/smtp/queue.rs @@ -13,8 +13,8 @@ use crate::{ }, }; use ahash::AHashMap; +use directory::Credentials; use mail_auth::IpLookupStrategy; -use mail_send::Credentials; use registry::schema::{ enums::{self, ExpressionConstant, ExpressionVariable, MtaRequiredOrOptional}, prelude::ObjectType, @@ -182,7 +182,7 @@ pub struct RelayConfig { pub address: HostOrIp, IpStr>, pub port: u16, pub protocol: ServerProtocol, - pub auth: Option>, + pub auth: Option, pub tls_implicit: bool, pub tls_allow_invalid_certs: bool, } @@ -396,7 +396,11 @@ impl QueueConfig { auth: route .auth_username .and_then(|user| secret.map(|secret| (user, secret))) - .map(|(user, secret)| Credentials::new(user, secret.into_owned())), + .map(|(user, secret)| Credentials::Basic { + username: user, + secret: secret.into_owned(), + mfa_token: None, + }), tls_implicit: route.implicit_tls, tls_allow_invalid_certs: route.allow_invalid_certs, }), diff --git a/crates/common/src/expr/functions/text.rs b/crates/common/src/expr/functions/text.rs index abf126c5..3b0eb96b 100644 --- a/crates/common/src/expr/functions/text.rs +++ b/crates/common/src/expr/functions/text.rs @@ -7,6 +7,7 @@ use compact_str::{CompactString, ToCompactString, format_compact}; use sha1::Sha1; use sha2::{Sha256, Sha512}; +use utils::HexEncode; use crate::expr::{StringCow, Variable}; @@ -341,17 +342,17 @@ pub(crate) fn fn_hash(v: Vec) -> Variable { "sha1" => { let mut hasher = Sha1::new(); hasher.update(value.as_bytes()); - format_compact!("{:x}", hasher.finalize()).into() + hasher.finalize().hex_encode().to_compact_string().into() } "sha256" => { let mut hasher = Sha256::new(); hasher.update(value.as_bytes()); - format_compact!("{:x}", hasher.finalize()).into() + hasher.finalize().hex_encode().to_compact_string().into() } "sha512" => { let mut hasher = Sha512::new(); hasher.update(value.as_bytes()); - format_compact!("{:x}", hasher.finalize()).into() + hasher.finalize().hex_encode().to_compact_string().into() } _ => Variable::default(), } diff --git a/crates/common/src/manager/defaults.rs b/crates/common/src/manager/defaults.rs index 7e81ed6e..a8a9c057 100644 --- a/crates/common/src/manager/defaults.rs +++ b/crates/common/src/manager/defaults.rs @@ -399,12 +399,12 @@ async fn insert_safe_defaults(bp: &mut Bootstrap) -> trc::Result<()> { } let todo = "review"; - #[cfg(not(feature = "test_mode"))] - if let Some(domain_id) = default_domain_id { + //#[cfg(not(feature = "test_mode"))] + /*if let Some(domain_id) = default_domain_id { let now = store::write::now(); let signature_rsa = DkimSignature::Dkim1RsaSha256(Dkim1Signature { domain_id, - enabled: true, + stage: DkimSignatureStage::Testing, selector: format!("rsa-{now}"), private_key: DkimPrivateKey::Value(SecretTextValue { secret: crate::network::dkim::generate_dkim_private_key( @@ -444,7 +444,7 @@ async fn insert_safe_defaults(bp: &mut Bootstrap) -> trc::Result<()> { .write(RegistryWrite::insert(&signature.into())) .await?; } - } + }*/ } if bp.registry.count_object(ObjectType::SystemSettings).await? == 0 { diff --git a/crates/common/src/network/acme/directory.rs b/crates/common/src/network/acme/directory.rs index 50b0dd55..1c6c4ae3 100644 --- a/crates/common/src/network/acme/directory.rs +++ b/crates/common/src/network/acme/directory.rs @@ -18,7 +18,7 @@ use crate::network::acme::{ }; use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; -use rcgen::{Certificate, CustomExtension, PKCS_ECDSA_P256_SHA256}; +use rcgen::{CustomExtension, KeyPair, PKCS_ECDSA_P256_SHA256}; use registry::schema::structs::AcmeProvider; use reqwest::Method; use ring::rand::SystemRandom; @@ -158,11 +158,15 @@ impl AcmeRequestBuilder { let challenge_token = challenge.token.as_deref().ok_or_else(|| { AcmeError::Invalid("Missing tls-alpn-01 challenge token in response".to_string()) })?; - let mut params = rcgen::CertificateParams::new(vec![domain]); + let mut params = rcgen::CertificateParams::new(vec![domain]).map_err(|err| { + AcmeError::Crypto(format!("Failed to create certificate params: {}", err)) + })?; let key_auth = key_authorization_sha256(&self.key_pair, challenge_token)?; - params.alg = &PKCS_ECDSA_P256_SHA256; params.custom_extensions = vec![CustomExtension::new_acme_identifier(key_auth.as_ref())]; - let cert = Certificate::from_params(params).map_err(|err| { + let key_pair = KeyPair::generate_for(&PKCS_ECDSA_P256_SHA256).map_err(|err| { + AcmeError::Crypto(format!("Failed to generate key pair: {}", err)) + })?; + let cert = params.self_signed(&key_pair).map_err(|err| { AcmeError::Crypto(format!( "Failed to generate TLS-ALPN-01 certificate: {}", err @@ -170,13 +174,8 @@ impl AcmeRequestBuilder { })?; Archiver::new(SerializedCert { - certificate: cert.serialize_der().map_err(|err| { - AcmeError::Crypto(format!( - "Failed to serialize TLS-ALPN-01 certificate: {}", - err - )) - })?, - private_key: cert.serialize_private_key_der(), + certificate: cert.der().to_vec(), + private_key: key_pair.serialize_der(), }) .untrusted() .serialize() diff --git a/crates/common/src/network/acme/order.rs b/crates/common/src/network/acme/order.rs index adb68243..5195786c 100644 --- a/crates/common/src/network/acme/order.rs +++ b/crates/common/src/network/acme/order.rs @@ -15,7 +15,7 @@ use crate::{KV_ACME, Server}; use chrono::{TimeZone, Utc}; use dns_update::DnsRecord; use futures::future::try_join_all; -use rcgen::{CertificateParams, DistinguishedName, PKCS_ECDSA_P256_SHA256}; +use rcgen::{CertificateParams, DistinguishedName, KeyPair, PKCS_ECDSA_P256_SHA256}; use std::collections::BTreeSet; use std::net::{Ipv4Addr, Ipv6Addr}; use std::time::Duration; @@ -82,11 +82,11 @@ impl AcmeRequestBuilder { .collect() }; - let mut params = CertificateParams::new(domains.clone()); + let mut params = CertificateParams::new(domains.clone()) + .map_err(|err| AcmeError::Crypto(format!("Failed to create certificate params: {}", err)))?; params.distinguished_name = DistinguishedName::new(); - params.alg = &PKCS_ECDSA_P256_SHA256; - let cert = rcgen::Certificate::from_params(params) - .map_err(|err| AcmeError::Crypto(format!("Failed to generate certificate: {}", err)))?; + let key_pair = KeyPair::generate_for(&PKCS_ECDSA_P256_SHA256) + .map_err(|err| AcmeError::Crypto(format!("Failed to generate key pair: {}", err)))?; let response = self.new_order(domains.clone()).await?; let order_url = response.location; let mut order = response.body; @@ -145,9 +145,10 @@ impl AcmeRequestBuilder { Hostname = domains.as_slice(), ); - let csr = cert.serialize_request_der().map_err(|err| { + let csr = params.serialize_request(&key_pair).map_err(|err| { AcmeError::Crypto(format!("Failed to serialize CSR: {}", err)) })?; + let csr = csr.der().to_vec(); order = self.finalize(order.finalize, csr).await?.body; } OrderStatus::Valid { certificate } => { @@ -161,7 +162,7 @@ impl AcmeRequestBuilder { return Ok(PemCert { certificate, - private_key: cert.serialize_private_key_pem(), + private_key: key_pair.serialize_pem(), }); } OrderStatus::Invalid => { diff --git a/crates/common/src/scripts/functions/misc.rs b/crates/common/src/scripts/functions/misc.rs index 8d5d1c08..3fa6dc3d 100644 --- a/crates/common/src/scripts/functions/misc.rs +++ b/crates/common/src/scripts/functions/misc.rs @@ -10,6 +10,7 @@ use mail_auth::common::resolver::ToReverseName; use sha1::Sha1; use sha2::{Sha256, Sha512}; use sieve::{Context, runtime::Variable}; +use utils::HexEncode; use super::ApplyString; @@ -78,17 +79,17 @@ pub fn fn_hash<'x>(_: &'x Context<'x>, v: Vec) -> Variable { "sha1" => { let mut hasher = Sha1::new(); hasher.update(value.as_bytes()); - format!("{:x}", hasher.finalize()).into() + hasher.finalize().hex_encode().into() } "sha256" => { let mut hasher = Sha256::new(); hasher.update(value.as_bytes()); - format!("{:x}", hasher.finalize()).into() + hasher.finalize().hex_encode().into() } "sha512" => { let mut hasher = Sha512::new(); hasher.update(value.as_bytes()); - format!("{:x}", hasher.finalize()).into() + hasher.finalize().hex_encode().into() } _ => Variable::default(), }) diff --git a/crates/coordinator/Cargo.toml b/crates/coordinator/Cargo.toml index 56b5323a..6cab04de 100644 --- a/crates/coordinator/Cargo.toml +++ b/crates/coordinator/Cargo.toml @@ -10,10 +10,10 @@ registry = { path = "../registry" } trc = { path = "../trc" } futures = { version = "0.3", optional = true } tokio = { version = "1.47", features = ["sync", "fs", "io-util"] } -async-nats = { version = "0.44", default-features = false, features = ["server_2_10", "server_2_11", "ring"], optional = true } +async-nats = { version = "0.47", default-features = false, features = ["server_2_10", "server_2_11", "aws-lc-rs"], optional = true } zenoh = { version = "1.3.4", default-features = false, features = ["auth_pubkey", "transport_multilink", "transport_compression", "transport_quic", "transport_tcp", "transport_tls", "transport_udp"], optional = true } -rdkafka = { version = "0.38", features = ["cmake-build"], optional = true } -redis = { version = "0.32", features = [ "tokio-comp", "tokio-rustls-comp", "tls-rustls-insecure", "tls-rustls-webpki-roots", "cluster-async"], optional = true } +rdkafka = { version = "0.39", features = ["cmake-build"], optional = true } +redis = { version = "1.1", features = [ "tokio-comp", "tokio-rustls-comp", "tls-rustls-insecure", "tls-rustls", "cluster-async"], optional = true } [features] nats = ["async-nats"] diff --git a/crates/coordinator/src/backend/nats/mod.rs b/crates/coordinator/src/backend/nats/mod.rs index 0f18427f..ee01fd53 100644 --- a/crates/coordinator/src/backend/nats/mod.rs +++ b/crates/coordinator/src/backend/nats/mod.rs @@ -44,9 +44,7 @@ impl NatsPubSub { opts = opts.user_and_password(user.to_string(), pass.to_string()); } else if let Some(credentials) = config.credentials.secret().await?.map(|v| v.into_owned()) { - opts = opts - .credentials(&credentials) - .map_err(|err| format!("Failed to parse Nats credentials: {}", err))?; + opts = opts.token(credentials); } async_nats::connect_with_options(config.addresses.into_inner(), opts) diff --git a/crates/dav-proto/Cargo.toml b/crates/dav-proto/Cargo.toml index 07911a67..7120f33e 100644 --- a/crates/dav-proto/Cargo.toml +++ b/crates/dav-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dav-proto" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/dav-proto/src/parser/mod.rs b/crates/dav-proto/src/parser/mod.rs index 49b527b9..150d4131 100644 --- a/crates/dav-proto/src/parser/mod.rs +++ b/crates/dav-proto/src/parser/mod.rs @@ -166,10 +166,11 @@ impl PartialEq for Token<'_> { } (Self::Bytes(l0), Self::Bytes(r0)) => l0 == r0, (Self::Text(l0), Self::Text(r0)) => l0 == r0, - (Self::UnknownElement(l0), Self::UnknownElement(r0)) => l0 - .element - .as_ref() - .eq_ignore_ascii_case(r0.element.as_ref()), + (Self::UnknownElement(l0), Self::UnknownElement(r0)) => { + let l0: &[u8] = l0.element.as_ref(); + let r0: &[u8] = r0.element.as_ref(); + l0.eq_ignore_ascii_case(r0) + } _ => core::mem::discriminant(self) == core::mem::discriminant(other), } } diff --git a/crates/dav-proto/src/parser/tokenizer.rs b/crates/dav-proto/src/parser/tokenizer.rs index 156669b2..9ba9697a 100644 --- a/crates/dav-proto/src/parser/tokenizer.rs +++ b/crates/dav-proto/src/parser/tokenizer.rs @@ -51,7 +51,8 @@ impl<'x> Tokenizer<'x> { .map_err(|err| Error::Xml(Box::new(err.into()))); } Event::GeneralRef(entity) => { - hashify::fnc_map!(entity.as_ref(), + let entity_ref: &[u8] = entity.as_ref(); + hashify::fnc_map!(entity_ref, b"lt" => { return Ok(Token::Text("<".into())); }, b"gt" => { return Ok(Token::Text(">".into())); }, b"amp" => { return Ok(Token::Text("&".into())); }, diff --git a/crates/dav/Cargo.toml b/crates/dav/Cargo.toml index 67b14e2d..d350a76d 100644 --- a/crates/dav/Cargo.toml +++ b/crates/dav/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dav" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/directory/Cargo.toml b/crates/directory/Cargo.toml index da959319..18b76380 100644 --- a/crates/directory/Cargo.toml +++ b/crates/directory/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "directory" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -14,26 +14,25 @@ registry = { path = "../registry" } mail-parser = { version = "0.11" } mail-builder = { version = "0.4" } tokio = { version = "1.47", features = ["net"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pki-types = { version = "1" } -ldap3 = { version = "0.12", default-features = false, features = ["tls-rustls-ring"] } +ldap3 = { version = "0.12", default-features = false, features = ["tls-rustls-aws-lc-rs"] } deadpool = { version = "0.10", features = ["managed", "rt_tokio_1"] } async-trait = "0.1.68" ahash = { version = "0.8" } pwhash = "1" -password-hash = "0.5.0" argon2 = "0.5.0" pbkdf2 = {version = "0.12.1", features = ["simple"] } scrypt = "0.11.0" -sha1 = "0.10.5" -sha2 = "0.10.6" +sha1 = "0.11" +sha2 = "0.11" md5 = "0.8.0" futures = "0.3" regex = "1.7.0" serde = { version = "1.0", features = ["derive"]} totp-rs = { version = "5.5.1", features = ["otpauth"] } -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2"] } # Use aws +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2"] } serde_json = "1.0" base64 = "0.22" rkyv = { version = "0.8.10", features = ["little_endian"] } diff --git a/crates/directory/src/core/secret.rs b/crates/directory/src/core/secret.rs index 639b9a2a..cd2d3bf7 100644 --- a/crates/directory/src/core/secret.rs +++ b/crates/directory/src/core/secret.rs @@ -5,12 +5,13 @@ */ use argon2::Argon2; +use argon2::PasswordHash; use argon2::PasswordHasher; +use argon2::PasswordVerifier; +use argon2::password_hash::SaltString; +use argon2::password_hash::rand_core::OsRng; use mail_builder::encoders::base64::base64_encode; use mail_parser::decoders::base64::base64_decode; -use password_hash::PasswordHash; -use password_hash::SaltString; -use password_hash::rand_core::OsRng; use pbkdf2::Pbkdf2; use pwhash::{bcrypt, bsdi_crypt, md5_crypt, sha1_crypt, sha256_crypt, sha512_crypt, unix_crypt}; use registry::schema::enums::PasswordHashAlgorithm; @@ -73,44 +74,27 @@ pub async fn verify_mfa_secret_hash( } } -/*pub fn verify_otp_auth(otp_auth: Option<&str>, otp_code: Option<&str>) -> trc::Result { - if let Some(otp_auth) = otp_auth { - if let Some(otp_code) = otp_code { - TOTP::from_url(otp_auth) - .map_err(|err| { - trc::AuthEvent::Error - .reason(err) - .details(otp_auth.to_string()) - })? - .check_current(otp_code) - .map_err(|err| { - trc::AuthEvent::Error - .reason(err) - .details("TOTP verification failed") - }) - } else { - Ok(false) - } - } else { - Ok(true) - } -}*/ - async fn verify_hash_prefix(hashed_secret: &str, secret: &[u8]) -> trc::Result { - if hashed_secret.starts_with("$argon2") - || hashed_secret.starts_with("$pbkdf2") - || hashed_secret.starts_with("$scrypt") - { + let is_argon = hashed_secret.starts_with("$argon2"); + let is_pbkdf2 = !is_argon && hashed_secret.starts_with("$pbkdf2"); + let is_scrypt = !is_argon && !is_pbkdf2 && hashed_secret.starts_with("$scrypt"); + + if is_argon || is_pbkdf2 || is_scrypt { let (tx, rx) = oneshot::channel(); let secret = secret.to_vec(); let hashed_secret = hashed_secret.to_string(); tokio::task::spawn_blocking(move || match PasswordHash::new(&hashed_secret) { Ok(hash) => { - tx.send(Ok(hash - .verify_password(&[&Argon2::default(), &Pbkdf2, &Scrypt], &secret) - .is_ok())) - .ok(); + let result = if is_argon { + Argon2::default().verify_password(&secret, &hash) + } else if is_pbkdf2 { + Pbkdf2.verify_password(&secret, &hash) + } else { + Scrypt.verify_password(&secret, &hash) + }; + + tx.send(Ok(result.is_ok())).ok(); } Err(err) => { tx.send(Err(trc::AuthEvent::Error diff --git a/crates/directory/src/lib.rs b/crates/directory/src/lib.rs index 84c47089..619dbecf 100644 --- a/crates/directory/src/lib.rs +++ b/crates/directory/src/lib.rs @@ -15,7 +15,7 @@ use std::{collections::HashMap, fmt::Debug, sync::Arc}; pub mod backend; pub mod core; -#[derive(Debug, PartialEq, Eq)] +#[derive(Debug, PartialEq, Eq, Clone, Hash)] pub enum Credentials { Basic { username: String, diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml index bf4cd97a..ec054fe8 100644 --- a/crates/email/Cargo.toml +++ b/crates/email/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "email" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -25,9 +25,9 @@ aes = "0.8.3" aes-gcm = "0.10.1" aes-gcm-siv = "0.11.1" cbc = { version = "0.1.2", features = ["alloc"] } -rasn = "0.10" -rasn-cms = "0.10" -rasn-pkix = "0.10" +rasn = "0.28" +rasn-cms = "0.28" +rasn-pkix = "0.28" rsa = "0.9.2" rand = "0.8" sequoia-openpgp = { version = "2.0", default-features = false, features = ["crypto-rust", "allow-experimental-crypto", "allow-variable-time-crypto"] } diff --git a/crates/email/src/message/crypto.rs b/crates/email/src/message/crypto.rs index 87ed3527..64721889 100644 --- a/crates/email/src/message/crypto.rs +++ b/crates/email/src/message/crypto.rs @@ -17,7 +17,7 @@ use openpgp::{ types::{KeyFlags, SymmetricAlgorithm}, }; use rand::{RngCore, SeedableRng, rngs::StdRng}; -use rasn::types::{ObjectIdentifier, OctetString}; +use rasn::types::{ObjectIdentifier, OctetString, SetOf}; use rasn_cms::{ AlgorithmIdentifier, CONTENT_DATA, CONTENT_ENVELOPED_DATA, EncryptedContent, EncryptedContentInfo, EncryptedKey, EnvelopedData, IssuerAndSerialNumber, @@ -27,7 +27,7 @@ use rasn_cms::{ }; use rsa::{Pkcs1v15Encrypt, RsaPublicKey, pkcs1::DecodeRsaPublicKey}; use sequoia_openpgp as openpgp; -use std::{collections::BTreeSet, io::Cursor}; +use std::io::Cursor; #[derive(Debug)] pub enum EncryptMessageError { @@ -199,8 +199,7 @@ impl EncryptMessage for Message<'_> { })?; // Encrypt key using public keys - #[allow(clippy::mutable_key_type)] - let mut recipient_infos = BTreeSet::new(); + let mut recipient_infos = SetOf::new(); for cert in keys.iter() { let cert = rasn::der::decode::(cert).map_err(|err| { EncryptMessageError::Error(format!("Failed to parse certificate: {}", err)) diff --git a/crates/groupware/Cargo.toml b/crates/groupware/Cargo.toml index 4ab1142e..9fc8c2fc 100644 --- a/crates/groupware/Cargo.toml +++ b/crates/groupware/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "groupware" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/http-proto/Cargo.toml b/crates/http-proto/Cargo.toml index ab1dbcc9..312de3b2 100644 --- a/crates/http-proto/Cargo.toml +++ b/crates/http-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "http_proto" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index 90ff00bc..fb279cf3 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "http" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -24,7 +24,6 @@ smtp-proto = { version = "0.2" } mail-parser = { version = "0.11", features = ["full_encoding", "rkyv"] } mail-builder = { version = "0.4" } mail-auth = { path = "/Users/me/code/mail-auth", features = ["generate"] } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } tokio = { version = "1.47", features = ["rt"] } hyper = { version = "1.0.1", features = ["server", "http1", "http2"] } hyper-util = { version = "0.1.1", features = ["tokio"] } @@ -38,8 +37,8 @@ chrono = "0.4" base64 = "0.22" pkcs8 = { version = "0.10.2", features = ["alloc", "std"] } rsa = "0.9.2" -sha1 = "0.10" -sha2 = "0.10" +sha1 = "0.11" +sha2 = "0.11" rkyv = { version = "0.8.10", features = ["little_endian"] } form-data = { version = "0.6.0", features = ["sync"], default-features = false } mime = "0.3.17" diff --git a/crates/http/src/management/diagnose.rs b/crates/http/src/management/diagnose.rs index a8b99e05..e98401cd 100644 --- a/crates/http/src/management/diagnose.rs +++ b/crates/http/src/management/diagnose.rs @@ -17,6 +17,7 @@ use serde::{Deserialize, Serialize}; use smtp::outbound::{ client::{SmtpClient, StartTlsResult}, dane::{dnssec::TlsaLookup, verify::TlsaVerify}, + error::ClientError, lookup::{DnsLookup, ToNextHop}, mta_sts::{lookup::MtaStsLookup, verify::VerifyPolicy}, }; @@ -646,7 +647,7 @@ async fn delivery_diagnose( if r.is_positive_completion() { Ok(r) } else { - Err(mail_send::Error::UnexpectedReply(r)) + Err(ClientError::UnexpectedReply(r)) } }) { Ok(_) => { @@ -666,7 +667,7 @@ async fn delivery_diagnose( if r.is_positive_completion() { Ok(r) } else { - Err(mail_send::Error::UnexpectedReply(r)) + Err(ClientError::UnexpectedReply(r)) } }) { Ok(_) => { diff --git a/crates/imap-proto/Cargo.toml b/crates/imap-proto/Cargo.toml index d85bdaa6..3e9b6040 100644 --- a/crates/imap-proto/Cargo.toml +++ b/crates/imap-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "imap_proto" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/imap/Cargo.toml b/crates/imap/Cargo.toml index 28506bf3..296931e5 100644 --- a/crates/imap/Cargo.toml +++ b/crates/imap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "imap" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -15,11 +15,10 @@ nlp = { path = "../nlp" } utils = { path = "../utils" } registry = { path = "../registry" } mail-parser = { version = "0.11", features = ["full_encoding"] } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pemfile = "2.0" tokio = { version = "1.47", features = ["full"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } parking_lot = "0.12" ahash = { version = "0.8" } md5 = "0.8.0" diff --git a/crates/jmap-proto/Cargo.toml b/crates/jmap-proto/Cargo.toml index 70e44aca..52cf58ad 100644 --- a/crates/jmap-proto/Cargo.toml +++ b/crates/jmap-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jmap_proto" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/jmap/Cargo.toml b/crates/jmap/Cargo.toml index cf31a71a..d53b45a3 100644 --- a/crates/jmap/Cargo.toml +++ b/crates/jmap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jmap" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -23,7 +23,6 @@ calcard = { version = "0.3" } smtp-proto = { version = "0.2" } mail-parser = { version = "0.11", features = ["full_encoding", "rkyv"] } mail-builder = { version = "0.4" } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } mail-auth = { path = "/Users/me/code/mail-auth", features = ["generate"] } sieve-rs = { version = "0.7", features = ["rkyv"] } jmap-tools = { version = "0.1", features = ["rkyv"] } @@ -37,12 +36,12 @@ futures-util = "0.3.28" async-stream = "0.3.5" base64 = "0.22" p256 = { version = "0.13", features = ["ecdh"] } -hkdf = "0.12.3" -sha1 = "0.10" -sha2 = "0.10" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2"]} -tokio-tungstenite = "0.28" -tungstenite = "0.28" +hkdf = "0.13" +sha1 = "0.11" +sha2 = "0.11" +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2"]} +tokio-tungstenite = "0.29" +tungstenite = "0.29" chrono = "0.4" rand = "0.9.0" pkcs8 = { version = "0.10.2", features = ["alloc", "std"] } diff --git a/crates/main/Cargo.toml b/crates/main/Cargo.toml index 3e106f6f..b0142524 100644 --- a/crates/main/Cargo.toml +++ b/crates/main/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://stalw.art" keywords = ["imap", "jmap", "smtp", "email", "mail", "webdav", "server"] categories = ["email"] license = "AGPL-3.0-only OR LicenseRef-SEL" -version = "0.15.5" +version = "0.16.0" edition = "2024" [[bin]] diff --git a/crates/managesieve/Cargo.toml b/crates/managesieve/Cargo.toml index 2f2dffc9..ef61ab60 100644 --- a/crates/managesieve/Cargo.toml +++ b/crates/managesieve/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "managesieve" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -16,12 +16,11 @@ email = { path = "../email" } trc = { path = "../trc" } registry = { path = "../registry" } mail-parser = { version = "0.11", features = ["full_encoding"] } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } sieve-rs = { version = "0.7", features = ["rkyv"] } -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pemfile = "2.0" tokio = { version = "1.47", features = ["full"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } parking_lot = "0.12" ahash = { version = "0.8" } md5 = "0.8.0" diff --git a/crates/migration/Cargo.toml b/crates/migration/Cargo.toml index 74d367f6..eff278a1 100644 --- a/crates/migration/Cargo.toml +++ b/crates/migration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "migration" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/nlp/Cargo.toml b/crates/nlp/Cargo.toml index d7292afc..de25f03e 100644 --- a/crates/nlp/Cargo.toml +++ b/crates/nlp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nlp" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/pop3/Cargo.toml b/crates/pop3/Cargo.toml index a212c045..52fd5782 100644 --- a/crates/pop3/Cargo.toml +++ b/crates/pop3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pop3" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -14,10 +14,9 @@ types = { path = "../types" } email = { path = "../email" } registry = { path = "../registry" } mail-parser = { version = "0.11", features = ["full_encoding"] } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } tokio = { version = "1.47", features = ["full"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } [features] test_mode = [] diff --git a/crates/services/Cargo.toml b/crates/services/Cargo.toml index f2708e5a..ddf125eb 100644 --- a/crates/services/Cargo.toml +++ b/crates/services/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "services" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -29,9 +29,9 @@ aes-gcm = "0.10.1" aes-gcm-siv = "0.11.1" rsa = "0.9.2" p256 = { version = "0.13", features = ["ecdh"] } -hkdf = "0.12.3" -sha2 = "0.10" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2"]} +hkdf = "0.13" +sha2 = "0.11" +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2"]} base64 = "0.22" compact_str = "0.9.0" dns-update = { path = "/Users/me/code/dns-update" } diff --git a/crates/services/src/state_manager/ece.rs b/crates/services/src/state_manager/ece.rs index 34af596b..428fcf15 100644 --- a/crates/services/src/state_manager/ece.rs +++ b/crates/services/src/state_manager/ece.rs @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL */ -use aes_gcm::{Aes128Gcm, Nonce, aead::Aead}; +use aes_gcm::{Aes128Gcm, Key, Nonce, aead::Aead}; use hkdf::Hkdf; use p256::{ PublicKey, @@ -157,14 +157,10 @@ fn hkdf_sha256(salt: &[u8], secret: &[u8], info: &[u8], len: usize) -> Result Result, String> { - ::new( - &sha2::digest::generic_array::GenericArray::clone_from_slice(key), - ) - .encrypt(Nonce::from_slice(nonce), data) - .map_err(|e| e.to_string()) + ::new(Key::::from_slice(key)) + .encrypt(Nonce::from_slice(nonce), data) + .map_err(|e| e.to_string()) } fn generate_info( diff --git a/crates/smtp/Cargo.toml b/crates/smtp/Cargo.toml index 3d05d845..a7940d16 100644 --- a/crates/smtp/Cargo.toml +++ b/crates/smtp/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://stalw.art/smtp" keywords = ["smtp", "email", "mail", "server"] categories = ["email"] license = "AGPL-3.0-only OR LicenseRef-SEL" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -22,24 +22,22 @@ registry = { path = "../registry" } spam-filter = { path = "../spam-filter" } trc = { path = "../trc" } mail-auth = { path = "/Users/me/code/mail-auth", features = ["rkyv"] } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } mail-parser = { version = "0.11", features = ["full_encoding"] } mail-builder = { version = "0.4" } smtp-proto = { version = "0.2", features = ["rkyv", "serde"] } sieve-rs = { version = "0.7", features = ["rkyv"] } ahash = { version = "0.8" } -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pemfile = "2.0" rustls-pki-types = { version = "1" } tokio = { version = "1.47", features = ["full"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } -webpki-roots = { version = "1.0"} +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } hyper = { version = "1.0.1", features = ["server", "http1", "http2"] } hyper-util = { version = "0.1.1", features = ["tokio"] } http-body-util = "0.1.0" form_urlencoded = "1.1.0" -sha1 = "0.10" -sha2 = "0.10.6" +sha1 = "0.11" +sha2 = "0.11" md5 = "0.8.0" rayon = "1.5" parking_lot = "0.12" @@ -48,7 +46,7 @@ blake3 = "1.3" lru-cache = "0.1.2" rand = "0.9.0" x509-parser = "0.18" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2"] } +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2"] } serde = { version = "1.0", features = ["derive", "rc"] } serde_json = "1.0" num_cpus = "1.15.0" @@ -56,6 +54,7 @@ chrono = "0.4" rkyv = { version = "0.8.10", features = ["little_endian"] } compact_str = "0.9.0" hashify = { version = "0.2" } +base64 = "0.22" [features] test_mode = ["mail-auth/test"] diff --git a/crates/smtp/src/outbound/client.rs b/crates/smtp/src/outbound/client.rs index e86b857a..4f3825ad 100644 --- a/crates/smtp/src/outbound/client.rs +++ b/crates/smtp/src/outbound/client.rs @@ -5,13 +5,16 @@ */ use super::session::SessionParams; -use crate::queue::{Error, ErrorDetails, HostResponse, MessageWrapper, Status}; -use mail_send::{Credentials, smtp::AssertReply}; +use crate::{ + outbound::error::{AssertReply, ClientError, ClientResult}, + queue::{Error, ErrorDetails, HostResponse, MessageWrapper, Status}, +}; +use base64::{Engine, engine::general_purpose}; +use directory::Credentials; use rustls::ClientConnection; use rustls_pki_types::ServerName; use smtp_proto::{ - AUTH_CRAM_MD5, AUTH_DIGEST_MD5, AUTH_LOGIN, AUTH_OAUTHBEARER, AUTH_PLAIN, AUTH_XOAUTH2, - EXT_START_TLS, EhloResponse, Response, + AUTH_LOGIN, AUTH_OAUTHBEARER, AUTH_PLAIN, AUTH_XOAUTH2, EXT_START_TLS, EhloResponse, Response, response::{ generate::BitToString, parser::{MAX_RESPONSE_LENGTH, ResponseReceiver}, @@ -35,20 +38,15 @@ pub struct SmtpClient { } impl SmtpClient { - pub async fn authenticate( + pub async fn authenticate( &mut self, - credentials: impl AsRef>, + credentials: &Credentials, capabilities: impl AsRef>, - ) -> mail_send::Result<&mut Self> - where - U: AsRef + PartialEq + Eq + std::hash::Hash, - { - let credentials = credentials.as_ref(); + ) -> ClientResult<&mut Self> { let capabilities = capabilities.as_ref(); let mut available_mechanisms = match &credentials { - Credentials::Plain { .. } => AUTH_CRAM_MD5 | AUTH_DIGEST_MD5 | AUTH_LOGIN | AUTH_PLAIN, - Credentials::OAuthBearer { .. } => AUTH_OAUTHBEARER, - Credentials::XOauth2 { .. } => AUTH_XOAUTH2, + Credentials::Basic { .. } => AUTH_LOGIN | AUTH_PLAIN, + Credentials::Bearer { .. } => AUTH_OAUTHBEARER | AUTH_XOAUTH2, } & capabilities.auth_mechanisms; // Try authenticating from most secure to least secure @@ -63,37 +61,34 @@ impl SmtpClient { return Ok(self); } Err(err) => match err { - mail_send::Error::UnexpectedReply(reply) => { + ClientError::UnexpectedReply(reply) => { has_failed = reply.code() == 535; has_err = reply.into(); } - mail_send::Error::UnsupportedAuthMechanism => (), + ClientError::UnsupportedAuthMechanism => (), _ => return Err(err), }, } } if let Some(has_err) = has_err { - Err(mail_send::Error::AuthenticationFailed(has_err)) + Err(ClientError::AuthenticationFailed(has_err)) } else { - Err(mail_send::Error::UnsupportedAuthMechanism) + Err(ClientError::UnsupportedAuthMechanism) } } - pub(crate) async fn auth( + pub(crate) async fn auth( &mut self, mechanism: u64, - credentials: &Credentials, - ) -> mail_send::Result<()> - where - U: AsRef + PartialEq + Eq + std::hash::Hash, - { + credentials: &Credentials, + ) -> ClientResult<()> { let mut reply = if (mechanism & (AUTH_PLAIN | AUTH_XOAUTH2 | AUTH_OAUTHBEARER)) != 0 { self.cmd( format!( "AUTH {} {}\r\n", mechanism.to_mechanism(), - credentials.encode(mechanism, "")?, + encode_credentials(credentials, mechanism, "")?, ) .as_bytes(), ) @@ -108,8 +103,11 @@ impl SmtpClient { 334 => { reply = self .cmd( - format!("{}\r\n", credentials.encode(mechanism, reply.message())?) - .as_bytes(), + format!( + "{}\r\n", + encode_credentials(credentials, mechanism, reply.message())? + ) + .as_bytes(), ) .await?; } @@ -117,12 +115,12 @@ impl SmtpClient { return Ok(()); } _ => { - return Err(mail_send::Error::UnexpectedReply(reply)); + return Err(ClientError::UnexpectedReply(reply)); } } } - Err(mail_send::Error::UnexpectedReply(reply)) + Err(ClientError::UnexpectedReply(reply)) } pub async fn read_greeting( @@ -160,14 +158,14 @@ impl SmtpClient { .map_err(|err| Status::from_smtp_error(hostname, "", err)) } - pub async fn write_chunks(&mut self, chunks: &[&[u8]]) -> Result<(), mail_send::Error> { + pub async fn write_chunks(&mut self, chunks: &[&[u8]]) -> Result<(), ClientError> { for chunk in chunks { self.stream .write_all(chunk) .await - .map_err(mail_send::Error::from)?; + .map_err(ClientError::from)?; } - self.stream.flush().await.map_err(mail_send::Error::from) + self.stream.flush().await.map_err(ClientError::from) } pub async fn send_message( @@ -206,7 +204,7 @@ impl SmtpClient { self.read().await?.assert_code(354)?; self.write_message(&raw_message) .await - .map_err(mail_send::Error::from) + .map_err(ClientError::from) } }) .await @@ -291,7 +289,7 @@ impl SmtpClient { .await; } - pub async fn read_ehlo(&mut self) -> mail_send::Result> { + pub async fn read_ehlo(&mut self) -> ClientResult> { let mut buf = vec![0u8; 8192]; let mut buf_concat = Vec::with_capacity(0); @@ -299,7 +297,7 @@ impl SmtpClient { let br = self.stream.read(&mut buf).await?; if br == 0 { - return Err(mail_send::Error::UnparseableReply); + return Err(ClientError::UnparseableReply); } trc::event!( @@ -315,7 +313,7 @@ impl SmtpClient { buf_concat.extend_from_slice(&buf[..br]); buf_concat.iter() } else { - return Err(mail_send::Error::UnparseableReply); + return Err(ClientError::UnparseableReply); }; match EhloResponse::parse(&mut iter) { @@ -329,25 +327,25 @@ impl SmtpClient { smtp_proto::Error::InvalidResponse { code } => { match ResponseReceiver::from_code(code).parse(&mut iter) { Ok(response) => { - return Err(mail_send::Error::UnexpectedReply(response)); + return Err(ClientError::UnexpectedReply(response)); } Err(smtp_proto::Error::NeedsMoreData { .. }) => { if buf_concat.is_empty() { buf_concat = buf[..br].to_vec(); } } - Err(_) => return Err(mail_send::Error::UnparseableReply), + Err(_) => return Err(ClientError::UnparseableReply), } } _ => { - return Err(mail_send::Error::UnparseableReply); + return Err(ClientError::UnparseableReply); } }, } } } - pub async fn read(&mut self) -> mail_send::Result> { + pub async fn read(&mut self) -> ClientResult> { let mut buf = vec![0u8; 8192]; let mut parser = ResponseReceiver::default(); @@ -367,17 +365,17 @@ impl SmtpClient { Err(err) => match err { smtp_proto::Error::NeedsMoreData { .. } => (), _ => { - return Err(mail_send::Error::UnparseableReply); + return Err(ClientError::UnparseableReply); } }, } } else { - return Err(mail_send::Error::UnparseableReply); + return Err(ClientError::UnparseableReply); } } } - pub async fn read_many(&mut self, num: usize) -> mail_send::Result>>> { + pub async fn read_many(&mut self, num: usize) -> ClientResult>>> { let mut buf = vec![0u8; 1024]; let mut response = Vec::with_capacity(num); let mut parser = ResponseReceiver::default(); @@ -408,13 +406,13 @@ impl SmtpClient { Err(err) => match err { smtp_proto::Error::NeedsMoreData { .. } => break, _ => { - return Err(mail_send::Error::UnparseableReply); + return Err(ClientError::UnparseableReply); } }, } } } else { - return Err(mail_send::Error::UnparseableReply); + return Err(ClientError::UnparseableReply); } } @@ -422,7 +420,7 @@ impl SmtpClient { } /// Sends a command to the SMTP server and waits for a reply. - pub async fn cmd(&mut self, cmd: impl AsRef<[u8]>) -> mail_send::Result> { + pub async fn cmd(&mut self, cmd: impl AsRef<[u8]>) -> ClientResult> { tokio::time::timeout(self.timeout, async { let cmd = cmd.as_ref(); @@ -438,7 +436,7 @@ impl SmtpClient { self.read().await }) .await - .map_err(|_| mail_send::Error::Timeout)? + .map_err(|_| ClientError::Timeout)? } pub async fn write_message(&mut self, message: &[u8]) -> tokio::io::Result<()> { @@ -485,7 +483,7 @@ impl SmtpClient { mut self, tls_connector: &TlsConnector, hostname: &str, - ) -> mail_send::Result>> { + ) -> ClientResult>> { // Send STARTTLS command self.cmd(b"STARTTLS\r\n") .await? @@ -498,13 +496,13 @@ impl SmtpClient { self, tls_connector: &TlsConnector, hostname: &str, - ) -> mail_send::Result>> { + ) -> ClientResult>> { tokio::time::timeout(self.timeout, async { Ok(SmtpClient { stream: tls_connector .connect( ServerName::try_from(hostname) - .map_err(|_| mail_send::Error::InvalidTLSName)? + .map_err(|_| ClientError::InvalidTLSName)? .to_owned(), self.stream, ) @@ -513,13 +511,11 @@ impl SmtpClient { let kind = err.kind(); if let Some(inner) = err.into_inner() { match inner.downcast::() { - Ok(error) => mail_send::Error::Tls(error), - Err(error) => { - mail_send::Error::Io(std::io::Error::new(kind, error)) - } + Ok(error) => ClientError::Tls(error), + Err(error) => ClientError::Io(std::io::Error::new(kind, error)), } } else { - mail_send::Error::Io(std::io::Error::new(kind, "Unspecified")) + ClientError::Io(std::io::Error::new(kind, "Unspecified")) } })?, timeout: self.timeout, @@ -527,7 +523,7 @@ impl SmtpClient { }) }) .await - .map_err(|_| mail_send::Error::Timeout)? + .map_err(|_| ClientError::Timeout)? } } @@ -537,7 +533,7 @@ impl SmtpClient { remote_addr: SocketAddr, timeout: Duration, session_id: u64, - ) -> mail_send::Result { + ) -> ClientResult { tokio::time::timeout(timeout, async { Ok(SmtpClient { stream: TcpStream::connect(remote_addr).await?, @@ -546,7 +542,7 @@ impl SmtpClient { }) }) .await - .map_err(|_| mail_send::Error::Timeout)? + .map_err(|_| ClientError::Timeout)? } /// Connects to a remote host address using the provided local IP @@ -555,7 +551,7 @@ impl SmtpClient { remote_addr: SocketAddr, timeout: Duration, session_id: u64, - ) -> mail_send::Result { + ) -> ClientResult { tokio::time::timeout(timeout, async { let socket = if local_ip.is_ipv4() { TcpSocket::new_v4()? @@ -571,7 +567,7 @@ impl SmtpClient { }) }) .await - .map_err(|_| mail_send::Error::Timeout)? + .map_err(|_| ClientError::Timeout)? } pub async fn try_start_tls( @@ -606,6 +602,59 @@ impl SmtpClient { } } +fn encode_credentials( + credentials: &Credentials, + mechanism: u64, + challenge: &str, +) -> ClientResult { + Ok(general_purpose::STANDARD.encode( + match (mechanism, credentials) { + ( + AUTH_PLAIN, + Credentials::Basic { + username, secret, .. + }, + ) => { + format!("\u{0}{}\u{0}{}", username, secret) + } + ( + AUTH_LOGIN, + Credentials::Basic { + username, secret, .. + }, + ) => { + let challenge = general_purpose::STANDARD.decode(challenge)?; + + if b"user name" + .eq_ignore_ascii_case(challenge.get(0..9).ok_or(ClientError::InvalidChallenge)?) + || b"username".eq_ignore_ascii_case( + // Because Google makes its own standards + challenge.get(0..8).ok_or(ClientError::InvalidChallenge)?, + ) + { + &username + } else if b"password" + .eq_ignore_ascii_case(challenge.get(0..8).ok_or(ClientError::InvalidChallenge)?) + { + &secret + } else { + return Err(ClientError::InvalidChallenge); + } + .to_string() + } + + (AUTH_XOAUTH2, Credentials::Bearer { token, username }) => format!( + "user={}\x01auth=Bearer {}\x01\x01", + username.as_deref().unwrap_or_default(), + token + ), + (AUTH_OAUTHBEARER, Credentials::Bearer { token, .. }) => token.to_string(), + _ => return Err(ClientError::UnsupportedAuthMechanism), + } + .as_bytes(), + )) +} + impl SmtpClient> { pub fn tls_connection(&self) -> &ClientConnection { self.stream.get_ref().1 @@ -618,7 +667,7 @@ pub enum StartTlsResult { smtp_client: SmtpClient>, }, Error { - error: mail_send::Error, + error: ClientError, }, Unavailable { response: Option>>, @@ -640,31 +689,33 @@ impl BoxResponse for Response { } } -pub(crate) fn from_mail_send_error(error: &mail_send::Error) -> trc::Error { +pub(crate) fn from_mail_send_error(error: &ClientError) -> trc::Error { let event = trc::EventType::Smtp(trc::SmtpEvent::Error).into_err(); match error { - mail_send::Error::Io(err) => event.details("I/O Error").reason(err), - mail_send::Error::Tls(err) => event.details("TLS Error").reason(err), - mail_send::Error::Base64(err) => event.details("Base64 Error").reason(err), - mail_send::Error::Auth(err) => event.details("SMTP Authentication Error").reason(err), - mail_send::Error::UnparseableReply => event.details("Unparseable SMTP Reply"), - mail_send::Error::UnexpectedReply(reply) => event + ClientError::Io(err) => event.details("I/O Error").reason(err), + ClientError::Tls(err) => event.details("TLS Error").reason(err), + ClientError::Base64(err) => event.details("Base64 Error").reason(err), + ClientError::InvalidChallenge => event + .details("SMTP Authentication Error") + .reason("Invalid Challenge"), + ClientError::UnparseableReply => event.details("Unparseable SMTP Reply"), + ClientError::UnexpectedReply(reply) => event .details("Unexpected SMTP Response") .ctx(trc::Key::Code, reply.code) .ctx(trc::Key::Reason, reply.message.clone()), - mail_send::Error::AuthenticationFailed(reply) => event + ClientError::AuthenticationFailed(reply) => event .details("SMTP Authentication Failed") .ctx(trc::Key::Code, reply.code) .ctx(trc::Key::Reason, reply.message.clone()), - mail_send::Error::InvalidTLSName => event.details("Invalid TLS Name"), - mail_send::Error::MissingCredentials => event.details("Missing Authentication Credentials"), - mail_send::Error::MissingMailFrom => event.details("Missing Message Sender"), - mail_send::Error::MissingRcptTo => event.details("Missing Message Recipients"), - mail_send::Error::UnsupportedAuthMechanism => { + ClientError::InvalidTLSName => event.details("Invalid TLS Name"), + ClientError::MissingCredentials => event.details("Missing Authentication Credentials"), + ClientError::MissingMailFrom => event.details("Missing Message Sender"), + ClientError::MissingRcptTo => event.details("Missing Message Recipients"), + ClientError::UnsupportedAuthMechanism => { event.details("Unsupported Authentication Mechanism") } - mail_send::Error::Timeout => event.details("Connection Timeout"), - mail_send::Error::MissingStartTls => event.details("STARTTLS not available"), + ClientError::Timeout => event.details("Connection Timeout"), + ClientError::MissingStartTls => event.details("STARTTLS not available"), } } diff --git a/crates/smtp/src/outbound/delivery.rs b/crates/smtp/src/outbound/delivery.rs index 7128d8b4..a79dcbee 100644 --- a/crates/smtp/src/outbound/delivery.rs +++ b/crates/smtp/src/outbound/delivery.rs @@ -10,6 +10,7 @@ use crate::outbound::client::{ SmtpClient, from_error_details, from_error_status, from_mail_send_error, }; use crate::outbound::dane::dnssec::TlsaLookup; +use crate::outbound::error::ClientError; use crate::outbound::lookup::{DnsLookup, SourceIp}; use crate::outbound::mta_sts::lookup::MtaStsLookup; use crate::outbound::mta_sts::verify::VerifyPolicy; @@ -1164,7 +1165,7 @@ impl QueuedMessage { ); // Report TLS failure - if let (Some(tls_report), mail_send::Error::Tls(error)) = + if let (Some(tls_report), ClientError::Tls(error)) = (&tls_report, &error) { server diff --git a/crates/smtp/src/outbound/error.rs b/crates/smtp/src/outbound/error.rs new file mode 100644 index 00000000..ff88941e --- /dev/null +++ b/crates/smtp/src/outbound/error.rs @@ -0,0 +1,150 @@ +/* + * SPDX-FileCopyrightText: 2020 Stalwart Labs LLC + * + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL + */ + +use std::fmt::Display; + +use smtp_proto::{Response, Severity}; + +#[derive(Debug)] +pub enum ClientError { + /// I/O error + Io(std::io::Error), + + /// TLS error + Tls(Box), + + /// Base64 decode error + Base64(base64::DecodeError), + + // SMTP authentication error. + InvalidChallenge, + + /// Failure parsing SMTP reply + UnparseableReply, + + /// Unexpected SMTP reply. + UnexpectedReply(smtp_proto::Response), + + /// SMTP authentication failure. + AuthenticationFailed(smtp_proto::Response), + + /// Invalid TLS name provided. + InvalidTLSName, + + /// Missing authentication credentials. + MissingCredentials, + + /// Missing message sender. + MissingMailFrom, + + /// Missing message recipients. + MissingRcptTo, + + /// The server does no support any of the available authentication methods. + UnsupportedAuthMechanism, + + /// Connection timeout. + Timeout, + + /// STARTTLS not available + MissingStartTls, +} + +pub trait AssertReply: Sized { + fn is_positive_completion(&self) -> bool; + fn assert_positive_completion(self) -> ClientResult<()>; + fn assert_severity(self, severity: Severity) -> ClientResult<()>; + fn assert_code(self, code: u16) -> ClientResult<()>; +} + +impl AssertReply for Response { + /// Returns `true` if the reply is a positive completion. + #[inline(always)] + fn is_positive_completion(&self) -> bool { + (200..=299).contains(&self.code) + } + + /// Returns Ok if the reply has the specified severity. + #[inline(always)] + fn assert_severity(self, severity: Severity) -> ClientResult<()> { + if self.severity() == severity { + Ok(()) + } else { + Err(ClientError::UnexpectedReply(self)) + } + } + + /// Returns Ok if the reply returned a 2xx code. + #[inline(always)] + fn assert_positive_completion(self) -> ClientResult<()> { + if (200..=299).contains(&self.code) { + Ok(()) + } else { + Err(ClientError::UnexpectedReply(self)) + } + } + + /// Returns Ok if the reply has the specified status code. + #[inline(always)] + fn assert_code(self, code: u16) -> ClientResult<()> { + if self.code() == code { + Ok(()) + } else { + Err(ClientError::UnexpectedReply(self)) + } + } +} + +impl std::error::Error for ClientError { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + match self { + ClientError::Io(err) => err.source(), + ClientError::Tls(err) => err.source(), + ClientError::Base64(err) => err.source(), + _ => None, + } + } +} + +pub type ClientResult = std::result::Result; + +impl Display for ClientError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + ClientError::Io(e) => write!(f, "I/O error: {e}"), + ClientError::Tls(e) => write!(f, "TLS error: {e}"), + ClientError::Base64(e) => write!(f, "Base64 decode error: {e}"), + ClientError::InvalidChallenge => { + write!(f, "SMTP authentication error: Invalid challenge") + } + ClientError::UnparseableReply => write!(f, "Unparseable SMTP reply"), + ClientError::UnexpectedReply(e) => write!(f, "Unexpected reply: {e}"), + ClientError::AuthenticationFailed(e) => write!(f, "Authentication failed: {e}"), + ClientError::InvalidTLSName => write!(f, "Invalid TLS name provided"), + ClientError::MissingCredentials => write!(f, "Missing authentication credentials"), + ClientError::MissingMailFrom => write!(f, "Missing message sender"), + ClientError::MissingRcptTo => write!(f, "Missing message recipients"), + ClientError::UnsupportedAuthMechanism => write!( + f, + "The server does no support any of the available authentication methods" + ), + ClientError::Timeout => write!(f, "Connection timeout"), + ClientError::MissingStartTls => write!(f, "STARTTLS extension unavailable"), + } + } +} + +impl From for ClientError { + fn from(err: std::io::Error) -> Self { + ClientError::Io(err) + } +} + +impl From for ClientError { + fn from(err: base64::DecodeError) -> Self { + ClientError::Base64(err) + } +} diff --git a/crates/smtp/src/outbound/mod.rs b/crates/smtp/src/outbound/mod.rs index 56859146..7587f844 100644 --- a/crates/smtp/src/outbound/mod.rs +++ b/crates/smtp/src/outbound/mod.rs @@ -5,21 +5,22 @@ */ use crate::{ - outbound::client::BoxResponse, + outbound::{client::BoxResponse, error::ClientError}, queue::{Error, ErrorDetails, HostResponse, Status, UnexpectedResponse}, }; use common::config::{ server::ServerProtocol, smtp::queue::{HostOrIp, MxConfig, RelayConfig}, }; +use directory::Credentials; use mail_auth::IpLookupStrategy; -use mail_send::Credentials; use smtp_proto::{Response, Severity}; use std::{borrow::Cow, net::IpAddr}; pub mod client; pub mod dane; pub mod delivery; +pub mod error; pub mod local; pub mod lookup; pub mod mta_sts; @@ -41,22 +42,22 @@ pub(super) enum DeliveryResult { } impl Status>, ErrorDetails> { - pub fn from_smtp_error(hostname: &str, command: &str, err: mail_send::Error) -> Self { + pub fn from_smtp_error(hostname: &str, command: &str, err: ClientError) -> Self { match err { - mail_send::Error::Io(_) - | mail_send::Error::Tls(_) - | mail_send::Error::Base64(_) - | mail_send::Error::UnparseableReply - | mail_send::Error::AuthenticationFailed(_) - | mail_send::Error::MissingCredentials - | mail_send::Error::MissingMailFrom - | mail_send::Error::MissingRcptTo - | mail_send::Error::Timeout => Status::TemporaryFailure(ErrorDetails { + ClientError::Io(_) + | ClientError::Tls(_) + | ClientError::Base64(_) + | ClientError::UnparseableReply + | ClientError::AuthenticationFailed(_) + | ClientError::MissingCredentials + | ClientError::MissingMailFrom + | ClientError::MissingRcptTo + | ClientError::Timeout => Status::TemporaryFailure(ErrorDetails { entity: hostname.into(), details: Error::ConnectionError(err.to_string().into_boxed_str()), }), - mail_send::Error::UnexpectedReply(response) => { + ClientError::UnexpectedReply(response) => { if response.severity() == Severity::PermanentNegativeCompletion { Status::PermanentFailure(ErrorDetails { entity: hostname.into(), @@ -76,10 +77,10 @@ impl Status>, ErrorDetails> { } } - mail_send::Error::Auth(_) - | mail_send::Error::UnsupportedAuthMechanism - | mail_send::Error::InvalidTLSName - | mail_send::Error::MissingStartTls => Status::PermanentFailure(ErrorDetails { + ClientError::InvalidChallenge + | ClientError::UnsupportedAuthMechanism + | ClientError::InvalidTLSName + | ClientError::MissingStartTls => Status::PermanentFailure(ErrorDetails { entity: hostname.into(), details: Error::ConnectionError(err.to_string().into_boxed_str()), }), @@ -114,21 +115,21 @@ impl Status>, ErrorDetails> { } } - pub fn from_tls_error(hostname: &str, err: mail_send::Error) -> Self { + pub fn from_tls_error(hostname: &str, err: ClientError) -> Self { match err { - mail_send::Error::InvalidTLSName => Status::PermanentFailure(ErrorDetails { + ClientError::InvalidTLSName => Status::PermanentFailure(ErrorDetails { entity: hostname.into(), details: Error::TlsError("Invalid hostname".into()), }), - mail_send::Error::Timeout => Status::TemporaryFailure(ErrorDetails { + ClientError::Timeout => Status::TemporaryFailure(ErrorDetails { entity: hostname.into(), details: Error::TlsError("TLS handshake timed out".into()), }), - mail_send::Error::Tls(err) => Status::TemporaryFailure(ErrorDetails { + ClientError::Tls(err) => Status::TemporaryFailure(ErrorDetails { entity: hostname.into(), details: Error::TlsError(format!("Handshake failed: {err}").into_boxed_str()), }), - mail_send::Error::Io(err) => Status::TemporaryFailure(ErrorDetails { + ClientError::Io(err) => Status::TemporaryFailure(ErrorDetails { entity: hostname.into(), details: Error::TlsError(format!("I/O error: {err}").into_boxed_str()), }), @@ -298,7 +299,7 @@ impl NextHop<'_> { } #[inline(always)] - fn credentials(&self) -> Option<&Credentials> { + fn credentials(&self) -> Option<&Credentials> { match self { NextHop::MX { .. } => None, NextHop::Relay(host) => host.auth.as_ref(), diff --git a/crates/smtp/src/outbound/session.rs b/crates/smtp/src/outbound/session.rs index 55d0b2b4..8836c777 100644 --- a/crates/smtp/src/outbound/session.rs +++ b/crates/smtp/src/outbound/session.rs @@ -7,11 +7,12 @@ use super::client::SmtpClient; use crate::outbound::DeliveryResult; use crate::outbound::client::{BoxResponse, from_error_status, from_mail_send_error}; +use crate::outbound::error::ClientError; use crate::queue::{Error, MessageWrapper, Recipient, Status}; use crate::queue::{ErrorDetails, HostResponse, UnexpectedResponse}; use common::Server; use common::config::smtp::queue::ConnectionStrategy; -use mail_send::Credentials; +use directory::Credentials; use smtp_proto::{ EXT_CHUNKING, EXT_DSN, EXT_REQUIRE_TLS, EXT_SIZE, EXT_SMTP_UTF8, EhloResponse, MAIL_REQUIRETLS, MAIL_RET_FULL, MAIL_RET_HDRS, MAIL_SMTPUTF8, RCPT_NOTIFY_DELAY, RCPT_NOTIFY_FAILURE, @@ -24,7 +25,7 @@ use trc::DeliveryEvent; pub struct SessionParams<'x> { pub server: &'x Server, pub hostname: &'x str, - pub credentials: Option<&'x Credentials>, + pub credentials: Option<&'x Credentials>, pub capabilities: Option>, pub is_smtp: bool, pub local_hostname: &'x str, @@ -125,7 +126,7 @@ impl MessageWrapper { if r.is_positive_completion() { Ok(r) } else { - Err(mail_send::Error::UnexpectedReply(r)) + Err(ClientError::UnexpectedReply(r)) } }) { Ok(response) => { @@ -300,7 +301,7 @@ impl MessageWrapper { Status::from_smtp_error( params.hostname, bdat_cmd.as_deref().unwrap_or("DATA"), - mail_send::Error::UnexpectedReply(response), + ClientError::UnexpectedReply(response), ), rcpt_idxs, )); diff --git a/crates/spam-filter/Cargo.toml b/crates/spam-filter/Cargo.toml index 009b67a6..fda05372 100644 --- a/crates/spam-filter/Cargo.toml +++ b/crates/spam-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spam-filter" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -15,17 +15,16 @@ smtp-proto = { version = "0.2", features = ["rkyv"] } mail-parser = { version = "0.11", features = ["full_encoding"] } mail-builder = { version = "0.4" } mail-auth = { path = "/Users/me/code/mail-auth" } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } tokio = { version = "1.47", features = ["net", "macros"] } psl = "2" hyper = { version = "1.0.1", features = ["server", "http1", "http2"] } idna = "1.0" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2", "stream"]} +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2", "stream"]} decancer = "3.0.1" unicode-security = "0.1.0" infer = "0.19" -sha1 = "0.10" -sha2 = "0.10.6" +sha1 = "0.11" +sha2 = "0.11" compact_str = "0.9.0" rkyv = { version = "0.8.10", features = ["little_endian"] } serde = { version = "1.0", features = ["derive"]} diff --git a/crates/spam-filter/src/modules/pyzor.rs b/crates/spam-filter/src/modules/pyzor.rs index 0d8e2593..d24f0cd7 100644 --- a/crates/spam-filter/src/modules/pyzor.rs +++ b/crates/spam-filter/src/modules/pyzor.rs @@ -4,18 +4,17 @@ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL */ -use std::{ - borrow::Cow, - io::Write, - net::SocketAddr, - time::{Duration, SystemTime}, -}; - use common::config::mailstore::spamfilter::PyzorConfig; use mail_parser::{Message, PartType, decoders::html::add_html_token}; use nlp::tokenizers::types::{TokenType, TypesTokenizer}; use sha1::{Digest, Sha1}; +use std::{ + borrow::Cow, + net::SocketAddr, + time::{Duration, SystemTime}, +}; use tokio::net::UdpSocket; +use utils::HexEncode; const MIN_LINE_LENGTH: usize = 8; const ATOMIC_NUM_LINES: usize = 4; @@ -139,7 +138,23 @@ async fn pyzor_send_message( } } -trait PyzorDigest { +trait PyzorWrite { + fn write_all(&mut self, data: &[u8]); +} + +impl PyzorWrite for Vec { + fn write_all(&mut self, data: &[u8]) { + self.extend_from_slice(data); + } +} + +impl PyzorWrite for Sha1 { + fn write_all(&mut self, data: &[u8]) { + self.update(data); + } +} + +trait PyzorDigest { fn pyzor_digest(&self, writer: W) -> W; } @@ -147,7 +162,7 @@ pub trait PyzorCheck { fn pyzor_check_message(&self) -> String; } -impl PyzorDigest for Message<'_> { +impl PyzorDigest for Message<'_> { fn pyzor_digest(&self, writer: W) -> W { let parts = self .parts @@ -179,15 +194,15 @@ impl PyzorCheck for Message<'_> { fn pyzor_create_message(message: &Message<'_>, time: u64, thread: u16) -> String { // Hash message - let hash = message.pyzor_digest(Sha1::new()).finalize(); + let hash = message.pyzor_digest(Sha1::new()).finalize().hex_encode(); // Hash key let mut hash_key = Sha1::new(); hash_key.update("anonymous:".as_bytes()); - let hash_key = hash_key.finalize(); + let hash_key = hash_key.finalize().hex_encode(); // Hash message let message = format!( - "Op: check\nOp-Digest: {hash:x}\nThread: {thread}\nPV: 2.1\nUser: anonymous\nTime: {time}" + "Op: check\nOp-Digest: {hash}\nThread: {thread}\nPV: 2.1\nUser: anonymous\nTime: {time}" ); let mut msg_hash = Sha1::new(); msg_hash.update(message.as_bytes()); @@ -196,16 +211,16 @@ fn pyzor_create_message(message: &Message<'_>, time: u64, thread: u16) -> String // Sign let mut sig = Sha1::new(); sig.update(msg_hash); - sig.update(format!(":{time}:{hash_key:x}")); - let sig = sig.finalize(); + sig.update(format!(":{time}:{hash_key}")); + let sig = sig.finalize().hex_encode(); - format!("{message}\nSig: {sig:x}\n") + format!("{message}\nSig: {sig}\n") } fn pyzor_digest<'x, I, W>(mut writer: W, lines: I) -> W where I: Iterator, - W: Write, + W: PyzorWrite, { let mut result = Vec::with_capacity(16); @@ -268,13 +283,13 @@ where for (offset, length) in DIGEST_SPEC { for i in 0..*length { if let Some(line) = result.get((*offset * result.len() / 100) + i) { - let _ = writer.write_all(line.as_bytes()); + writer.write_all(line.as_bytes()); } } } } else { for line in result { - let _ = writer.write_all(line.as_bytes()); + writer.write_all(line.as_bytes()); } } @@ -421,6 +436,7 @@ mod test { use mail_parser::MessageParser; use sha1::Digest; use sha1::Sha1; + use utils::HexEncode; use super::pyzor_create_message; use super::pyzor_send_message; @@ -575,14 +591,12 @@ mod test { // Test SHA hash assert_eq!( - format!( - "{:x}", - MessageParser::new() - .parse(HTML_TEXT_STYLE_SCRIPT) - .unwrap() - .pyzor_digest(Sha1::new(),) - .finalize() - ), + MessageParser::new() + .parse(HTML_TEXT_STYLE_SCRIPT) + .unwrap() + .pyzor_digest(Sha1::new(),) + .finalize() + .hex_encode(), "b2c27325a034c581df0c9ef37e4a0d63208a3e7e", ) } diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml index 98b85426..23acb7a0 100644 --- a/crates/store/Cargo.toml +++ b/crates/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "store" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -10,14 +10,13 @@ nlp = { path = "../nlp" } trc = { path = "../trc" } registry = { path = "../registry" } rocksdb = { version = "0.24", optional = true, features = ["multi-threaded-cf"] } -foundationdb = { version = "0.9.2", features = ["embedded-fdb-include", "fdb-7_3"], optional = true } -rusqlite = { version = "0.37", features = ["bundled"], optional = true } -#rust-s3 = { version = "0.37", default-features = false, features = ["tokio-rustls-tls"], optional = true } -rust-s3 = { version = "0.35", default-features = false, features = ["tokio-rustls-tls", "no-verify-ssl"], optional = true } +foundationdb = { version = "0.10", features = ["embedded-fdb-include", "fdb-7_4"], optional = true } +rusqlite = { version = "0.39", features = ["bundled"], optional = true } +rust-s3 = { version = "0.37", default-features = false, features = ["tokio-rustls-tls"], optional = true } azure_core = { version = "0.21.0", optional = true } azure_storage = { version = "0.21.0", default-features = false, features = ["enable_reqwest_rustls", "hmac_rust"], optional = true } azure_storage_blobs = { version = "0.21.0", default-features = false, features = ["enable_reqwest_rustls", "hmac_rust"], optional = true } -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2", "stream"]} +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2", "stream"]} tokio = { version = "1.47", features = ["sync", "fs", "io-util"] } r2d2 = { version = "0.8.10", optional = true } futures = { version = "0.3", optional = true } @@ -35,16 +34,16 @@ blake3 = "1.8" lz4_flex = { version = "0.13", default-features = false } deadpool-postgres = { version = "0.14", optional = true } tokio-postgres = { version = "0.7.10", features = ["with-serde_json-1"], optional = true } -tokio-rustls = { version = "0.26", optional = true, default-features = false, features = ["ring", "tls12"] } -rustls = { version = "0.23.5", optional = true, default-features = false, features = ["std", "ring", "tls12"] } +tokio-rustls = { version = "0.26", optional = true, default-features = false, features = ["aws_lc_rs", "tls12"] } +rustls = { version = "0.23.5", optional = true, default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pki-types = { version = "1", optional = true } ring = { version = "0.17", optional = true } bytes = { version = "1.10", optional = true } -mysql_async = { version = "0.36", default-features = false, features = ["default-rustls-ring", "minimal"], optional = true } +mysql_async = { version = "0.36", default-features = false, features = ["default-rustls", "minimal"], optional = true } serde_json = { version = "1.0.64" } regex = "1.12" flate2 = "1.1" -redis = { version = "0.32", features = [ "tokio-comp", "tokio-rustls-comp", "tls-rustls-insecure", "tls-rustls-webpki-roots", "cluster-async"], optional = true } +redis = { version = "1.1", features = [ "tokio-comp", "tokio-rustls-comp", "tls-rustls-insecure", "tls-rustls", "cluster-async"], optional = true } deadpool = { version = "0.12", features = ["managed"], optional = true } arc-swap = "1.6.0" bitpacking = "0.9.2" @@ -69,7 +68,7 @@ fdb-chunked-bm = [] # Blob stores s3 = ["rust-s3", "rustls_021"] -azure = ["azure_core", "azure_storage", "azure_storage_blobs"] +azure = ["azure_core", "azure_storage", "azure_storage_blobs", "futures"] # In-memory stores redis = ["dep:redis", "deadpool", "futures"] diff --git a/crates/store/src/backend/azure/mod.rs b/crates/store/src/backend/azure/mod.rs index f1e4b1d7..9360d5e2 100644 --- a/crates/store/src/backend/azure/mod.rs +++ b/crates/store/src/backend/azure/mod.rs @@ -5,7 +5,7 @@ */ use azure_core::error::ErrorKind; -use azure_core::{ExponentialRetryOptions, RetryOptions, StatusCode, TransportOptions}; +use azure_core::{ExponentialRetryOptions, RetryOptions, StatusCode}; use azure_storage::StorageCredentials; use azure_storage_blobs::prelude::{ClientBuilder, ContainerClient}; use futures::stream::StreamExt; @@ -45,19 +45,8 @@ impl AzureStore { } }; - let transport = match reqwest::Client::builder() - .timeout(config.timeout.into_inner()) - .build() - { - Ok(client) => Arc::new(client), - Err(err) => { - return Err(format!("Failed to create HTTP client: {err:?}")); - } - }; - Ok(BlobStore::Azure(Arc::new(AzureStore { client: ClientBuilder::new(config.storage_account, credentials) - .transport(TransportOptions::new(transport)) .retry(RetryOptions::exponential( ExponentialRetryOptions::default().max_retries(config.max_retries as u32 * 2), )) diff --git a/crates/store/src/backend/postgres/main.rs b/crates/store/src/backend/postgres/main.rs index bc864ff0..1dc73524 100644 --- a/crates/store/src/backend/postgres/main.rs +++ b/crates/store/src/backend/postgres/main.rs @@ -17,7 +17,7 @@ use ::registry::schema::{enums::PostgreSqlRecyclingMethod, structs}; use deadpool::managed::Object; use deadpool_postgres::{Config, Manager, ManagerConfig, PoolConfig, RecyclingMethod, Runtime}; use tokio_postgres::NoTls; -use utils::rustls_client_config; +use utils::tls::rustls_client_config; impl PostgresStore { pub async fn open(config: structs::PostgreSqlStore) -> Result { @@ -54,7 +54,7 @@ impl PostgresStore { conn_pool: if config.use_tls { cfg.create_pool( Some(Runtime::Tokio1), - MakeRustlsConnect::new(rustls_client_config(config.allow_invalid_certs)), + MakeRustlsConnect::new(rustls_client_config(config.allow_invalid_certs)?), ) } else { cfg.create_pool(Some(Runtime::Tokio1), NoTls) @@ -67,7 +67,7 @@ impl PostgresStore { conn_pool: if config.use_tls { cfg.create_pool( Some(Runtime::Tokio1), - MakeRustlsConnect::new(rustls_client_config(config.allow_invalid_certs)), + MakeRustlsConnect::new(rustls_client_config(config.allow_invalid_certs)?), ) } else { cfg.create_pool(Some(Runtime::Tokio1), NoTls) diff --git a/crates/store/src/backend/redis/pool.rs b/crates/store/src/backend/redis/pool.rs index 785c4150..bcbe07a0 100644 --- a/crates/store/src/backend/redis/pool.rs +++ b/crates/store/src/backend/redis/pool.rs @@ -17,7 +17,7 @@ impl managed::Manager for RedisConnectionManager { type Error = trc::Error; async fn create(&self) -> Result { - match tokio::time::timeout(self.timeout, self.client.get_multiplexed_tokio_connection()) + match tokio::time::timeout(self.timeout, self.client.get_multiplexed_async_connection()) .await { Ok(conn) => conn.map_err(into_error), diff --git a/crates/trc/Cargo.toml b/crates/trc/Cargo.toml index 8970574a..5bb8b2d1 100644 --- a/crates/trc/Cargo.toml +++ b/crates/trc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trc" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] @@ -10,7 +10,7 @@ mail-parser = { version = "0.11", features = ["full_encoding"] } base64 = "0.22.1" serde = "1.0" serde_json = "1.0.120" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2"]} +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2"]} rtrb = "0.3.1" parking_lot = "0.12.3" tokio = { version = "1.47", features = ["net", "macros"] } diff --git a/crates/trc/event-macro/Cargo.toml b/crates/trc/event-macro/Cargo.toml index 4fb8c5b7..20e7a81e 100644 --- a/crates/trc/event-macro/Cargo.toml +++ b/crates/trc/event-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "event_macro" -version = "0.15.5" +version = "0.16.0" edition = "2024" [lib] diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml index 663f6605..91aa86df 100644 --- a/crates/types/Cargo.toml +++ b/crates/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "types" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 8b20709d..5d30de4e 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -1,28 +1,27 @@ [package] name = "utils" -version = "0.15.5" +version = "0.16.0" edition = "2024" [dependencies] trc = { path = "../trc" } -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pemfile = "2.0" rustls-pki-types = { version = "1" } +rustls-platform-verifier = "0.6" tokio = { version = "1.47", features = ["net", "macros", "signal"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } serde = { version = "1.0", features = ["derive"]} mail-auth = { path = "/Users/me/code/mail-auth" } smtp-proto = { version = "0.2" } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } ahash = { version = "0.8", features = ["serde"] } chrono = "0.4" rand = "0.9.0" -webpki-roots = { version = "1.0"} ring = { version = "0.17" } base64 = "0.22" serde_json = "1.0" rcgen = "0.14" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "http2", "stream"]} +reqwest = { version = "0.13", default-features = false, features = ["rustls", "http2", "stream"]} x509-parser = "0.18" pem = "3.0" parking_lot = "0.12" diff --git a/crates/utils/proc-macros/Cargo.toml b/crates/utils/proc-macros/Cargo.toml index e860df95..b30268ff 100644 --- a/crates/utils/proc-macros/Cargo.toml +++ b/crates/utils/proc-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proc_macros" -version = "0.15.5" +version = "0.16.0" edition = "2024" [lib] diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index 288c2817..bf1b17db 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -15,21 +15,16 @@ pub mod http; pub mod map; pub mod snowflake; pub mod template; +pub mod tls; pub mod topological; pub mod url_params; use compact_str::ToCompactString; use futures::StreamExt; -use reqwest::Response; -use rustls::{ - ClientConfig, RootCertStore, SignatureScheme, - client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}, -}; -use rustls_pki_types::TrustAnchor; -use std::sync::Arc; - pub use reqwest::Client; +use reqwest::Response; pub use reqwest::header::HeaderMap; +use std::fmt::Write; pub trait HttpLimitResponse: Sync + Send { fn bytes_with_limit( @@ -147,29 +142,6 @@ pub async fn wait_for_shutdown() { trc::event!(Server(trc::ServerEvent::Shutdown), CausedBy = signal); } -pub fn rustls_client_config(allow_invalid_certs: bool) -> ClientConfig { - let config = ClientConfig::builder(); - - if !allow_invalid_certs { - let mut root_cert_store = RootCertStore::empty(); - - root_cert_store.extend(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| TrustAnchor { - subject: ta.subject.clone(), - subject_public_key_info: ta.subject_public_key_info.clone(), - name_constraints: ta.name_constraints.clone(), - })); - - config - .with_root_certificates(root_cert_store) - .with_no_client_auth() - } else { - config - .dangerous() - .with_custom_certificate_verifier(Arc::new(DummyVerifier {})) - .with_no_client_auth() - } -} - pub trait DomainPart { fn to_lowercase_domain(&self) -> String; fn domain_part(&self) -> &str; @@ -214,55 +186,18 @@ impl> DomainPart for T { } } -#[derive(Debug)] -struct DummyVerifier; +pub trait HexEncode { + fn hex_encode(&self) -> String; +} -impl ServerCertVerifier for DummyVerifier { - fn verify_server_cert( - &self, - _end_entity: &rustls_pki_types::CertificateDer<'_>, - _intermediates: &[rustls_pki_types::CertificateDer<'_>], - _server_name: &rustls_pki_types::ServerName<'_>, - _ocsp_response: &[u8], - _now: rustls_pki_types::UnixTime, - ) -> Result { - Ok(ServerCertVerified::assertion()) - } - - fn verify_tls12_signature( - &self, - _message: &[u8], - _cert: &rustls_pki_types::CertificateDer<'_>, - _dss: &rustls::DigitallySignedStruct, - ) -> Result { - Ok(HandshakeSignatureValid::assertion()) - } - - fn verify_tls13_signature( - &self, - _message: &[u8], - _cert: &rustls_pki_types::CertificateDer<'_>, - _dss: &rustls::DigitallySignedStruct, - ) -> Result { - Ok(HandshakeSignatureValid::assertion()) - } - - fn supported_verify_schemes(&self) -> Vec { - vec![ - SignatureScheme::RSA_PKCS1_SHA1, - SignatureScheme::ECDSA_SHA1_Legacy, - SignatureScheme::RSA_PKCS1_SHA256, - SignatureScheme::ECDSA_NISTP256_SHA256, - SignatureScheme::RSA_PKCS1_SHA384, - SignatureScheme::ECDSA_NISTP384_SHA384, - SignatureScheme::RSA_PKCS1_SHA512, - SignatureScheme::ECDSA_NISTP521_SHA512, - SignatureScheme::RSA_PSS_SHA256, - SignatureScheme::RSA_PSS_SHA384, - SignatureScheme::RSA_PSS_SHA512, - SignatureScheme::ED25519, - SignatureScheme::ED448, - ] +impl> HexEncode for T { + fn hex_encode(&self) -> String { + let bytes = self.as_ref(); + let mut s = String::with_capacity(bytes.len() * 2); + for &b in bytes { + let _ = write!(&mut s, "{b:02x}"); + } + s } } diff --git a/crates/utils/src/tls.rs b/crates/utils/src/tls.rs new file mode 100644 index 00000000..2f3ef8db --- /dev/null +++ b/crates/utils/src/tls.rs @@ -0,0 +1,87 @@ +/* + * SPDX-FileCopyrightText: 2020 Stalwart Labs LLC + * + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL + */ + +use rustls::{ + ClientConfig, SignatureScheme, + client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier}, +}; +use rustls_platform_verifier::BuilderVerifierExt; +use std::sync::Arc; +use tokio_rustls::TlsConnector; + +pub fn rustls_client_config(allow_invalid_certs: bool) -> Result { + let config = ClientConfig::builder(); + + if !allow_invalid_certs { + config + .with_platform_verifier() + .map(|config| config.with_no_client_auth()) + .map_err(|err| format!("Failed to build platform verifier: {err}")) + } else { + Ok(config + .dangerous() + .with_custom_certificate_verifier(Arc::new(DummyVerifier {})) + .with_no_client_auth()) + } +} + +pub fn build_tls_connector(allow_invalid_certs: bool) -> Result { + rustls_client_config(allow_invalid_certs) + .map(Arc::new) + .map(TlsConnector::from) +} + +#[derive(Debug)] +struct DummyVerifier; + +impl ServerCertVerifier for DummyVerifier { + fn verify_server_cert( + &self, + _end_entity: &rustls_pki_types::CertificateDer<'_>, + _intermediates: &[rustls_pki_types::CertificateDer<'_>], + _server_name: &rustls_pki_types::ServerName<'_>, + _ocsp_response: &[u8], + _now: rustls_pki_types::UnixTime, + ) -> Result { + Ok(ServerCertVerified::assertion()) + } + + fn verify_tls12_signature( + &self, + _message: &[u8], + _cert: &rustls_pki_types::CertificateDer<'_>, + _dss: &rustls::DigitallySignedStruct, + ) -> Result { + Ok(HandshakeSignatureValid::assertion()) + } + + fn verify_tls13_signature( + &self, + _message: &[u8], + _cert: &rustls_pki_types::CertificateDer<'_>, + _dss: &rustls::DigitallySignedStruct, + ) -> Result { + Ok(HandshakeSignatureValid::assertion()) + } + + fn supported_verify_schemes(&self) -> Vec { + vec![ + SignatureScheme::RSA_PKCS1_SHA1, + SignatureScheme::ECDSA_SHA1_Legacy, + SignatureScheme::RSA_PKCS1_SHA256, + SignatureScheme::ECDSA_NISTP256_SHA256, + SignatureScheme::RSA_PKCS1_SHA384, + SignatureScheme::ECDSA_NISTP384_SHA384, + SignatureScheme::RSA_PKCS1_SHA512, + SignatureScheme::ECDSA_NISTP521_SHA512, + SignatureScheme::RSA_PSS_SHA256, + SignatureScheme::RSA_PSS_SHA384, + SignatureScheme::RSA_PSS_SHA512, + SignatureScheme::ED25519, + SignatureScheme::ED448, + ] + } +} diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 89cf56e2..a21b89cb 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "tests" -version = "0.15.5" +version = "0.16.0" edition = "2024" [features] #default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis", "nats", "azure", "foundationdb"] #default = ["sqlite", "postgres", "mysql", "rocks", "s3", "redis", "foundationdb"] -default = ["rocks"] +default = ["rocks", "sqlite", "redis"] sqlite = ["store/sqlite", "directory/sqlite"] foundationdb = ["store/foundation", "common/foundation"] postgres = ["store/postgres", "directory/postgres"] @@ -15,6 +15,7 @@ rocks = ["store/rocks"] s3 = ["store/s3"] redis = ["store/redis", "coordinator/redis"] nats = ["coordinator/nats"] +kafka = ["coordinator/kafka"] azure = ["store/azure"] [dev-dependencies] @@ -44,16 +45,15 @@ migration = { path = "../crates/migration", features = ["test_mode", "enterprise trc = { path = "../crates/trc", features = ["enterprise"] } managesieve = { path = "../crates/managesieve", features = ["test_mode", "enterprise"] } smtp-proto = { version = "0.2" } -mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] } mail-auth = { path = "/Users/me/code/mail-auth", features = ["test"] } mail-parser = { version = "0.11", features = ["full_encoding", "rkyv"] } mail-builder = "0.4.4" sieve-rs = { version = "0.7", features = ["rkyv"] } utils = { path = "../crates/utils", features = ["test_mode"] } -jmap-client = { version = "0.4", features = ["websockets", "debug", "async"] } +jmap-client = { path = "/Users/me/code/jmap-client", features = ["websockets", "debug", "async"] } tokio = { version = "1.47", features = ["full"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] } -rustls = { version = "0.23.5", default-features = false, features = ["std", "ring", "tls12"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws_lc_rs", "tls12"] } +rustls = { version = "0.23.5", default-features = false, features = ["std", "aws_lc_rs", "tls12"] } rustls-pemfile = "2.0" rustls-pki-types = { version = "1" } csv = "1.1" @@ -61,7 +61,7 @@ rayon = { version = "1.5.1" } flate2 = { version = "1.0.17", features = ["zlib"], default-features = false } serde = { version = "1.0", features = ["derive"]} serde_json = "1.0" -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots", "multipart", "http2"]} +reqwest = { version = "0.13", default-features = false, features = ["rustls", "multipart", "http2", "form"]} bytes = "1.4.0" futures = "0.3" ece = "2.2" diff --git a/tests/resources/smtp/config/if-blocks.toml b/tests/resources/smtp/config/if-blocks.toml deleted file mode 100644 index ad70d794..00000000 --- a/tests/resources/smtp/config/if-blocks.toml +++ /dev/null @@ -1,34 +0,0 @@ -durations = [ - {if = "sender = 'jdoe'", then = "5d"}, - {if = "priority = -1 | starts_with(rcpt, 'jane')", then = "1h"}, - {else = false} -] - -string-list = [ - {if = "sender = 'jdoe'", then = "['From', 'To', 'Date']"}, - {if = "priority = -1 | starts_with(rcpt, 'jane')", then = "'Other-ID'"}, - {else = "[]"} -] - -string-list-bis = [ - {if = "sender = 'jdoe'", then = "['From', 'To', 'Date']"}, - {if = "priority = -1 | starts_with(rcpt, 'jane')", then = "[]"}, - {else = "['ID-Bis']"} -] - -single-value = "'hello world'" - -bad-if-without-then = [ - {if = "sender = 'jdoe'"}, - {else = 1} -] - -bad-if-without-else = [ - {if = "sender = 'jdoe'", then = 1} -] - -bad-multiple-else = [ - {if = "sender = 'jdoe'", then = 1}, - {else = 1}, - {else = 2} -] diff --git a/tests/resources/smtp/config/lists.toml b/tests/resources/smtp/config/lists.toml deleted file mode 100644 index 9ad09c52..00000000 --- a/tests/resources/smtp/config/lists.toml +++ /dev/null @@ -1,19 +0,0 @@ -[list] -local-domains = ["example.org", "example.net"] -spammer-domains = "thatdomain.net" -local-users = "file://{LIST1}" -power-users = ["file://{LIST1}", "file://{LIST2}"] - -[remote."lmtp"] -address = 192.168.0.1 -port = 25 -protocol = "lmtp" -lookup = true - -[remote."lmtp".auth] -username = "hello" -secret = "world" - -[remote."lmtp".tls] -implicit = true -allow-invalid-certs = true diff --git a/tests/resources/smtp/config/rules-dynvalue.toml b/tests/resources/smtp/config/rules-dynvalue.toml deleted file mode 100644 index e38aa8d6..00000000 --- a/tests/resources/smtp/config/rules-dynvalue.toml +++ /dev/null @@ -1,63 +0,0 @@ - -[envelope] -rcpt-domain = "foo.example.org" -rcpt = "user@foo.example.org" -sender-domain = "foo.net" -sender = "bill@foo.net" -local-ip = "192.168.9.3" -remote-ip = "A:B:C::D:E" -mx = "mx.somedomain.com" -authenticated-as = "john@foobar.org" -priority = -4 -listener = "smtp" -helo-domain = "hi-domain.net" - -[eval."eq"] -test = [ - {if = "sender = 'bill@foo.net'", then = "sender"}, - {else = false} -] -expect = "bill@foo.net" - -[eval."starts-with"] -test = [ - {if = "starts_with(rcpt_domain, 'foo')", then = "'mx.' + rcpt_domain"}, - {else = false} -] -expect = "mx.foo.example.org" - -[eval."regex"] -test = [ - {if = "matches('^([^.]+)@([^.]+)\.(.+)$', rcpt)", then = "$1 + '+' + $2 + '@' + $3"}, - {else = false} -] -expect = "user+foo@example.org" - -[eval."regex-full"] -test = [ - {if = "matches('^([^.]+)@([^.]+)\.(.+)$', rcpt)", then = "rcpt"}, - {else = false} -] -expect = "user@foo.example.org" - -[eval."envelope-match"] -test = [ - {if = "matches('^([^.]+)@(.+)$', authenticated_as)", then = "'rcpt ' + rcpt + ' listener ' + listener + ' ip ' + local_ip + ' priority ' + priority"}, - {else = false} -] -expect = "rcpt user@foo.example.org listener smtp ip 192.168.9.3 priority -4" - -[eval."static-match"] -test = [ - {if = "matches('^([^.]+)@(.+)$', authenticated_as)", then = "'hello world'"}, - {else = false} -] -expect = "hello world" - -[eval."no-match"] -test = [ - {if = "matches('^([^.]+)@([^.]+)\.(.+)$org', authenticated_as)", then = "'test'"}, - {else = false} -] -expect = false - diff --git a/tests/resources/smtp/config/rules-eval.toml b/tests/resources/smtp/config/rules-eval.toml deleted file mode 100644 index e74c7dcd..00000000 --- a/tests/resources/smtp/config/rules-eval.toml +++ /dev/null @@ -1,34 +0,0 @@ -[envelope] -rcpt-domain = "example.org" -rcpt = "user@example.org" -sender-domain = "foo.net" -sender = "bill@foo.net" -local-ip = "192.168.9.3" -remote-ip = "A:B:C::D:E" -mx = "mx.somedomain.com" -authenticated-as = "john@foobar.org" -priority = -4 -listener = "smtp" -helo-domain = "hi-domain.net" - -[rule] -"eq-true" = "rcpt_domain = 'example.org'" -"eq-false" = "rcpt_domain = 'example.com'" -"listener-eq-true" = "listener = 'smtp'" -"listener-eq-false" = "listener = 'smtps'" -"ip-eq-true" = "local_ip = '192.168.9.3'" -"ip-eq-false" = "remote_ip = 'A:B:C::D:E'" -"ne-true" = "!is_empty(authenticated_as)" -"ne-false" = "authenticated_as != 'john@foobar.org'" -"starts-with-true" = "starts_with(mx, 'mx.some')" -"starts-with-false" = "starts_with(mx, 'enchilada')" -"ends-with-true" = "ends_with(sender, '@foo.net')" -"ends-with-false" = "ends_with(sender, 'chimichanga')" -"regex-true" = "matches('^(.+)@(.+)$', sender)" -"regex-false" = "matches('/^\\S+@\\S+\\.\\S+$/', mx)" -"any-of-true" = "authenticated_as != 'john@foobar.org' | rcpt_domain = 'example.org' | starts_with(mx, 'mx.some')" -"any-of-false" = "authenticated_as = 'something else' | rcpt_domain = 'something else' | starts_with(mx, 'something else')" -"all-of-true" = "rcpt_domain = 'example.org' & listener = 'smtp' & starts_with(mx, 'mx.some')" -"all-of-false" = "rcpt_domain = 'example.org' & listener = 'smtp' & starts_with(mx, 'something else')" -"none-of-true" = "!(authenticated_as = 'something else' | rcpt_domain = 'something else' | starts_with(mx, 'something else'))" -"none-of-false" = "!(rcpt_domain = 'example.org' | listener = 'smtp' | starts_with(mx, 'mx.some'))" diff --git a/tests/resources/smtp/config/rules.toml b/tests/resources/smtp/config/rules.toml deleted file mode 100644 index 83f9fa63..00000000 --- a/tests/resources/smtp/config/rules.toml +++ /dev/null @@ -1,29 +0,0 @@ -[rule] -"my-nested-rule" = { any-of = [ - {if = "rcpt-domain", eq = "example.org"}, - {if = "remote-ip", eq = "192.168.0.0/24"}, - {all-of = [ - {if = "rcpt", starts-with = "no-reply@"}, - {if = "sender", ends-with = "@domain.org"}, - {none-of = [ - {if = "priority", eq = 1}, - {if = "priority", ne = -2}, - ]} - ]} -]} - -[rule."simple"] -if = "listener" -eq = "smtp" - -[rule."is-authenticated"] -if = "authenticated-as" -ne = "" - -[[rule."expanded".all-of]] -if = "sender-domain" -starts-with = "example" - -[[rule."expanded".all-of]] -if = "sender" -in-list = "test-list" diff --git a/tests/resources/smtp/config/servers.toml b/tests/resources/smtp/config/servers.toml deleted file mode 100644 index 1eac1447..00000000 --- a/tests/resources/smtp/config/servers.toml +++ /dev/null @@ -1,53 +0,0 @@ -[server] -hostname = "mx.example.org" -greeting = "Stalwart SMTP - hi there!" - -[server.listener."smtp"] -bind = ["127.0.0.1:9925"] -protocol = "smtp" -tls.implicit = false - -[server.listener."smtps"] -bind = ["127.0.0.1:9465", "127.0.0.1:9466"] -protocol = "smtp" -max-connections = 1024 -tls.implicit = true -tls.ciphers = ["TLS13_CHACHA20_POLY1305_SHA256", "TLS13_AES_256_GCM_SHA384"] -socket.ttl = 4096 - -[server.listener."submission"] -greeting = "Stalwart SMTP submission at your service" -protocol = "smtp" -hostname = "submit.example.org" -bind = "127.0.0.1:9991" -#tls.sni = [{subject = "submit.example.org", certificate = "other"}, -# {subject = "submission.example.org", certificate = "other"}] -socket.backlog = 2048 - -[server.tls] -enable = true -implicit = true -timeout = 300 -certificate = "default" -#sni = [{subject = "other.domain.org", certificate = "default"}] -protocols = ["TLSv1.2", "TLSv1.3"] -ciphers = [] -ignore_client_order = true - -[server.socket] -reuse-addr = true -reuse-port = true -backlog = 1024 -ttl = 3600 -send-buffer-size = 65535 -recv-buffer-size = 65535 -linger = 1 -tos = 1 - -[certificate."default"] -cert = "%{file:{CERT}}%" -private-key = "%{file:{PK}}%" - -[certificate."other"] -cert = "%{file:{CERT}}%" -private-key = "%{file:{PK}}%" diff --git a/tests/resources/smtp/config/throttle.toml b/tests/resources/smtp/config/throttle.toml deleted file mode 100644 index 5082cbf4..00000000 --- a/tests/resources/smtp/config/throttle.toml +++ /dev/null @@ -1,11 +0,0 @@ -[[throttle]] -match = "remote_ip == '127.0.0.1'" -key = ["remote_ip", "authenticated_as"] -rate = "50/30s" -enable = true - -[[throttle]] -key = "sender_domain" -rate = "50/30s" -enable = true - diff --git a/tests/resources/smtp/config/toml-parser.toml b/tests/resources/smtp/config/toml-parser.toml deleted file mode 100644 index c0a536fb..00000000 --- a/tests/resources/smtp/config/toml-parser.toml +++ /dev/null @@ -1,71 +0,0 @@ -[database] -enabled = true # ignore -ports = [ 8000, 8001, 8002 ] # ignore -data = [ ["delta", "phi"], [3.14] ] -temp_targets = { cpu = 79.5, case = 72.0 } - -[servers] -"127.0.0.1" = "value" # ignore -"character encoding" = "value" - -[servers.alpha] -ip = "10.0.0.1" -role = "frontend" - -[servers.beta] -ip = "10.0.0.2" -role = "backend" - -[[products]] -name = "Hammer" -sku = 738594937 - -[[products]] # empty table within the array - -[[products]] # ignore -name = "Nail" -sku = 284758393 # ignore -color = "gray" - -[strings."my \"string\" test"] -str1 = "I'm a string." -str2 = "You can \"quote\" me." -str3 = "Name\tTabs\nNew Line." -lines = ''' -The first newline is -trimmed in raw strings. -All other whitespace -is preserved. -''' - -[sets] -integer = { 1 } -integers = { 1, 2, 3 } -string = { "red" } -strings = { "red", "yellow", "green" } - -[arrays] -integers = [ 1, 2, 3 ] -colors = [ "red", "yellow", "green" ] -nested_arrays_of_ints = [ [ 1, 2 ], [3, 4, 5] ] -nested_mixed_array = [ [ 1, 2 ], ["a", "b", "c"] ] -string_array = [ "all", 'strings', """are the same""", '''type''' ] - -# Mixed-type arrays are allowed -numbers = [ 0.1, 0.2, 0.5, 1, 2, 5 ] -integers2 = [ - 1, 2, 3 # this is ok -] -integers3 = [ - 4, - # comment in the middle - 5, # this is ok -] -contributors = [ - "Foo Bar " , - { name = "Baz Qux", email = "bazqux@example.com", url = "https://example.com/bazqux" } -] - -[env] -var1 = !CARGO_PKG_NAME -var2 = !CARGO_PKG_NAME #comment diff --git a/tests/src/directory/sql.rs b/tests/src/directory/sql.rs index 4bb01835..447fae49 100644 --- a/tests/src/directory/sql.rs +++ b/tests/src/directory/sql.rs @@ -78,6 +78,7 @@ pub async fn test() { column_email: "name".into(), column_secret: "secret".into(), store: SqlAuthStore::Default, + member_tenant_id: None, }; // Test authentication diff --git a/tests/src/imap/thread.rs b/tests/src/imap/thread.rs index d934e59c..fd8fec3c 100644 --- a/tests/src/imap/thread.rs +++ b/tests/src/imap/thread.rs @@ -46,6 +46,7 @@ pub async fn test(imap: &mut ImapConnection, _imap_check: &mut ImapConnection, t } // Obtain ThreadId and MessageId of the first message + test.wait_for_tasks().await; imap.send("SELECT Manchego").await; imap.assert_read(Type::Tagged, ResponseType::Ok).await; diff --git a/tests/src/jmap/contacts/contact.rs b/tests/src/jmap/contacts/contact.rs index 8db607b1..293125f9 100644 --- a/tests/src/jmap/contacts/contact.rs +++ b/tests/src/jmap/contacts/contact.rs @@ -84,6 +84,7 @@ pub async fn test(test: &TestServer) { let tmp_contact_id = response.created(3).id().to_string(); // Destroy tmp contact + test.wait_for_tasks().await; assert_eq!( account .jmap_destroy( @@ -438,6 +439,7 @@ END:VCARD"# })); // Deletion tests + test.wait_for_tasks().await; assert_eq!( account .jmap_destroy( diff --git a/tests/src/smtp/inbound/rewrite.rs b/tests/src/smtp/inbound/rewrite.rs index 3cce8b7d..b97f1e3c 100644 --- a/tests/src/smtp/inbound/rewrite.rs +++ b/tests/src/smtp/inbound/rewrite.rs @@ -7,8 +7,8 @@ use crate::{smtp::session::TestSession, utils::server::TestServerBuilder}; use registry::{ schema::structs::{ - Expression, ExpressionMatch, MtaStageMail, MtaStageRcpt, - SieveSystemInterpreter, SieveSystemScript, + Expression, ExpressionMatch, MtaStageMail, MtaStageRcpt, SieveSystemInterpreter, + SieveSystemScript, }, types::list::List, }; @@ -27,43 +27,49 @@ if allof( envelope :localpart :contains "to" ".", } "#; -#[tokio::test] -async fn address_rewrite() { - let mut test = TestServerBuilder::new("smtp_rewrite_test") - .await - .with_http_listener(19007) - .await - .disable_services() +#[test] +fn address_rewrite() { + tokio::runtime::Builder::new_multi_thread() + .thread_stack_size(8 * 1024 * 1024) // 8MB stack + .enable_all() .build() - .await; + .unwrap() + .block_on(async { + let mut test = TestServerBuilder::new("smtp_rewrite_test") + .await + .with_http_listener(19007) + .await + .disable_services() + .build() + .await; - // Add test settings - let admin = test.account("admin"); - admin.mta_no_auth().await; - admin - .registry_create_object(MtaStageMail { - rewrite: Expression { - match_: List::from_iter([ - ExpressionMatch { - if_: "ends_with(sender_domain, '.foobar.net') & matches('^([^.]+)@([^.]+)\\.(.+)$', sender)".into(), - then: "$1 + '+' + $2 + '@' + $3".into(), + // Add test settings + let admin = test.account("admin"); + admin.mta_no_auth().await; + admin + .registry_create_object(MtaStageMail { + rewrite: Expression { + match_: List::from_iter([ExpressionMatch { + if_: concat!( + "ends_with(sender_domain, '.foobar.net') & ", + "matches('^([^.]+)@([^.]+)\\.(.+)$', sender)" + ) + .into(), + then: "$1 + '+' + $2 + '@' + $3".into(), + }]), + else_: "false".into(), }, - ]), - else_: "false".into(), - }, - script: Expression { - match_: List::from_iter([ - ExpressionMatch { - if_: "sender_domain = 'foobar.org'".into(), - then: "'mail'".into(), + script: Expression { + match_: List::from_iter([ExpressionMatch { + if_: "sender_domain = 'foobar.org'".into(), + then: "'mail'".into(), + }]), + else_: "false".into(), }, - ]), - else_: "false".into(), - }, - ..Default::default() - }) - .await; - admin + ..Default::default() + }) + .await; + admin .registry_create_object(MtaStageRcpt { rewrite: Expression { match_: List::from_iter([ExpressionMatch { @@ -87,80 +93,81 @@ async fn address_rewrite() { ..Default::default() }) .await; - admin - .registry_create_object(SieveSystemInterpreter { - default_from_address: Expression { - else_: "'sieve@foobar.org'".into(), - ..Default::default() - }, + admin + .registry_create_object(SieveSystemInterpreter { + default_from_address: Expression { + else_: "'sieve@foobar.org'".into(), + ..Default::default() + }, - default_from_name: Expression { - else_: "'Sieve Daemon'".into(), - ..Default::default() - }, - default_return_path: Expression { - else_: "''".into(), - ..Default::default() - }, - message_id_hostname: Some("'mx.foobar.org'".into()), - duplicate_expiry: (86_400u64 * 100 * 7).into(), - max_cpu_cycles: 10000, - max_nested_includes: 5, - max_out_messages: 5, - max_received_headers: 50, - max_redirects: 3, - ..Default::default() - }) - .await; - for (name, contents) in [("mail", MAIL_SCRIPT), ("rcpt", MAIL_RCPT)] { - admin - .registry_create_object(SieveSystemScript { - name: name.to_string(), - contents: contents.to_string(), - is_active: true, - ..Default::default() - }) - .await; - } - admin.reload_settings().await; - test.reload_core(); + default_from_name: Expression { + else_: "'Sieve Daemon'".into(), + ..Default::default() + }, + default_return_path: Expression { + else_: "''".into(), + ..Default::default() + }, + message_id_hostname: Some("'mx.foobar.org'".into()), + duplicate_expiry: (86_400u64 * 100 * 7).into(), + max_cpu_cycles: 10000, + max_nested_includes: 5, + max_out_messages: 5, + max_received_headers: 50, + max_redirects: 3, + ..Default::default() + }) + .await; + for (name, contents) in [("mail", MAIL_SCRIPT), ("rcpt", MAIL_RCPT)] { + admin + .registry_create_object(SieveSystemScript { + name: name.to_string(), + contents: contents.to_string(), + is_active: true, + ..Default::default() + }) + .await; + } + admin.reload_settings().await; + test.reload_core(); - // Init session - let mut session = test.new_mta_session(); - session.data.remote_ip_str = "10.0.0.1".into(); - session.eval_session_params().await; - session.ehlo("mx.doe.org").await; + // Init session + let mut session = test.new_mta_session(); + session.data.remote_ip_str = "10.0.0.1".into(); + session.eval_session_params().await; + session.ehlo("mx.doe.org").await; - // Sender rewrite using regex - session.mail_from("bill@doe.foobar.net", "250").await; - assert_eq!( - session.data.mail_from.as_ref().unwrap().address, - "bill+doe@foobar.net" - ); - session.reset(); + // Sender rewrite using regex + session.mail_from("bill@doe.foobar.net", "250").await; + assert_eq!( + session.data.mail_from.as_ref().unwrap().address, + "bill+doe@foobar.net" + ); + session.reset(); - // Sender rewrite using sieve - session.mail_from("this_is_admin@foobar.org", "250").await; - assert_eq!( - session.data.mail_from.as_ref().unwrap().address_lcase, - "mailer-daemon@foobar.org" - ); + // Sender rewrite using sieve + session.mail_from("this_is_admin@foobar.org", "250").await; + assert_eq!( + session.data.mail_from.as_ref().unwrap().address_lcase, + "mailer-daemon@foobar.org" + ); - // Recipient rewrite using regex - session.rcpt_to("mary.smith@foobar.net", "250").await; - assert_eq!( - session.data.rcpt_to.last().unwrap().address, - "mary+smith@foobar.net" - ); + // Recipient rewrite using regex + session.rcpt_to("mary.smith@foobar.net", "250").await; + assert_eq!( + session.data.rcpt_to.last().unwrap().address, + "mary+smith@foobar.net" + ); - // Remove duplicates - session.rcpt_to("mary.smith@foobar.net", "250").await; - assert_eq!(session.data.rcpt_to.len(), 1); + // Remove duplicates + session.rcpt_to("mary.smith@foobar.net", "250").await; + assert_eq!(session.data.rcpt_to.len(), 1); - // Recipient rewrite using sieve - session.rcpt_to("m.a.r.y.s.m.i.t.h@foobar.org", "250").await; - assert_eq!( - session.data.rcpt_to.last().unwrap().address, - "marysmith@foobar.org" - ); + // Recipient rewrite using sieve + session.rcpt_to("m.a.r.y.s.m.i.t.h@foobar.org", "250").await; + assert_eq!( + session.data.rcpt_to.last().unwrap().address, + "marysmith@foobar.org" + ); + }); } diff --git a/tests/src/smtp/management/queue.rs b/tests/src/smtp/management/queue.rs index ea3b07c4..8362d9a3 100644 --- a/tests/src/smtp/management/queue.rs +++ b/tests/src/smtp/management/queue.rs @@ -38,7 +38,7 @@ async fn manage_queue() { .await; let mut remote = TestServerBuilder::new("smtp_manage_queue_remote") .await - .with_dummy_tls_cert() + .with_dummy_tls_cert(["*.foobar.org"]) .await .with_http_listener(19050) .await diff --git a/tests/src/smtp/outbound/dane.rs b/tests/src/smtp/outbound/dane.rs index 04cbebca..b2281a25 100644 --- a/tests/src/smtp/outbound/dane.rs +++ b/tests/src/smtp/outbound/dane.rs @@ -53,7 +53,7 @@ async fn dane_verify() { .await; let mut remote = TestServerBuilder::new("smtp_dane_remote") .await - .with_dummy_tls_cert() + .with_dummy_tls_cert(["*.foobar.org"]) .await .with_http_listener(19019) .await diff --git a/tests/src/smtp/outbound/mta_sts.rs b/tests/src/smtp/outbound/mta_sts.rs index 455e0865..a3c6bfab 100644 --- a/tests/src/smtp/outbound/mta_sts.rs +++ b/tests/src/smtp/outbound/mta_sts.rs @@ -47,7 +47,7 @@ async fn mta_sts_verify() { .await .with_smtp_listener(9925) .await - .with_dummy_tls_cert() + .with_dummy_tls_cert(["*.foobar.org"]) .await .disable_services() .capture_queue() diff --git a/tests/src/store/ops.rs b/tests/src/store/ops.rs index f57f5376..6e94d8fa 100644 --- a/tests/src/store/ops.rs +++ b/tests/src/store/ops.rs @@ -31,8 +31,7 @@ pub async fn test(test: &TestServer) { let db = test.server.store().clone(); #[cfg(feature = "foundationdb")] - if matches!(db, Store::FoundationDb(_)) { - use store::Store; + if matches!(db, store::Store::FoundationDb(_)) { use store::write::RegistryClass; println!("Running FoundationDB chunked iterator test..."); let kvs = [ diff --git a/tests/src/store/registry.rs b/tests/src/store/registry.rs index 2b6a8801..437b13f1 100644 --- a/tests/src/store/registry.rs +++ b/tests/src/store/registry.rs @@ -15,8 +15,8 @@ use registry::{ Account, CertificateManagement, Credential, CredentialPermissions, CredentialPermissionsList, CustomRoles, DkimManagement, DnsManagement, Domain, EmailAlias, EncryptionAtRest, EncryptionSettings, GroupAccount, MailingList, - PasswordCredential, Permissions, PermissionsList, PublicKey, Roles, - SecondaryCredential, UserAccount, UserRoles, + PasswordCredential, Permissions, PermissionsList, PublicKey, SecondaryCredential, + UserAccount, UserRoles, }, }, types::{ @@ -222,7 +222,7 @@ pub async fn test(test: &TestServer) { trc::location!(), ) .await; - account.assert_patch("roles", Roles::Default.into_value(), trc::location!()); + account.assert_patch("roles", UserRoles::User.into_value(), trc::location!()); let account_id = r .write(RegistryWrite::insert(&account.into())) diff --git a/tests/src/system/oidc.rs b/tests/src/system/oidc.rs index 8ef171dc..b5c797d5 100644 --- a/tests/src/system/oidc.rs +++ b/tests/src/system/oidc.rs @@ -258,7 +258,6 @@ pub async fn test(test: &mut TestServer) { // Try POP3 OAUTHBEARER auth let mut pop3 = Pop3Connection::connect().await; - pop3.assert_read(crate::utils::pop3::ResponseType::Ok).await; pop3.send(&format!("AUTH OAUTHBEARER {oauth_bearer_sasl}")) .await; pop3.assert_read(crate::utils::pop3::ResponseType::Ok).await; diff --git a/tests/src/utils/cleanup.rs b/tests/src/utils/cleanup.rs index 57183e73..456ef53b 100644 --- a/tests/src/utils/cleanup.rs +++ b/tests/src/utils/cleanup.rs @@ -419,6 +419,8 @@ fn is_allowed_registry_type(object_type: ObjectType) -> bool { | ObjectType::MtaRoute | ObjectType::MtaTlsStrategy | ObjectType::MtaVirtualQueue + | ObjectType::MtaConnectionStrategy + | ObjectType::MtaInboundThrottle | ObjectType::Tracer | ObjectType::Domain ) diff --git a/tests/src/utils/pop3.rs b/tests/src/utils/pop3.rs index dfa40867..388553b7 100644 --- a/tests/src/utils/pop3.rs +++ b/tests/src/utils/pop3.rs @@ -5,7 +5,6 @@ */ use base64::{Engine, engine::general_purpose}; -use mail_send::smtp::tls::build_tls_connector; use rustls_pki_types::ServerName; use std::time::Duration; use tokio::{ @@ -13,6 +12,7 @@ use tokio::{ net::TcpStream, }; use tokio_rustls::client::TlsStream; +use utils::tls::build_tls_connector; #[derive(Debug, Clone, PartialEq, Eq)] pub enum ResponseType { @@ -30,6 +30,7 @@ impl Pop3Connection { pub async fn connect() -> Self { let (reader, writer) = tokio::io::split( build_tls_connector(true) + .unwrap() .connect( ServerName::try_from("pop3.example.org").unwrap().to_owned(), TcpStream::connect("127.0.0.1:4110").await.unwrap(), diff --git a/tests/src/utils/server.rs b/tests/src/utils/server.rs index 9df7a95c..544b9c2f 100644 --- a/tests/src/utils/server.rs +++ b/tests/src/utils/server.rs @@ -46,7 +46,7 @@ use registry::{ Tracer, TracerStdout, }, }, - types::{EnumImpl, map::Map}, + types::{EnumImpl, datetime::UTCDateTime, map::Map}, }; use services::{SpawnServices, broadcast::subscriber::spawn_broadcast_subscriber}; use smtp::{ @@ -62,7 +62,7 @@ use std::{path::PathBuf, str::FromStr, sync::Arc}; use store::{ RegistryStore, Store, ValueKey, registry::{RegistryQuery, bootstrap::Bootstrap, write::RegistryWrite}, - write::{AlignedBytes, Archive}, + write::{AlignedBytes, Archive, now}, }; use tokio::sync::{mpsc, watch}; use trc::EventType; @@ -91,6 +91,7 @@ pub struct TestServerBuilder { impl TestServerBuilder { pub async fn new(test_name: &str) -> Self { + let _ = rustls::crypto::aws_lc_rs::default_provider().install_default(); let reset = std::env::var("NO_INSERT").is_err(); Self::new_with_role(test_name, "mail.example.org".to_string(), None, reset).await @@ -167,7 +168,7 @@ impl TestServerBuilder { .await } - pub async fn with_dummy_tls_cert(self) -> Self { + pub async fn with_dummy_tls_cert(self, sans: impl IntoIterator) -> Self { let mut cert_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")); cert_path.push("resources"); let mut cert = cert_path.clone(); @@ -182,7 +183,11 @@ impl TestServerBuilder { certificate: PublicText::File(SecretKeyFile { file_path: cert.to_string_lossy().to_string(), }), - + issuer: "Stalwart Test CA".to_string(), + not_valid_after: UTCDateTime::from_timestamp((now() + 86400) as i64), + subject_alternative_names: Map::new( + sans.into_iter().map(|san| san.to_string()).collect(), + ), ..Default::default() }) .await diff --git a/tests/src/utils/sieve.rs b/tests/src/utils/sieve.rs index 8e5f1532..d9877b97 100644 --- a/tests/src/utils/sieve.rs +++ b/tests/src/utils/sieve.rs @@ -6,7 +6,6 @@ use base64::{Engine, engine::general_purpose}; use imap_proto::ResponseType; -use mail_send::smtp::tls::build_tls_connector; use rustls_pki_types::ServerName; use std::time::Duration; use tokio::{ @@ -14,6 +13,7 @@ use tokio::{ net::TcpStream, }; use tokio_rustls::client::TlsStream; +use utils::tls::build_tls_connector; pub struct SieveConnection { reader: Lines>>>, @@ -24,6 +24,7 @@ impl SieveConnection { pub async fn connect() -> Self { let (reader, writer) = tokio::io::split( build_tls_connector(true) + .unwrap() .connect( ServerName::try_from("imap.example.org").unwrap().to_owned(), TcpStream::connect("127.0.0.1:4190").await.unwrap(),