diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab63e5b16..dbd77e872 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,9 +103,9 @@ jobs: - os: macos-latest rust: 1.83.0 - # Minimum Supported Rust Version = 1.77.0 + # Minimum Supported Rust Version = 1.81.0 - os: ubuntu-latest - rust: 1.77.0 + rust: 1.81.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index ddeb238ac..afef8795a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,73 @@ # Changelog +## [1.152.0] - 2024-12-12 + +### API-Changes + +- [**breaking**] Remove `dc_prepare_msg` and `dc_msg_is_increation`. + +### Build system + +- Increase MSRV to 1.81.0. + +### Features / Changes + +- Cache HTTP GET requests. +- Prefix server-url in info. +- Set `mime_modified` for the last message part, not the first ([#4462](https://github.com/deltachat/deltachat-core-rust/pull/4462)). + +### Fixes + +- Render "message" parts in multipart messages' HTML ([#4462](https://github.com/deltachat/deltachat-core-rust/pull/4462)). +- Ignore garbage at the end of the keys. + +## [1.151.6] - 2024-12-11 + +### Features / Changes + +- Don't add "Failed to send message to ..." info messages to group chats. +- Add info messages about implicit membership changes if group member list is recreated ([#6314](https://github.com/deltachat/deltachat-core-rust/pull/6314)). + +### Fixes + +- Add self-addition message to chat when recreating member list. +- Do not subscribe to heartbeat if already subscribed via metadata. + +### Build system + +- Add idna 0.5.0 exception into deny.toml. + +### Documentation + +- Update links to Node.js bindings in the README. + +### Refactor + +- Factor out `wait_for_all_work_done()`. + +### Tests + +- Notifiy more prominently & in more tests about false positives when running `cargo test` ([#6308](https://github.com/deltachat/deltachat-core-rust/pull/6308)). + ## [1.151.5] - 2024-12-05 ### API-Changes - [**breaking**] Remove dc_all_work_done(). +### Security + +- cargo: Update rPGP to 0.14.2. + + This fixes [Panics on Malformed Untrusted Input](https://github.com/rpgp/rpgp/security/advisories/GHSA-9rmp-2568-59rv) + and [Potential Resource Exhaustion when handling Untrusted Messages](https://github.com/rpgp/rpgp/security/advisories/GHSA-4grw-m28r-q285). + This allows the attacker to crash the application via specially crafted messages and keys. + We recommend all users and bot operators to upgrade to the latest version. + There is no impact on the confidentiality of the messages and keys so no action other than upgrading is needed. + ### Fixes - Store plaintext in mime_headers of truncated sent messages ([#6273](https://github.com/deltachat/deltachat-core-rust/pull/6273)). -- cargo: Update rPGP to 0.14.2. ### Documentation @@ -5449,3 +5507,5 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed [1.151.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.2..v1.151.3 [1.151.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.3..v1.151.4 [1.151.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.4..v1.151.5 +[1.151.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.5..v1.151.6 +[1.152.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.6..v1.152.0 diff --git a/Cargo.lock b/Cargo.lock index 42f9dbe4c..ddad53847 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] [[package]] -name = "adler2" -version = "2.0.0" +name = "adler" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" @@ -127,58 +127,57 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" dependencies = [ "backtrace", ] @@ -198,15 +197,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.9" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.6" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii_utils" @@ -227,7 +226,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror 1.0.69", - "time 0.3.37", + "time 0.3.36", ] [[package]] @@ -259,7 +258,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.2.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -290,9 +289,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.18" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302" dependencies = [ "flate2", "futures-core", @@ -376,9 +375,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", @@ -419,22 +418,22 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.7.9" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "base64 0.22.1", + "base64 0.21.7", "bytes", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body", "http-body-util", "hyper", @@ -451,9 +450,9 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.0", "tokio", - "tokio-tungstenite 0.24.0", + "tokio-tungstenite", "tower", "tower-layer", "tower-service", @@ -462,20 +461,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", "tracing", @@ -487,24 +486,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.12", "instant", "rand 0.8.5", ] [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", + "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", ] [[package]] @@ -578,9 +577,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.5" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -636,9 +635,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -646,9 +645,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -656,18 +655,18 @@ dependencies = [ [[package]] name = "buffer-redux" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8acf87c5b9f5897cd3ebb9a327f420e0cae9dd4e5c1d2e36f2c84c571a58f1" +checksum = "4c9f8ddd22e0a12391d1e7ada69ec3b0da1914f1cec39c5cf977143c5b2854f5" dependencies = [ "memchr", ] [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "byte_string" @@ -677,9 +676,9 @@ checksum = "11aade7a05aa8c3a351cedc44c3fc45806430543382fcc4743a9b757a2a0b4ed" [[package]] name = "bytemuck" -version = "1.20.0" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" [[package]] name = "byteorder" @@ -714,18 +713,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.9" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -760,9 +759,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.4" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ "shlex", ] @@ -788,12 +787,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -826,19 +819,19 @@ dependencies = [ [[package]] name = "charset" -version = "0.1.5" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e" +checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" dependencies = [ - "base64 0.22.1", + "base64 0.13.1", "encoding_rs", ] [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -889,18 +882,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstyle", "clap_lex", @@ -908,15 +901,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" -version = "5.4.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" dependencies = [ "error-code", ] @@ -946,9 +939,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" @@ -976,10 +969,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] -name = "constant_time_eq" -version = "0.3.1" +name = "const_format" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -1009,15 +1022,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.7" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1045,9 +1058,9 @@ checksum = "fd121741cf3eb82c08dd3023eb55bf2665e5f60ec20f89760cf836ae4562e6a0" [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -1101,9 +1114,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -1120,9 +1133,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -1226,7 +1239,7 @@ dependencies = [ "cpufeatures", "curve25519-dalek-derive", "digest", - "fiat-crypto 0.2.9", + "fiat-crypto 0.2.6", "rand_core 0.6.4", "rustc_version", "serde", @@ -1288,7 +1301,7 @@ checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", - "hashbrown 0.14.5", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -1311,7 +1324,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.151.5" +version = "1.152.0" dependencies = [ "anyhow", "async-broadcast", @@ -1413,7 +1426,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.151.5" +version = "1.152.0" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1438,7 +1451,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.151.5" +version = "1.152.0" dependencies = [ "anyhow", "deltachat", @@ -1454,7 +1467,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.151.5" +version = "1.152.0" dependencies = [ "anyhow", "deltachat", @@ -1483,7 +1496,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.151.5" +version = "1.152.0" dependencies = [ "anyhow", "deltachat", @@ -1501,9 +1514,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "der_derive", @@ -1527,9 +1540,9 @@ dependencies = [ [[package]] name = "der_derive" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", @@ -1547,18 +1560,18 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.20.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling", "proc-macro2", @@ -1568,9 +1581,9 @@ dependencies = [ [[package]] name = "derive_builder_macro" -version = "0.20.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", "syn 2.0.90", @@ -1653,9 +1666,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", @@ -1675,9 +1688,9 @@ dependencies = [ [[package]] name = "document-features" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" dependencies = [ "litrs", ] @@ -1776,9 +1789,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1821,12 +1834,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" -[[package]] -name = "embedded-io" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" - [[package]] name = "encoded-words" version = "0.2.0" @@ -1907,9 +1914,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "encoding_rs" -version = "0.8.35" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1928,9 +1935,9 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", @@ -1940,18 +1947,18 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.10" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.10" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", @@ -1960,9 +1967,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ "log", "regex", @@ -2004,19 +2011,19 @@ checksum = "a02a5d186d7bf1cb21f1f95e1a9cfa5c1f2dcd803a47aad454423ceec13525c5" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "error-code" -version = "3.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "escaper" @@ -2035,9 +2042,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -2046,11 +2053,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.2.0", "pin-project-lite", ] @@ -2100,9 +2107,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.3.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fd-lock" @@ -2117,9 +2124,9 @@ dependencies = [ [[package]] name = "fdeflate" -version = "0.3.7" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -2142,20 +2149,20 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fiat-crypto" -version = "0.2.9" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "libredox", - "windows-sys 0.59.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2166,9 +2173,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" -version = "1.0.35" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -2176,9 +2183,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", @@ -2192,12 +2199,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" - [[package]] name = "foreign-types" version = "0.3.2" @@ -2322,7 +2323,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ - "fastrand 2.3.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -2413,9 +2414,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -2446,9 +2447,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -2490,16 +2491,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.7" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.2.0", + "http 1.1.0", "indexmap", "slab", "tokio", @@ -2509,9 +2510,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -2519,22 +2520,12 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" -dependencies = [ "allocator-api2", - "equivalent", - "foldhash", ] [[package]] @@ -2543,14 +2534,14 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown 0.14.5", + "hashbrown", ] [[package]] name = "heck" -version = "0.5.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2558,12 +2549,6 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - [[package]] name = "hex" version = "0.4.3" @@ -2646,17 +2631,17 @@ dependencies = [ [[package]] name = "hmac-sha256" -version = "1.1.8" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8575493d277c9092b988c780c94737fb9fd8651a1001e16bee3eccfc1baedb" +checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735" [[package]] name = "home" -version = "0.5.11" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2700,9 +2685,9 @@ dependencies = [ [[package]] name = "http" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2711,12 +2696,12 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.2.0", + "http 1.1.0", ] [[package]] @@ -2727,16 +2712,16 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.9.5" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -2775,15 +2760,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.2" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", "h2", - "http 1.2.0", + "http 1.1.0", "http-body", "httparse", "httpdate", @@ -2796,12 +2781,12 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 1.2.0", + "http 1.1.0", "hyper", "hyper-util", "rustls", @@ -2821,7 +2806,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body", "hyper", "pin-project-lite", @@ -2833,9 +2818,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3018,7 +3003,7 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http 1.2.0", + "http 1.1.0", "http-body-util", "hyper", "hyper-util", @@ -3067,12 +3052,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown", ] [[package]] @@ -3086,9 +3071,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.13" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] @@ -3102,7 +3087,7 @@ dependencies = [ "socket2", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -3136,7 +3121,7 @@ dependencies = [ "governor", "hickory-resolver", "hostname 0.4.0", - "http 1.2.0", + "http 1.1.0", "http-body-util", "hyper", "hyper-util", @@ -3176,11 +3161,11 @@ dependencies = [ "stun-rs", "surge-ping", "thiserror 2.0.7", - "time 0.3.37", + "time 0.3.36", "tokio", "tokio-rustls", "tokio-stream", - "tokio-tungstenite 0.21.0", + "tokio-tungstenite", "tokio-tungstenite-wasm", "tokio-util", "tracing", @@ -3202,7 +3187,7 @@ dependencies = [ "data-encoding", "derive_more", "ed25519-dalek", - "getrandom 0.2.15", + "getrandom 0.2.12", "rand_core 0.6.4", "serde", "thiserror 2.0.7", @@ -3309,7 +3294,7 @@ dependencies = [ "iroh-quinn-proto", "iroh-quinn-udp", "pin-project-lite", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", "socket2", "thiserror 1.0.69", @@ -3326,7 +3311,7 @@ dependencies = [ "bytes", "rand 0.8.5", "ring", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", "rustls-platform-verifier", "slab", @@ -3367,7 +3352,7 @@ dependencies = [ "hickory-proto", "hickory-resolver", "hostname 0.4.0", - "http 1.2.0", + "http 1.1.0", "http-body-util", "hyper", "hyper-util", @@ -3391,10 +3376,10 @@ dependencies = [ "socket2", "stun-rs", "thiserror 2.0.7", - "time 0.3.37", + "time 0.3.36", "tokio", "tokio-rustls", - "tokio-tungstenite 0.21.0", + "tokio-tungstenite", "tokio-tungstenite-wasm", "tokio-util", "tracing", @@ -3404,26 +3389,20 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi", "libc", "windows-sys 0.52.0", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - [[package]] name = "iter-read" -version = "1.1.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071ed4cc1afd86650602c7b11aa2e1ce30762a1c27193201cb5cee9c6ebb1294" +checksum = "a598c1abae8e3456ebda517868b254b6bc2a9bb6501ffd5b9d0875bf332e048b" [[package]] name = "itertools" @@ -3436,9 +3415,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -3462,19 +3441,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ - "once_cell", "wasm-bindgen", ] [[package]] name = "k256" -version = "0.13.4" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -3537,25 +3515,25 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.168" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libm" -version = "0.2.11" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.1.3" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.8", + "redox_syscall 0.4.1", ] [[package]] @@ -3590,9 +3568,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -3619,11 +3597,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.5" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.15.2", + "hashbrown", ] [[package]] @@ -3682,9 +3660,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "mime" @@ -3700,20 +3678,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ - "adler2", + "adler", "simd-adler32", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", @@ -3751,15 +3730,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.12", ] [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ + "lazy_static", "libc", "log", "openssl", @@ -3907,7 +3887,7 @@ dependencies = [ "serde", "socket2", "thiserror 2.0.7", - "time 0.3.37", + "time 0.3.36", "tokio", "tokio-util", "tracing", @@ -3948,13 +3928,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", + "cfg_aliases", "libc", ] @@ -4061,9 +4041,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.45" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -4086,7 +4066,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -4113,9 +4093,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4149,9 +4129,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" -version = "11.1.4" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -4161,9 +4141,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -4193,18 +4173,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.4.1+3.4.0" +version = "300.3.0+3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -4221,13 +4201,13 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "os_info" -version = "3.9.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "serde", - "windows-sys 0.52.0", + "winapi", ] [[package]] @@ -4276,9 +4256,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -4292,15 +4272,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.8", + "redox_syscall 0.4.1", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -4316,9 +4296,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pem" @@ -4347,20 +4327,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.15" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", - "thiserror 2.0.7", + "thiserror 1.0.69", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.15" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -4368,9 +4348,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.15" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", @@ -4381,9 +4361,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.15" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -4479,9 +4459,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4491,9 +4471,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkarr" -version = "2.2.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7945a08031b7e14de57e8385cea3bcc7e10a88701595dc11d82551ba07bae13e" +checksum = "89f9e12544b00f5561253bbd3cb72a85ff3bc398483dc1bf82bdf095c774136b" dependencies = [ "bytes", "document-features", @@ -4536,15 +4516,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plotters" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -4555,15 +4535,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] @@ -4612,9 +4592,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.15" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4648,9 +4628,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.10.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "portmapper" @@ -4674,7 +4654,7 @@ dependencies = [ "smallvec", "socket2", "thiserror 2.0.7", - "time 0.3.37", + "time 0.3.36", "tokio", "tokio-util", "tracing", @@ -4683,22 +4663,22 @@ dependencies = [ [[package]] name = "postcard" -version = "1.1.1" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", - "embedded-io 0.4.0", - "embedded-io 0.6.1", + "const_format", + "embedded-io", "postcard-derive", "serde", ] [[package]] name = "postcard-derive" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0239fa9c1d225d4b7eb69925c25c5e082307a141e470573fbbe3a817ce6a7a37" +checksum = "fc4b01218787dd4420daf63875163a787a78294ad48a24e9f6fa8c6507759a79" dependencies = [ "proc-macro2", "quote", @@ -4713,18 +4693,15 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precis-core" -version = "0.1.10" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a414cabc93f5f45d53463e73b3d89d3c5c0dc4a34dbf6901f0c6358f017203" +checksum = "d73e9dd26361c32e7cd13d1032bb01c4e26a23287274e8a4e2f228cf2c9ff77b" dependencies = [ "precis-tools", "ucd-parse", @@ -4733,9 +4710,9 @@ dependencies = [ [[package]] name = "precis-profiles" -version = "0.1.11" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58e2841ef58164e2626464d4fde67fa301d5e2c78a10300c1756312a03b169f" +checksum = "bde4bd6624c60cb0abe2bea1dbdbb9085f629a853861e64df4abb099f8076ad4" dependencies = [ "lazy_static", "precis-core", @@ -4745,9 +4722,9 @@ dependencies = [ [[package]] name = "precis-tools" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016da884bc4c2c4670211641abef402d15fa2b06c6e9088ff270dac93675aee2" +checksum = "d07ecadec70b0f560f09abf815ae0ee1a940d38d2354c938ba7229ac7c9f5f52" dependencies = [ "lazy_static", "regex", @@ -4815,9 +4792,9 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.22.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" +checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", @@ -4838,9 +4815,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bitflags 2.6.0", "lazy_static", @@ -4848,7 +4825,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.8.5", + "regex-syntax 0.8.2", "unarray", ] @@ -4876,9 +4853,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quanta" -version = "0.12.4" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773ce68d0bb9bc7ef20be3536ffe94e223e1f365bd374108b2659fac0c65cfe6" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", @@ -4912,54 +4889,49 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", - "socket2", - "thiserror 2.0.7", + "thiserror 1.0.69", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.9" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", - "getrandom 0.2.15", "rand 0.8.5", "ring", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", - "rustls-pki-types", "slab", - "thiserror 2.0.7", + "thiserror 1.0.69", "tinyvec", "tracing", - "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.8" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" dependencies = [ - "cfg_aliases 0.2.1", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5056,7 +5028,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.12", ] [[package]] @@ -5083,18 +5055,18 @@ version = "1.0.0" [[package]] name = "raw-cpuid" -version = "11.2.0" +version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" +checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "rayon" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -5119,7 +5091,7 @@ dependencies = [ "pem", "ring", "rustls-pki-types", - "time 0.3.37", + "time 0.3.36", "yasna", ] @@ -5134,34 +5106,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.6" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.12", "libredox", "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", ] [[package]] @@ -5175,20 +5147,20 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax 0.8.2", ] [[package]] name = "regex-lite" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" [[package]] name = "regex-syntax" @@ -5198,21 +5170,21 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.12.9" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64 0.22.1", "bytes", "futures-core", "futures-util", - "http 1.2.0", + "http 1.1.0", "http-body", "http-body-util", "hyper", @@ -5232,7 +5204,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.0", "tokio", "tokio-rustls", "tower-service", @@ -5241,7 +5213,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "windows-registry", + "winreg 0.52.0", ] [[package]] @@ -5272,7 +5244,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom 0.2.12", "libc", "spin", "untrusted", @@ -5391,15 +5363,21 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "2.1.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver", ] @@ -5415,22 +5393,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.20" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "log", "once_cell", @@ -5456,21 +5434,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.2.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" -dependencies = [ - "web-time", -] +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-platform-verifier" @@ -5512,15 +5488,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.18" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" -version = "14.0.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" +checksum = "2ee1e066dc922e513bda599c6ccb5f3bb2b0ea5870a579448f2622993f0a9a2f" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -5530,19 +5506,19 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.28.0", + "nix 0.29.0", "radix_trie", "unicode-segmentation", - "unicode-width", + "unicode-width 0.2.0", "utf8parse", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa20" @@ -5574,11 +5550,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.27" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5647,9 +5623,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -5657,15 +5633,15 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.1.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "semver" -version = "1.0.24" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -5682,9 +5658,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.216" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -5700,9 +5676,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -5711,9 +5687,9 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.29.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", @@ -5734,9 +5710,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" dependencies = [ "itoa", "serde", @@ -5744,9 +5720,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.8" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -5864,9 +5840,9 @@ dependencies = [ [[package]] name = "shadowsocks-crypto" -version = "0.5.8" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc77ecb3a97509d22751b76665894fcffad2d10df8758f4e3f20c92ccde6bf4f" +checksum = "a9e49ecfad8b27f3df28848af11f08aa10df0c6b74b45748131753913be23373" dependencies = [ "aes", "aes-gcm", @@ -5898,9 +5874,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -5953,9 +5929,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.5.8" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", "windows-sys 0.52.0", @@ -6044,18 +6020,18 @@ checksum = "e9426b2a0c03e6cc2ea8dbc0168dbbf943f88755e409fb91bcb8f6a268305f4a" [[package]] name = "strum" -version = "0.26.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.4" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck", "proc-macro2", @@ -6066,9 +6042,9 @@ dependencies = [ [[package]] name = "stun-rs" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79cc624c9a747353810310af44f1f03f71eb4561284a894acc0396e6d0de76e" +checksum = "0adebf9fb8fba5c39ee34092b0383f247e4d1255b98fcffec94b4b797b85b677" dependencies = [ "base64 0.22.1", "bounded-integer", @@ -6090,9 +6066,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.6.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "surge-ping" @@ -6134,12 +6110,15 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.2" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" [[package]] name = "synstructure" @@ -6168,9 +6147,9 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -6206,7 +6185,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", - "fastrand 2.3.0", + "fastrand 2.1.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -6214,13 +6193,12 @@ dependencies = [ [[package]] name = "testdir" -version = "0.9.3" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ffa013be124f7e8e648876190de818e3a87088ed97ccd414a398b403aec8c8" +checksum = "ee79e927b64d193f5abb60d20a0eb56be0ee5a242fdeb8ce3bf054177006de52" dependencies = [ "anyhow", "backtrace", - "cargo-platform", "cargo_metadata", "once_cell", "sysinfo", @@ -6235,7 +6213,7 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", - "unicode-width", + "unicode-width 0.1.11", ] [[package]] @@ -6301,9 +6279,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -6322,9 +6300,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.19" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -6352,9 +6330,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -6367,9 +6345,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -6406,19 +6384,20 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -6466,19 +6445,7 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.21.0", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.24.0", + "tungstenite", ] [[package]] @@ -6489,28 +6456,28 @@ checksum = "8e57a65894797a018b28345fa298a00c450a574aa9671e50b18218a6292a55ac" dependencies = [ "futures-channel", "futures-util", - "http 1.2.0", + "http 1.1.0", "httparse", "js-sys", "thiserror 1.0.69", "tokio", - "tokio-tungstenite 0.21.0", + "tokio-tungstenite", "wasm-bindgen", "web-sys", ] [[package]] name = "tokio-util" -version = "0.7.13" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.5", + "hashbrown", "pin-project-lite", "tokio", ] @@ -6538,9 +6505,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -6551,14 +6518,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.2" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", + "pin-project", "pin-project-lite", - "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -6567,21 +6534,21 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", @@ -6591,9 +6558,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", @@ -6602,9 +6569,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -6623,9 +6590,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -6660,7 +6627,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.2.0", + "http 1.1.0", "httparse", "log", "rand 0.8.5", @@ -6670,24 +6637,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.2.0", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror 1.0.69", - "utf-8", -] - [[package]] name = "twofish" version = "0.7.1" @@ -6738,9 +6687,9 @@ dependencies = [ [[package]] name = "ucd-trie" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unarray" @@ -6750,9 +6699,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" @@ -6762,30 +6711,36 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unicode-xid" -version = "0.2.6" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -6805,9 +6760,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.12.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64 0.22.1", "log", @@ -6850,9 +6805,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utf8parse" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" @@ -6860,7 +6815,7 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.12", "serde", ] @@ -6878,9 +6833,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" @@ -6933,23 +6888,23 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", - "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", + "once_cell", "proc-macro2", "quote", "syn 2.0.90", @@ -6958,22 +6913,21 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", - "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6981,9 +6935,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -6994,25 +6948,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -7035,20 +6979,20 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "whoami" -version = "1.5.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "redox_syscall 0.5.8", + "redox_syscall 0.4.1", "wasite", "web-sys", ] [[package]] name = "widestring" -version = "1.1.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -7068,11 +7012,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "windows-sys 0.59.0", + "winapi", ] [[package]] @@ -7154,17 +7098,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - [[package]] name = "windows-result" version = "0.2.0" @@ -7334,9 +7267,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -7351,6 +7284,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wmi" version = "0.14.2" @@ -7415,7 +7358,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror 1.0.69", - "time 0.3.37", + "time 0.3.36", ] [[package]] @@ -7431,9 +7374,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.24" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmltree" @@ -7456,7 +7399,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.37", + "time 0.3.36", ] [[package]] @@ -7484,9 +7427,9 @@ dependencies = [ [[package]] name = "yerpc_derive" -version = "0.6.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b34f611dd6df1730f7b78a2773723523125328e0f984a011e4da3be1f5516a" +checksum = "35ba6b4417cfeb26cd806f3aabc22e7c4097632e07b5b61a4c818bccb2df4f21" dependencies = [ "convert_case", "darling", @@ -7527,19 +7470,18 @@ checksum = "edb37266251c28b03d08162174a91c3a092e3bd4f476f8205ee1c507b78b7bdc" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", @@ -7569,9 +7511,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -7617,9 +7559,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-jpeg" -version = "0.4.14" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/Cargo.toml b/Cargo.toml index 1e358c350..bed2f43db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "deltachat" -version = "1.151.5" +version = "1.152.0" edition = "2021" license = "MPL-2.0" -rust-version = "1.77" +rust-version = "1.81" repository = "https://github.com/deltachat/deltachat-core-rust" [profile.dev] diff --git a/README.md b/README.md index d9ba4ce15..1e8d6f437 100644 --- a/README.md +++ b/README.md @@ -177,8 +177,8 @@ Language bindings are available for: - **C** \[[📂 source](./deltachat-ffi) | [📚 docs](https://c.delta.chat)\] - **Node.js** - - over cffi: \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat)\] - - over jsonrpc built with napi.rs (experimental): \[[📂 source](https://github.com/deltachat/napi-jsonrpc) | [📦 npm](https://www.npmjs.com/package/@deltachat/napi-jsonrpc)\] + - over JSON-RPC: \[[📂 source](./deltachat-rpc-client) | [📦 npm](https://www.npmjs.com/package/@deltachat/jsonrpc-client) | [📚 docs](https://js.jsonrpc.delta.chat/)\] + - over CFFI[^1]: \[[📂 source](./node) | [📦 npm](https://www.npmjs.com/package/deltachat-node) | [📚 docs](https://js.delta.chat/)\] - **Python** \[[📂 source](./python) | [📦 pypi](https://pypi.org/project/deltachat) | [📚 docs](https://py.delta.chat)\] - **Go** - over jsonrpc: \[[📂 source](https://github.com/deltachat/deltachat-rpc-client-go/)\] diff --git a/contrib/proxy.py b/contrib/proxy.py deleted file mode 100644 index 13e1b6978..000000000 --- a/contrib/proxy.py +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env python3 -# Examples: -# -# Original server that doesn't use SSL: -# ./proxy.py 8080 imap.nauta.cu 143 -# ./proxy.py 8081 smtp.nauta.cu 25 -# -# Original server that uses SSL: -# ./proxy.py 8080 testrun.org 993 --ssl -# ./proxy.py 8081 testrun.org 465 --ssl - -from datetime import datetime -import argparse -import selectors -import ssl -import socket -import socketserver - - -class Proxy(socketserver.ThreadingTCPServer): - allow_reuse_address = True - - def __init__(self, proxy_host, proxy_port, real_host, real_port, use_ssl): - self.real_host = real_host - self.real_port = real_port - self.use_ssl = use_ssl - super().__init__((proxy_host, proxy_port), RequestHandler) - - -class RequestHandler(socketserver.BaseRequestHandler): - - def handle(self): - print('{} - {} CONNECTED.'.format(datetime.now(), self.client_address)) - - total = 0 - real_server = (self.server.real_host, self.server.real_port) - with socket.create_connection(real_server) as sock: - if self.server.use_ssl: - context = ssl.create_default_context() - sock = context.wrap_socket( - sock, server_hostname=real_server[0]) - - forward = {self.request: sock, sock: self.request} - - sel = selectors.DefaultSelector() - sel.register(self.request, selectors.EVENT_READ, - self.client_address) - sel.register(sock, selectors.EVENT_READ, real_server) - - active = True - while active: - events = sel.select() - for key, mask in events: - print('\n{} - {} wrote:'.format(datetime.now(), key.data)) - data = key.fileobj.recv(1024) - received = len(data) - total += received - print(data) - print('{} Bytes\nTotal: {} Bytes'.format(received, total)) - if data: - forward[key.fileobj].sendall(data) - else: - print('\nCLOSING CONNECTION.\n\n') - forward[key.fileobj].close() - key.fileobj.close() - active = False - - -if __name__ == '__main__': - p = argparse.ArgumentParser(description='Simple Python Proxy') - p.add_argument( - "proxy_port", help="the port where the proxy will listen", type=int) - p.add_argument('host', help="the real host") - p.add_argument('port', help="the port of the real host", type=int) - p.add_argument("--ssl", help="use ssl to connect to the real host", - action="store_true") - args = p.parse_args() - - with Proxy('', args.proxy_port, args.host, args.port, args.ssl) as proxy: - proxy.serve_forever() diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml index d00b1961b..b290a26b1 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat_ffi" -version = "1.151.5" +version = "1.152.0" description = "Deltachat FFI" edition = "2018" readme = "README.md" diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index 19bbdeb89..805b88849 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -963,54 +963,6 @@ uint32_t dc_create_chat_by_contact_id (dc_context_t* context, uint32_t co uint32_t dc_get_chat_id_by_contact_id (dc_context_t* context, uint32_t contact_id); -/** - * Prepare a message for sending. - * - * Call this function if the file to be sent is still in creation. - * Once you're done with creating the file, call dc_send_msg() as usual - * and the message will really be sent. - * - * This is useful as the user can already send the next messages while - * e.g. the recoding of a video is not yet finished. Or the user can even forward - * the message with the file being still in creation to other groups. - * - * Files being sent with the increation-method must be placed in the - * blob directory, see dc_get_blobdir(). - * If the increation-method is not used - which is probably the normal case - - * dc_send_msg() copies the file to the blob directory if it is not yet there. - * To distinguish the two cases, msg->state must be set properly. The easiest - * way to ensure this is to reuse the same object for both calls. - * - * Example: - * ~~~ - * char* blobdir = dc_get_blobdir(context); - * char* file_to_send = mprintf("%s/%s", blobdir, "send.mp4") - * - * dc_msg_t* msg = dc_msg_new(context, DC_MSG_VIDEO); - * dc_msg_set_file(msg, file_to_send, NULL); - * dc_prepare_msg(context, chat_id, msg); - * - * // ... create the file ... - * - * dc_send_msg(context, chat_id, msg); - * - * dc_msg_unref(msg); - * free(file_to_send); - * dc_str_unref(file_to_send); - * ~~~ - * - * @memberof dc_context_t - * @param context The context object as returned from dc_context_new(). - * @param chat_id The chat ID to send the message to. - * @param msg The message object to send to the chat defined by the chat ID. - * On success, msg_id and state of the object are set up, - * The function does not take ownership of the object, - * so you have to free it using dc_msg_unref() as usual. - * @return The ID of the message that is being prepared. - */ -uint32_t dc_prepare_msg (dc_context_t* context, uint32_t chat_id, dc_msg_t* msg); - - /** * Send a message defined by a dc_msg_t object to a chat. * @@ -1035,13 +987,11 @@ uint32_t dc_prepare_msg (dc_context_t* context, uint32_t ch * If that fails, is not possible, or the image is already small enough, the image is sent as original. * If you want images to be always sent as the original file, use the #DC_MSG_FILE type. * - * Videos and other file types are currently not recoded by the library, - * with dc_prepare_msg(), however, you can do that from the UI. + * Videos and other file types are currently not recoded by the library. * * @memberof dc_context_t * @param context The context object as returned from dc_context_new(). * @param chat_id The chat ID to send the message to. - * If dc_prepare_msg() was called before, this parameter can be 0. * @param msg The message object to send to the chat defined by the chat ID. * On success, msg_id of the object is set up, * The function does not take ownership of the object, @@ -1058,7 +1008,6 @@ uint32_t dc_send_msg (dc_context_t* context, uint32_t ch * @memberof dc_context_t * @param context The context object as returned from dc_context_new(). * @param chat_id The chat ID to send the message to. - * If dc_prepare_msg() was called before, this parameter can be 0. * @param msg The message object to send to the chat defined by the chat ID. * On success, msg_id of the object is set up, * The function does not take ownership of the object, @@ -3985,7 +3934,7 @@ int dc_msg_get_viewtype (const dc_msg_t* msg); * * Outgoing message states: * - @ref DC_STATE_OUT_PREPARING - For files which need time to be prepared before they can be sent, - * the message enters this state before @ref DC_STATE_OUT_PENDING. + * the message enters this state before @ref DC_STATE_OUT_PENDING. Deprecated. * - @ref DC_STATE_OUT_DRAFT - Message saved as draft using dc_set_draft() * - @ref DC_STATE_OUT_PENDING - The user has pressed the "send" button but the * message is not yet sent and is pending in some way. Maybe we're offline (no checkmark). @@ -4535,20 +4484,6 @@ int dc_msg_get_info_type (const dc_msg_t* msg); */ char* dc_msg_get_webxdc_href (const dc_msg_t* msg); -/** - * Check if a message is still in creation. A message is in creation between - * the calls to dc_prepare_msg() and dc_send_msg(). - * - * Typically, this is used for videos that are recoded by the UI before - * they can be sent. - * - * @memberof dc_msg_t - * @param msg The message object. - * @return 1=message is still in creation (dc_send_msg() was not called yet), - * 0=message no longer in creation. - */ -int dc_msg_is_increation (const dc_msg_t* msg); - /** * Check if the message is an Autocrypt Setup Message. @@ -5562,6 +5497,8 @@ int64_t dc_lot_get_timestamp (const dc_lot_t* lot); /** * Outgoing message being prepared. See dc_msg_get_state() for details. + * + * @deprecated 2024-12-07 */ #define DC_STATE_OUT_PREPARING 18 diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 694654e36..c9c0cf843 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -976,27 +976,6 @@ pub unsafe extern "C" fn dc_get_chat_id_by_contact_id( }) } -#[no_mangle] -pub unsafe extern "C" fn dc_prepare_msg( - context: *mut dc_context_t, - chat_id: u32, - msg: *mut dc_msg_t, -) -> u32 { - if context.is_null() || chat_id == 0 || msg.is_null() { - eprintln!("ignoring careless call to dc_prepare_msg()"); - return 0; - } - let ctx = &mut *context; - let ffi_msg: &mut MessageWrapper = &mut *msg; - - block_on(async move { - chat::prepare_msg(ctx, ChatId::new(chat_id), &mut ffi_msg.message) - .await - .unwrap_or_log_default(ctx, "Failed to prepare message") - }) - .to_u32() -} - #[no_mangle] pub unsafe extern "C" fn dc_send_msg( context: *mut dc_context_t, @@ -3713,16 +3692,6 @@ pub unsafe extern "C" fn dc_msg_get_webxdc_href(msg: *mut dc_msg_t) -> *mut libc ffi_msg.message.get_webxdc_href().strdup() } -#[no_mangle] -pub unsafe extern "C" fn dc_msg_is_increation(msg: *mut dc_msg_t) -> libc::c_int { - if msg.is_null() { - eprintln!("ignoring careless call to dc_msg_is_increation()"); - return 0; - } - let ffi_msg = &*msg; - ffi_msg.message.is_increation().into() -} - #[no_mangle] pub unsafe extern "C" fn dc_msg_is_setupmessage(msg: *mut dc_msg_t) -> libc::c_int { if msg.is_null() { diff --git a/deltachat-jsonrpc/Cargo.toml b/deltachat-jsonrpc/Cargo.toml index 3dddc6577..83e540f73 100644 --- a/deltachat-jsonrpc/Cargo.toml +++ b/deltachat-jsonrpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-jsonrpc" -version = "1.151.5" +version = "1.152.0" description = "DeltaChat JSON-RPC API" edition = "2021" default-run = "deltachat-jsonrpc-server" diff --git a/deltachat-jsonrpc/typescript/package.json b/deltachat-jsonrpc/typescript/package.json index 50d988841..f06120e9d 100644 --- a/deltachat-jsonrpc/typescript/package.json +++ b/deltachat-jsonrpc/typescript/package.json @@ -58,5 +58,5 @@ }, "type": "module", "types": "dist/deltachat.d.ts", - "version": "1.151.5" + "version": "1.152.0" } diff --git a/deltachat-repl/Cargo.toml b/deltachat-repl/Cargo.toml index d3c815e6e..fd31cd9c9 100644 --- a/deltachat-repl/Cargo.toml +++ b/deltachat-repl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-repl" -version = "1.151.5" +version = "1.152.0" license = "MPL-2.0" edition = "2021" repository = "https://github.com/deltachat/deltachat-core-rust" @@ -13,7 +13,7 @@ log = { workspace = true } nu-ansi-term = { workspace = true } qr2term = "0.3.3" rusqlite = { workspace = true } -rustyline = "14" +rustyline = "15" tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] } tracing-subscriber = { workspace = true, features = ["env-filter"] } diff --git a/deltachat-repl/src/main.rs b/deltachat-repl/src/main.rs index 2b16cc68f..52a7a8754 100644 --- a/deltachat-repl/src/main.rs +++ b/deltachat-repl/src/main.rs @@ -22,7 +22,7 @@ use log::{error, info, warn}; use nu_ansi_term::Color; use rustyline::completion::{Completer, FilenameCompleter, Pair}; use rustyline::error::ReadlineError; -use rustyline::highlight::{Highlighter, MatchingBracketHighlighter}; +use rustyline::highlight::{CmdKind as HighlightCmdKind, Highlighter, MatchingBracketHighlighter}; use rustyline::hint::{Hinter, HistoryHinter}; use rustyline::validate::Validator; use rustyline::{ @@ -298,8 +298,8 @@ impl Highlighter for DcHelper { self.highlighter.highlight(line, pos) } - fn highlight_char(&self, line: &str, pos: usize, forced: bool) -> bool { - self.highlighter.highlight_char(line, pos, forced) + fn highlight_char(&self, line: &str, pos: usize, kind: HighlightCmdKind) -> bool { + self.highlighter.highlight_char(line, pos, kind) } } diff --git a/deltachat-rpc-client/pyproject.toml b/deltachat-rpc-client/pyproject.toml index 50bb6ba20..ccad19a52 100644 --- a/deltachat-rpc-client/pyproject.toml +++ b/deltachat-rpc-client/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "deltachat-rpc-client" -version = "1.151.5" +version = "1.152.0" description = "Python client for Delta Chat core JSON-RPC interface" classifiers = [ "Development Status :: 5 - Production/Stable", diff --git a/deltachat-rpc-server/Cargo.toml b/deltachat-rpc-server/Cargo.toml index d8228348b..73fdf2a4f 100644 --- a/deltachat-rpc-server/Cargo.toml +++ b/deltachat-rpc-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-rpc-server" -version = "1.151.5" +version = "1.152.0" description = "DeltaChat JSON-RPC server" edition = "2021" readme = "README.md" diff --git a/deltachat-rpc-server/npm-package/package.json b/deltachat-rpc-server/npm-package/package.json index 37866eba6..0db6e7287 100644 --- a/deltachat-rpc-server/npm-package/package.json +++ b/deltachat-rpc-server/npm-package/package.json @@ -15,5 +15,5 @@ }, "type": "module", "types": "index.d.ts", - "version": "1.151.5" + "version": "1.152.0" } diff --git a/deny.toml b/deny.toml index 70a7150dc..09419a009 100644 --- a/deny.toml +++ b/deny.toml @@ -58,6 +58,7 @@ skip = [ { name = "time", version = "<0.3" }, { name = "tokio-tungstenite", version = "0.21.0" }, { name = "tungstenite", version = "0.21.0" }, + { name = "unicode-width", version = "0.1.11" }, { name = "wasi", version = "<0.11" }, { name = "windows_aarch64_gnullvm", version = "<0.52" }, { name = "windows_aarch64_msvc", version = "<0.52" }, diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index fec882ad1..13489ec30 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -179,7 +179,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.58", "time 0.3.36", ] @@ -191,7 +191,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", "synstructure 0.13.1", ] @@ -203,7 +203,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -275,7 +275,7 @@ dependencies = [ "pin-utils", "self_cell", "stop-token", - "thiserror", + "thiserror 1.0.58", "tokio", ] @@ -286,7 +286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec" dependencies = [ "native-tls", - "thiserror", + "thiserror 1.0.58", "tokio", "url", ] @@ -299,7 +299,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -314,7 +314,7 @@ dependencies = [ "log", "nom", "pin-project", - "thiserror", + "thiserror 1.0.58", "tokio", ] @@ -326,7 +326,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -339,7 +339,7 @@ dependencies = [ "crc32fast", "futures-lite 2.5.0", "pin-project", - "thiserror", + "thiserror 1.0.58", "tokio", "tokio-util", ] @@ -1040,7 +1040,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1108,7 +1108,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1119,7 +1119,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1220,7 +1220,7 @@ dependencies = [ "strum_macros", "tagger", "textwrap", - "thiserror", + "thiserror 1.0.58", "tokio", "tokio-io-timeout", "tokio-rustls", @@ -1263,7 +1263,7 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1300,7 +1300,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1331,7 +1331,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1341,7 +1341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1361,7 +1361,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", "unicode-xid", ] @@ -1579,7 +1579,7 @@ dependencies = [ "hex", "lazy_static", "regex", - "thiserror", + "thiserror 1.0.58", ] [[package]] @@ -1670,7 +1670,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1690,7 +1690,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -1814,7 +1814,7 @@ dependencies = [ "anyhow", "async-trait", "log", - "thiserror", + "thiserror 1.0.58", "tokio", "tokio-stream", ] @@ -2061,7 +2061,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -2331,7 +2331,7 @@ dependencies = [ "ipnet", "once_cell", "rand 0.8.5", - "thiserror", + "thiserror 1.0.58", "time 0.3.36", "tinyvec", "tokio", @@ -2355,7 +2355,7 @@ dependencies = [ "rand 0.8.5", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.58", "tokio", "tracing", ] @@ -2718,7 +2718,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "ssh-key", - "thiserror", + "thiserror 1.0.58", "ttl_cache", "url", "zeroize", @@ -2848,7 +2848,7 @@ dependencies = [ "strum", "stun-rs", "surge-ping", - "thiserror", + "thiserror 1.0.58", "time 0.3.36", "tokio", "tokio-rustls", @@ -2880,7 +2880,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2 0.5.6", - "thiserror", + "thiserror 1.0.58", "tokio", "tracing", ] @@ -2898,7 +2898,7 @@ dependencies = [ "rustls", "rustls-platform-verifier", "slab", - "thiserror", + "thiserror 1.0.58", "tinyvec", "tracing", ] @@ -2954,7 +2954,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.58", "walkdir", ] @@ -3186,7 +3186,7 @@ dependencies = [ "serde_bencode", "serde_bytes", "sha1_smol", - "thiserror", + "thiserror 1.0.58", "tracing", ] @@ -3349,7 +3349,7 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror", + "thiserror 1.0.58", ] [[package]] @@ -3363,7 +3363,7 @@ dependencies = [ "log", "netlink-packet-core", "netlink-sys", - "thiserror", + "thiserror 1.0.58", "tokio", ] @@ -3401,7 +3401,7 @@ dependencies = [ "rtnetlink", "serde", "socket2 0.5.6", - "thiserror", + "thiserror 1.0.58", "time 0.3.36", "tokio", "tracing", @@ -3500,7 +3500,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -3561,7 +3561,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -3792,7 +3792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.58", "ucd-trie", ] @@ -3816,7 +3816,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -3890,7 +3890,7 @@ dependencies = [ "sha3", "signature", "smallvec", - "thiserror", + "thiserror 1.0.58", "twofish", "x25519-dalek", "x448", @@ -3914,7 +3914,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -3946,7 +3946,7 @@ dependencies = [ "mainline", "self_cell", "simple-dns", - "thiserror", + "thiserror 1.0.58", "tracing", "ureq", "wasm-bindgen", @@ -4000,7 +4000,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -4086,7 +4086,7 @@ dependencies = [ "serde", "smallvec", "socket2 0.5.6", - "thiserror", + "thiserror 1.0.58", "time 0.3.36", "tokio", "tokio-util", @@ -4221,9 +4221,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -4248,7 +4248,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -4305,26 +4305,29 @@ dependencies = [ "quinn-udp", "rustc-hash 1.1.0", "rustls", - "thiserror", + "thiserror 1.0.58", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom 0.2.11", "rand 0.8.5", "ring", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "rustls", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.6", "tinyvec", "tracing", + "web-time", ] [[package]] @@ -4670,7 +4673,7 @@ dependencies = [ "netlink-proto", "netlink-sys", "nix", - "thiserror", + "thiserror 1.0.58", "tokio", ] @@ -4800,6 +4803,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-platform-verifier" @@ -5018,7 +5024,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -5151,7 +5157,7 @@ dependencies = [ "shadowsocks-crypto", "socket2 0.5.6", "spin 0.9.8", - "thiserror", + "thiserror 1.0.58", "tokio", "tokio-tfo", "url", @@ -5384,7 +5390,7 @@ dependencies = [ "proc-macro2", "quote", "struct_iterable_internal", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -5412,7 +5418,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -5456,7 +5462,7 @@ dependencies = [ "pnet_packet", "rand 0.8.5", "socket2 0.5.6", - "thiserror", + "thiserror 1.0.58", "tokio", "tracing", ] @@ -5474,9 +5480,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -5520,7 +5526,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -5595,7 +5601,16 @@ version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.58", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", ] [[package]] @@ -5606,7 +5621,18 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] @@ -5712,7 +5738,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -5792,7 +5818,7 @@ dependencies = [ "http 1.1.0", "httparse", "js-sys", - "thiserror", + "thiserror 1.0.58", "tokio", "tokio-tungstenite", "wasm-bindgen", @@ -5875,7 +5901,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -5946,7 +5972,7 @@ dependencies = [ "log", "rand 0.8.5", "sha1", - "thiserror", + "thiserror 1.0.58", "url", "utf-8", ] @@ -6175,7 +6201,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -6209,7 +6235,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6229,7 +6255,7 @@ dependencies = [ "event-listener 4.0.3", "futures-util", "parking_lot", - "thiserror", + "thiserror 1.0.58", ] [[package]] @@ -6242,6 +6268,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.26.7" @@ -6351,7 +6387,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -6362,7 +6398,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] @@ -6651,7 +6687,7 @@ dependencies = [ "futures", "log", "serde", - "thiserror", + "thiserror 1.0.58", "windows 0.52.0", ] @@ -6700,7 +6736,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.58", "time 0.3.36", ] @@ -6760,7 +6796,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.90", ] [[package]] diff --git a/node/lib/message.ts b/node/lib/message.ts index 5b2ad67d9..c4036ad6b 100644 --- a/node/lib/message.ts +++ b/node/lib/message.ts @@ -299,10 +299,6 @@ export class Message { return Boolean(binding.dcn_msg_is_forwarded(this.dc_msg)) } - isIncreation() { - return Boolean(binding.dcn_msg_is_increation(this.dc_msg)) - } - isInfo() { return Boolean(binding.dcn_msg_is_info(this.dc_msg)) } diff --git a/node/src/module.c b/node/src/module.c index 33492aeec..02dda50c1 100644 --- a/node/src/module.c +++ b/node/src/module.c @@ -2374,17 +2374,6 @@ NAPI_METHOD(dcn_msg_is_forwarded) { NAPI_RETURN_INT32(is_forwarded); } -NAPI_METHOD(dcn_msg_is_increation) { - NAPI_ARGV(1); - NAPI_DC_MSG(); - - //TRACE("calling.."); - int is_increation = dc_msg_is_increation(dc_msg); - //TRACE("result %d", is_increation); - - NAPI_RETURN_INT32(is_increation); -} - NAPI_METHOD(dcn_msg_is_info) { NAPI_ARGV(1); NAPI_DC_MSG(); @@ -3555,7 +3544,6 @@ NAPI_INIT() { NAPI_EXPORT_FUNCTION(dcn_msg_has_location); NAPI_EXPORT_FUNCTION(dcn_msg_has_html); NAPI_EXPORT_FUNCTION(dcn_msg_is_forwarded); - NAPI_EXPORT_FUNCTION(dcn_msg_is_increation); NAPI_EXPORT_FUNCTION(dcn_msg_is_info); NAPI_EXPORT_FUNCTION(dcn_msg_is_sent); NAPI_EXPORT_FUNCTION(dcn_msg_is_setupmessage); diff --git a/node/test/test.mjs b/node/test/test.mjs index 5c9d67ef7..a7ae73727 100644 --- a/node/test/test.mjs +++ b/node/test/test.mjs @@ -536,7 +536,6 @@ describe('Offline Tests with unconfigured account', function () { strictEqual(msg.getWidth(), 0, 'no message width') strictEqual(msg.isDeadDrop(), false, 'not deaddrop') strictEqual(msg.isForwarded(), false, 'not forwarded') - strictEqual(msg.isIncreation(), false, 'not in creation') strictEqual(msg.isInfo(), false, 'not an info message') strictEqual(msg.isSent(), false, 'messge is not sent') strictEqual(msg.isSetupmessage(), false, 'not an autocrypt setup message') diff --git a/package.json b/package.json index 64054d5b4..8b33dc48a 100644 --- a/package.json +++ b/package.json @@ -55,5 +55,5 @@ "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit" }, "types": "node/dist/index.d.ts", - "version": "1.151.5" + "version": "1.152.0" } diff --git a/python/pyproject.toml b/python/pyproject.toml index 3b455338b..220cfcbb7 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "deltachat" -version = "1.151.5" +version = "1.152.0" description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat" readme = "README.rst" requires-python = ">=3.7" diff --git a/python/src/deltachat/chat.py b/python/src/deltachat/chat.py index d275e09cc..b5cfa9235 100644 --- a/python/src/deltachat/chat.py +++ b/python/src/deltachat/chat.py @@ -271,8 +271,7 @@ class Chat: :param msg: a :class:`deltachat.message.Message` instance previously returned by - e.g. :meth:`deltachat.message.Message.new_empty` or - :meth:`prepare_file`. + e.g. :meth:`deltachat.message.Message.new_empty`. :raises ValueError: if message can not be sent. :returns: a :class:`deltachat.message.Message` instance as @@ -341,37 +340,6 @@ class Chat: raise ValueError("message could not be sent") return Message.from_db(self.account, sent_id) - def prepare_message(self, msg): - """prepare a message for sending. - - :param msg: the message to be prepared. - :returns: a :class:`deltachat.message.Message` instance. - This is the same object that was passed in, which - has been modified with the new state of the core. - """ - msg_id = lib.dc_prepare_msg(self.account._dc_context, self.id, msg._dc_msg) - if msg_id == 0: - raise ValueError("message could not be prepared") - # modify message in place to avoid bad state for the caller - msg._dc_msg = Message.from_db(self.account, msg_id)._dc_msg - return msg - - def prepare_message_file(self, path, mime_type=None, view_type="file"): - """prepare a message for sending and return the resulting Message instance. - - To actually send the message, call :meth:`send_prepared`. - The file must be inside the blob directory. - - :param path: path to the file. - :param mime_type: the mime-type of this file, defaults to auto-detection. - :param view_type: "text", "image", "gif", "audio", "video", "file" - :raises ValueError: if message can not be prepared/chat does not exist. - :returns: the resulting :class:`Message` instance - """ - msg = Message.new_empty(self.account, view_type) - msg.set_file(path, mime_type) - return self.prepare_message(msg) - def send_prepared(self, message): """send a previously prepared message. diff --git a/python/tests/test_1_online.py b/python/tests/test_1_online.py index d6bc3d6e9..de7b38f6d 100644 --- a/python/tests/test_1_online.py +++ b/python/tests/test_1_online.py @@ -1366,10 +1366,9 @@ def test_quote_encrypted(acfactory, lp): msg_draft.quote = quoted_msg chat.set_draft(msg_draft) - # Get the draft, prepare and send it. + # Get the draft and send it. msg_draft = chat.get_draft() - msg_out = chat.prepare_message(msg_draft) - chat.send_prepared(msg_out) + chat.send_msg(msg_draft) chat.set_draft(None) assert chat.get_draft() is None @@ -2291,9 +2290,8 @@ def test_group_quote(acfactory, lp): reply_msg = Message.new_empty(msg.chat.account, "text") reply_msg.set_text("reply") reply_msg.quote = msg - reply_msg = msg.chat.prepare_message(reply_msg) assert reply_msg.quoted_text == "hello" - msg.chat.send_prepared(reply_msg) + msg.chat.send_msg(reply_msg) lp.sec("ac3: receiving reply") received_reply = ac3._evtracker.wait_next_incoming_message() diff --git a/python/tests/test_2_increation.py b/python/tests/test_2_increation.py deleted file mode 100644 index 1fe85e02a..000000000 --- a/python/tests/test_2_increation.py +++ /dev/null @@ -1,107 +0,0 @@ -import os.path -import shutil -from filecmp import cmp - -import pytest - - -def wait_msg_delivered(account, msg_list): - """wait for one or more MSG_DELIVERED events to match msg_list contents.""" - msg_list = list(msg_list) - while msg_list: - ev = account._evtracker.get_matching("DC_EVENT_MSG_DELIVERED") - msg_list.remove((ev.data1, ev.data2)) - - -def wait_msgs_changed(account, msgs_list): - """wait for one or more MSGS_CHANGED events to match msgs_list contents.""" - account.log(f"waiting for msgs_list={msgs_list}") - msgs_list = list(msgs_list) - while msgs_list: - ev = account._evtracker.get_matching("DC_EVENT_MSGS_CHANGED") - for i, (data1, data2) in enumerate(msgs_list): - if ev.data1 == data1: - if data2 is None or ev.data2 == data2: - del msgs_list[i] - break - else: - account.log(f"waiting mismatch data1={data1} data2={data2}") - return ev.data2 - - -class TestOnlineInCreation: - def test_increation_not_blobdir(self, tmp_path, acfactory, lp): - ac1, ac2 = acfactory.get_online_accounts(2) - chat = ac1.create_chat(ac2) - - lp.sec("Creating in-creation file outside of blobdir") - assert str(tmp_path) != ac1.get_blobdir() - src = tmp_path / "file.txt" - src.touch() - with pytest.raises(Exception): - chat.prepare_message_file(str(src)) - - def test_no_increation_copies_to_blobdir(self, tmp_path, acfactory, lp): - ac1, ac2 = acfactory.get_online_accounts(2) - chat = ac1.create_chat(ac2) - - lp.sec("Creating file outside of blobdir") - assert str(tmp_path) != ac1.get_blobdir() - src = tmp_path / "file.txt" - src.write_text("hello there\n") - msg = chat.send_file(str(src)) - assert msg.filename.startswith(os.path.join(ac1.get_blobdir(), "file")) - assert msg.filename.endswith(".txt") - - def test_forward_increation(self, acfactory, data, lp): - ac1, ac2 = acfactory.get_online_accounts(2) - - chat = ac1.create_chat(ac2) - wait_msgs_changed(ac1, [(0, 0)]) # why no chat id? - - lp.sec("create a message with a file in creation") - orig = data.get_path("d.png") - path = os.path.join(ac1.get_blobdir(), "d.png") - with open(path, "x") as fp: - fp.write("preparing") - prepared_original = chat.prepare_message_file(path) - assert prepared_original.is_out_preparing() - wait_msgs_changed(ac1, [(chat.id, prepared_original.id)]) - - lp.sec("create a new group") - chat2 = ac1.create_group_chat("newgroup") - wait_msgs_changed(ac1, [(0, 0)]) - - lp.sec("add a contact to new group") - chat2.add_contact(ac2) - wait_msgs_changed(ac1, [(chat2.id, None)]) - - lp.sec("forward the message while still in creation") - ac1.forward_messages([prepared_original], chat2) - forwarded_id = wait_msgs_changed(ac1, [(chat2.id, None)]) - forwarded_msg = ac1.get_message_by_id(forwarded_id) - assert forwarded_msg.is_out_preparing() - - lp.sec("finish creating the file and send it") - assert prepared_original.is_out_preparing() - shutil.copyfile(orig, path) - chat.send_prepared(prepared_original) - assert prepared_original.is_out_pending() or prepared_original.is_out_delivered() - - lp.sec("check that both forwarded and original message are proper.") - wait_msgs_changed(ac1, [(chat2.id, forwarded_id), (chat.id, prepared_original.id)]) - - fwd_msg = ac1.get_message_by_id(forwarded_id) - assert fwd_msg.is_out_pending() or fwd_msg.is_out_delivered() - - lp.sec("wait for both messages to be delivered to SMTP") - wait_msg_delivered(ac1, [(chat2.id, forwarded_id), (chat.id, prepared_original.id)]) - - lp.sec("wait1 for original or forwarded messages to arrive") - received_original = ac2._evtracker.wait_next_incoming_message() - assert cmp(received_original.filename, orig, shallow=False) - - lp.sec("wait2 for original or forwarded messages to arrive") - received_copy = ac2._evtracker.wait_next_incoming_message() - assert received_copy.id != received_original.id - assert cmp(received_copy.filename, orig, shallow=False) diff --git a/python/tests/test_3_offline.py b/python/tests/test_3_offline.py index dcd752d55..cb5d2ac77 100644 --- a/python/tests/test_3_offline.py +++ b/python/tests/test_3_offline.py @@ -378,30 +378,6 @@ class TestOfflineChat: with pytest.raises(ValueError): chat1.send_text("msg1") - def test_prepare_message_and_send(self, ac1, chat1): - msg = chat1.prepare_message(Message.new_empty(chat1.account, "text")) - msg.set_text("hello world") - assert msg.text == "hello world" - assert msg.id > 0 - chat1.send_prepared(msg) - assert "Sent" in msg.get_message_info() - str(msg) - repr(msg) - assert msg == ac1.get_message_by_id(msg.id) - - def test_prepare_file(self, ac1, chat1): - blobdir = ac1.get_blobdir() - p = os.path.join(blobdir, "somedata.txt") - with open(p, "w") as f: - f.write("some data") - message = chat1.prepare_message_file(p) - assert message.id > 0 - message.set_text("hello world") - assert message.is_out_preparing() - assert message.text == "hello world" - chat1.send_prepared(message) - assert "Sent" in message.get_message_info() - def test_message_eq_contains(self, chat1): msg = chat1.send_text("msg1") msg2 = None @@ -691,8 +667,7 @@ class TestOfflineChat: assert os.path.exists(messages[1].filename) def test_set_get_draft(self, chat1): - msg = Message.new_empty(chat1.account, "text") - msg1 = chat1.prepare_message(msg) + msg1 = Message.new_empty(chat1.account, "text") msg1.set_text("hello") chat1.set_draft(msg1) msg1.set_text("obsolete") @@ -711,21 +686,6 @@ class TestOfflineChat: assert not res.is_ask_verifygroup() assert res.contact_id == 10 - def test_quote(self, chat1): - """Offline quoting test""" - msg = Message.new_empty(chat1.account, "text") - msg.set_text("Multi\nline\nmessage") - assert msg.quoted_text is None - - # Prepare message to assign it a Message-Id. - # Messages without Message-Id cannot be quoted. - msg = chat1.prepare_message(msg) - - reply_msg = Message.new_empty(chat1.account, "text") - reply_msg.set_text("reply") - reply_msg.quote = msg - assert reply_msg.quoted_text == "Multi\nline\nmessage" - def test_group_chat_many_members_add_remove(self, ac1, lp): lp.sec("ac1: creating group chat with 10 other members") chat = ac1.create_group_chat(name="title1") diff --git a/release-date.in b/release-date.in index c0b24a784..a2b343073 100644 --- a/release-date.in +++ b/release-date.in @@ -1 +1 @@ -2024-12-05 \ No newline at end of file +2024-12-12 \ No newline at end of file diff --git a/src/blob.rs b/src/blob.rs index 43a42850f..63c235056 100644 --- a/src/blob.rs +++ b/src/blob.rs @@ -763,7 +763,6 @@ mod tests { use fs::File; use super::*; - use crate::chat::{self, create_group_chat, ProtectionStatus}; use crate::message::{Message, Viewtype}; use crate::test_utils::{self, TestContext}; @@ -1456,38 +1455,4 @@ mod tests { check_image_size(file_saved, width, height); Ok(()) } - - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] - async fn test_increation_in_blobdir() -> Result<()> { - let t = TestContext::new_alice().await; - let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "abc").await?; - - let file = t.get_blobdir().join("anyfile.dat"); - fs::write(&file, b"bla").await?; - let mut msg = Message::new(Viewtype::File); - msg.set_file(file.to_str().unwrap(), None); - let prepared_id = chat::prepare_msg(&t, chat_id, &mut msg).await?; - assert_eq!(prepared_id, msg.id); - assert!(msg.is_increation()); - - let msg = Message::load_from_db(&t, prepared_id).await?; - assert!(msg.is_increation()); - - Ok(()) - } - - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] - async fn test_increation_not_blobdir() -> Result<()> { - let t = TestContext::new_alice().await; - let chat_id = create_group_chat(&t, ProtectionStatus::Unprotected, "abc").await?; - assert_ne!(t.get_blobdir().to_str(), t.dir.path().to_str()); - - let file = t.dir.path().join("anyfile.dat"); - fs::write(&file, b"bla").await?; - let mut msg = Message::new(Viewtype::File); - msg.set_file(file.to_str().unwrap(), None); - assert!(chat::prepare_msg(&t, chat_id, &mut msg).await.is_err()); - - Ok(()) - } } diff --git a/src/chat.rs b/src/chat.rs index d05ce56f7..320fffb85 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -312,7 +312,7 @@ impl ChatId { /// Create a group or mailinglist raw database record with the given parameters. /// The function does not add SELF nor checks if the record already exists. - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub(crate) async fn create_multiuser_record( context: &Context, chattype: Chattype, @@ -888,7 +888,7 @@ impl ChatId { _ => { let blob = msg .param - .get_blob(Param::File, context, !msg.is_increation()) + .get_blob(Param::File, context) .await? .context("no file stored in params")?; msg.param.set(Param::File, blob.as_name()); @@ -2677,26 +2677,13 @@ impl ChatIdBlocked { } } -/// Prepares a message for sending. -pub async fn prepare_msg(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result { - ensure!( - !chat_id.is_special(), - "Cannot prepare message for special chat" - ); - - let msg_id = prepare_msg_common(context, chat_id, msg, MessageState::OutPreparing).await?; - context.emit_msgs_changed(msg.chat_id, msg.id); - - Ok(msg_id) -} - async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> { if msg.viewtype == Viewtype::Text || msg.viewtype == Viewtype::VideochatInvitation { // the caller should check if the message text is empty } else if msg.viewtype.has_file() { let mut blob = msg .param - .get_blob(Param::File, context, !msg.is_increation()) + .get_blob(Param::File, context) .await? .with_context(|| format!("attachment missing for message of type #{}", msg.viewtype))?; let send_as_is = msg.viewtype == Viewtype::File; @@ -2771,13 +2758,92 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> { Ok(()) } +/// Returns whether a contact is in a chat or not. +pub async fn is_contact_in_chat( + context: &Context, + chat_id: ChatId, + contact_id: ContactId, +) -> Result { + // this function works for group and for normal chats, however, it is more useful + // for group chats. + // ContactId::SELF may be used to check, if the user itself is in a group + // chat (ContactId::SELF is not added to normal chats) + + let exists = context + .sql + .exists( + "SELECT COUNT(*) FROM chats_contacts WHERE chat_id=? AND contact_id=?;", + (chat_id, contact_id), + ) + .await?; + Ok(exists) +} + +/// Sends a message object to a chat. +/// +/// Sends the event #DC_EVENT_MSGS_CHANGED on success. +/// However, this does not imply, the message really reached the recipient - +/// sending may be delayed eg. due to network problems. However, from your +/// view, you're done with the message. Sooner or later it will find its way. +pub async fn send_msg(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result { + ensure!( + !chat_id.is_special(), + "chat_id cannot be a special chat: {chat_id}" + ); + + if msg.state != MessageState::Undefined && msg.state != MessageState::OutPreparing { + msg.param.remove(Param::GuaranteeE2ee); + msg.param.remove(Param::ForcePlaintext); + msg.update_param(context).await?; + } + + // protect all system messages against RTLO attacks + if msg.is_system_message() { + msg.text = sanitize_bidi_characters(&msg.text); + } + + if !prepare_send_msg(context, chat_id, msg).await?.is_empty() { + if !msg.hidden { + context.emit_msgs_changed(msg.chat_id, msg.id); + } + + if msg.param.exists(Param::SetLatitude) { + context.emit_location_changed(Some(ContactId::SELF)).await?; + } + + context.scheduler.interrupt_smtp().await; + } + + Ok(msg.id) +} + +/// Tries to send a message synchronously. +/// +/// Creates jobs in the `smtp` table, then drectly opens an SMTP connection and sends the +/// message. If this fails, the jobs remain in the database for later sending. +pub async fn send_msg_sync(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result { + let rowids = prepare_send_msg(context, chat_id, msg).await?; + if rowids.is_empty() { + return Ok(msg.id); + } + let mut smtp = crate::smtp::Smtp::new(); + for rowid in rowids { + send_msg_to_smtp(context, &mut smtp, rowid) + .await + .context("failed to send message, queued for later sending")?; + } + context.emit_msgs_changed(msg.chat_id, msg.id); + Ok(msg.id) +} + /// Prepares a message to be sent out. -async fn prepare_msg_common( +/// +/// Returns row ids of the `smtp` table. +async fn prepare_send_msg( context: &Context, chat_id: ChatId, msg: &mut Message, - change_state_to: MessageState, -) -> Result { +) -> Result> { let mut chat = Chat::load_from_db(context, chat_id).await?; // Check if the chat can be sent to. @@ -2821,7 +2887,7 @@ async fn prepare_msg_common( }; // ... then change the MessageState in the message object - msg.state = change_state_to; + msg.state = MessageState::OutPending; prepare_msg_blob(context, msg).await?; if !msg.hidden { @@ -2837,125 +2903,6 @@ async fn prepare_msg_common( .await?; msg.chat_id = chat_id; - Ok(msg.id) -} - -/// Returns whether a contact is in a chat or not. -pub async fn is_contact_in_chat( - context: &Context, - chat_id: ChatId, - contact_id: ContactId, -) -> Result { - // this function works for group and for normal chats, however, it is more useful - // for group chats. - // ContactId::SELF may be used to check, if the user itself is in a group - // chat (ContactId::SELF is not added to normal chats) - - let exists = context - .sql - .exists( - "SELECT COUNT(*) FROM chats_contacts WHERE chat_id=? AND contact_id=?;", - (chat_id, contact_id), - ) - .await?; - Ok(exists) -} - -/// Sends a message object to a chat. -/// -/// Sends the event #DC_EVENT_MSGS_CHANGED on success. -/// However, this does not imply, the message really reached the recipient - -/// sending may be delayed eg. due to network problems. However, from your -/// view, you're done with the message. Sooner or later it will find its way. -// TODO: Do not allow ChatId to be 0, if prepare_msg had been called -// the caller can get it from msg.chat_id. Forwards would need to -// be fixed for this somehow too. -pub async fn send_msg(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result { - if chat_id.is_unset() { - let forwards = msg.param.get(Param::PrepForwards); - if let Some(forwards) = forwards { - for forward in forwards.split(' ') { - if let Ok(msg_id) = forward.parse::().map(MsgId::new) { - if let Ok(mut msg) = Message::load_from_db(context, msg_id).await { - send_msg_inner(context, chat_id, &mut msg).await?; - }; - } - } - msg.param.remove(Param::PrepForwards); - msg.update_param(context).await?; - } - return send_msg_inner(context, chat_id, msg).await; - } - - if msg.state != MessageState::Undefined && msg.state != MessageState::OutPreparing { - msg.param.remove(Param::GuaranteeE2ee); - msg.param.remove(Param::ForcePlaintext); - msg.update_param(context).await?; - } - send_msg_inner(context, chat_id, msg).await -} - -/// Tries to send a message synchronously. -/// -/// Creates jobs in the `smtp` table, then drectly opens an SMTP connection and sends the -/// message. If this fails, the jobs remain in the database for later sending. -pub async fn send_msg_sync(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result { - let rowids = prepare_send_msg(context, chat_id, msg).await?; - if rowids.is_empty() { - return Ok(msg.id); - } - let mut smtp = crate::smtp::Smtp::new(); - for rowid in rowids { - send_msg_to_smtp(context, &mut smtp, rowid) - .await - .context("failed to send message, queued for later sending")?; - } - context.emit_msgs_changed(msg.chat_id, msg.id); - Ok(msg.id) -} - -async fn send_msg_inner(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result { - // protect all system messages against RTLO attacks - if msg.is_system_message() { - msg.text = sanitize_bidi_characters(&msg.text); - } - - if !prepare_send_msg(context, chat_id, msg).await?.is_empty() { - if !msg.hidden { - context.emit_msgs_changed(msg.chat_id, msg.id); - } - - if msg.param.exists(Param::SetLatitude) { - context.emit_location_changed(Some(ContactId::SELF)).await?; - } - - context.scheduler.interrupt_smtp().await; - } - - Ok(msg.id) -} - -/// Returns row ids of the `smtp` table. -async fn prepare_send_msg( - context: &Context, - chat_id: ChatId, - msg: &mut Message, -) -> Result> { - // prepare_msg() leaves the message state to OutPreparing, we - // only have to change the state to OutPending in this case. - // Otherwise we still have to prepare the message, which will set - // the state to OutPending. - if msg.state != MessageState::OutPreparing { - // automatically prepare normal messages - prepare_msg_common(context, chat_id, msg, MessageState::OutPending).await?; - } else { - // update message state of separately prepared messages - ensure!( - chat_id.is_unset() || chat_id == msg.chat_id, - "Inconsistent chat ID" - ); - message::update_msg_state(context, msg.id, MessageState::OutPending).await?; - } let row_ids = create_send_msg_jobs(context, msg) .await .context("Failed to create send jobs")?; @@ -4173,8 +4120,6 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId) bail!("cannot forward drafts."); } - let original_param = msg.param.clone(); - // we tested a sort of broadcast // by not marking own forwarded messages as such, // however, this turned out to be to confusing and unclear. @@ -4197,33 +4142,13 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId) // do not leak data as group names; a default subject is generated by mimefactory msg.subject = "".to_string(); - let new_msg_id: MsgId; - if msg.state == MessageState::OutPreparing { - new_msg_id = chat - .prepare_msg_raw(context, &mut msg, None, curr_timestamp) - .await?; - curr_timestamp += 1; - msg.param = original_param; - msg.id = src_msg_id; - - if let Some(old_fwd) = msg.param.get(Param::PrepForwards) { - let new_fwd = format!("{} {}", old_fwd, new_msg_id.to_u32()); - msg.param.set(Param::PrepForwards, new_fwd); - } else { - msg.param - .set(Param::PrepForwards, new_msg_id.to_u32().to_string()); - } - - msg.update_param(context).await?; - } else { - msg.state = MessageState::OutPending; - new_msg_id = chat - .prepare_msg_raw(context, &mut msg, None, curr_timestamp) - .await?; - curr_timestamp += 1; - if !create_send_msg_jobs(context, &mut msg).await?.is_empty() { - context.scheduler.interrupt_smtp().await; - } + msg.state = MessageState::OutPending; + let new_msg_id = chat + .prepare_msg_raw(context, &mut msg, None, curr_timestamp) + .await?; + curr_timestamp += 1; + if !create_send_msg_jobs(context, &mut msg).await?.is_empty() { + context.scheduler.interrupt_smtp().await; } created_chats.push(chat_id); created_msgs.push(new_msg_id); @@ -4519,7 +4444,7 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul /// /// For example, it can be a message showing that a member was added to a group. /// Doesn't fail if the chat doesn't exist. -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] pub(crate) async fn add_info_msg_with_cmd( context: &Context, chat_id: ChatId, @@ -4866,15 +4791,12 @@ mod tests { assert_eq!(test.text, "hello2".to_string()); assert_eq!(test.state, MessageState::OutDraft); - let id_after_prepare = prepare_msg(&t, *chat_id, &mut msg).await?; - assert_eq!(id_after_prepare, id_after_1st_set); - let test = Message::load_from_db(&t, id_after_prepare).await?; - assert_eq!(test.state, MessageState::OutPreparing); - assert!(!test.hidden); // sent draft must no longer be hidden - let id_after_send = send_msg(&t, *chat_id, &mut msg).await?; assert_eq!(id_after_send, id_after_1st_set); + let test = Message::load_from_db(&t, id_after_send).await?; + assert!(!test.hidden); // sent draft must no longer be hidden + Ok(()) } @@ -5626,7 +5548,6 @@ mod tests { let mut msg = Message::new_text("message text".to_string()); assert!(send_msg(&t, device_chat_id, &mut msg).await.is_err()); - assert!(prepare_msg(&t, device_chat_id, &mut msg).await.is_err()); let msg_id = add_device_msg(&t, None, Some(&mut msg)).await.unwrap(); assert!(forward_msgs(&t, &[msg_id], device_chat_id).await.is_err()); diff --git a/src/contact.rs b/src/contact.rs index 6ce4ecfa9..61ad7db1f 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -805,7 +805,6 @@ impl Contact { } let mut name = sanitize_name(name); - #[allow(clippy::collapsible_if)] if origin <= Origin::OutgoingTo { // The user may accidentally have written to a "noreply" address with another MUA: if addr.contains("noreply") diff --git a/src/ephemeral.rs b/src/ephemeral.rs index 276119028..f8ff056da 100644 --- a/src/ephemeral.rs +++ b/src/ephemeral.rs @@ -930,7 +930,6 @@ mod tests { // Alice sends a text message. let mut msg = Message::new(Viewtype::Text); - chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?; chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?; let sent = alice.pop_sent_msg().await; @@ -957,14 +956,12 @@ mod tests { // Alice sends message to Bob let mut msg = Message::new(Viewtype::Text); - chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?; chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?; let sent = alice.pop_sent_msg().await; bob.recv_msg(&sent).await; // Alice sends second message to Bob, with no timer let mut msg = Message::new(Viewtype::Text); - chat::prepare_msg(&alice.ctx, chat_alice, &mut msg).await?; chat::send_msg(&alice.ctx, chat_alice, &mut msg).await?; let sent = alice.pop_sent_msg().await; diff --git a/src/html.rs b/src/html.rs index e32ee4357..c58f099c8 100644 --- a/src/html.rs +++ b/src/html.rs @@ -7,6 +7,8 @@ //! `MsgId.get_html()` will return HTML - //! this allows nice quoting, handling linebreaks properly etc. +use std::mem; + use anyhow::{Context as _, Result}; use base64::Engine as _; use lettre_email::mime::Mime; @@ -77,21 +79,26 @@ fn get_mime_multipart_type(ctype: &ParsedContentType) -> MimeMultipartType { struct HtmlMsgParser { pub html: String, pub plain: Option, + pub(crate) msg_html: String, } impl HtmlMsgParser { /// Function takes a raw mime-message string, /// searches for the main-text part /// and returns that as parser.html - pub async fn from_bytes(context: &Context, rawmime: &[u8]) -> Result<Self> { + pub async fn from_bytes<'a>( + context: &Context, + rawmime: &'a [u8], + ) -> Result<(Self, mailparse::ParsedMail<'a>)> { let mut parser = HtmlMsgParser { html: "".to_string(), plain: None, + msg_html: "".to_string(), }; - let parsedmail = mailparse::parse_mail(rawmime)?; + let parsedmail = mailparse::parse_mail(rawmime).context("Failed to parse mail")?; - parser.collect_texts_recursive(&parsedmail).await?; + parser.collect_texts_recursive(context, &parsedmail).await?; if parser.html.is_empty() { if let Some(plain) = &parser.plain { @@ -100,8 +107,8 @@ impl HtmlMsgParser { } else { parser.cid_to_data_recursive(context, &parsedmail).await?; } - - Ok(parser) + parser.html += &mem::take(&mut parser.msg_html); + Ok((parser, parsedmail)) } /// Function iterates over all mime-parts @@ -114,12 +121,13 @@ impl HtmlMsgParser { /// therefore we use the first one. async fn collect_texts_recursive<'a>( &'a mut self, + context: &'a Context, mail: &'a mailparse::ParsedMail<'a>, ) -> Result<()> { match get_mime_multipart_type(&mail.ctype) { MimeMultipartType::Multiple => { for cur_data in &mail.subparts { - Box::pin(self.collect_texts_recursive(cur_data)).await? + Box::pin(self.collect_texts_recursive(context, cur_data)).await? } Ok(()) } @@ -128,8 +136,35 @@ impl HtmlMsgParser { if raw.is_empty() { return Ok(()); } - let mail = mailparse::parse_mail(&raw).context("failed to parse mail")?; - Box::pin(self.collect_texts_recursive(&mail)).await + let (parser, mail) = Box::pin(HtmlMsgParser::from_bytes(context, &raw)).await?; + if !parser.html.is_empty() { + let mut text = "\r\n\r\n".to_string(); + for h in mail.headers { + let key = h.get_key(); + if matches!( + key.to_lowercase().as_str(), + "date" + | "from" + | "sender" + | "reply-to" + | "to" + | "cc" + | "bcc" + | "subject" + ) { + text += &format!("{key}: {}\r\n", h.get_value()); + } + } + text += "\r\n"; + self.msg_html += &PlainText { + text, + flowed: false, + delsp: false, + } + .to_html(); + self.msg_html += &parser.html; + } + Ok(()) } MimeMultipartType::Single => { let mimetype = mail.ctype.mimetype.parse::<Mime>()?; @@ -175,14 +210,7 @@ impl HtmlMsgParser { } Ok(()) } - MimeMultipartType::Message => { - let raw = mail.get_body_raw()?; - if raw.is_empty() { - return Ok(()); - } - let mail = mailparse::parse_mail(&raw).context("failed to parse mail")?; - Box::pin(self.cid_to_data_recursive(context, &mail)).await - } + MimeMultipartType::Message => Ok(()), MimeMultipartType::Single => { let mimetype = mail.ctype.mimetype.parse::<Mime>()?; if mimetype.type_() == mime::IMAGE { @@ -240,7 +268,7 @@ impl MsgId { warn!(context, "get_html: parser error: {:#}", err); Ok(None) } - Ok(parser) => Ok(Some(parser.html)), + Ok((parser, _)) => Ok(Some(parser.html)), } } else { warn!(context, "get_html: no mime for {}", self); @@ -274,7 +302,7 @@ mod tests { async fn test_htmlparse_plain_unspecified() { let t = TestContext::new().await; let raw = include_bytes!("../test-data/message/text_plain_unspecified.eml"); - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); assert_eq!( parser.html, r#"<!DOCTYPE html> @@ -292,7 +320,7 @@ This message does not have Content-Type nor Subject.<br/> async fn test_htmlparse_plain_iso88591() { let t = TestContext::new().await; let raw = include_bytes!("../test-data/message/text_plain_iso88591.eml"); - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); assert_eq!( parser.html, r#"<!DOCTYPE html> @@ -310,7 +338,7 @@ message with a non-UTF-8 encoding: äöüßÄÖÜ<br/> async fn test_htmlparse_plain_flowed() { let t = TestContext::new().await; let raw = include_bytes!("../test-data/message/text_plain_flowed.eml"); - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); assert!(parser.plain.unwrap().flowed); assert_eq!( parser.html, @@ -332,7 +360,7 @@ and will be wrapped as usual.<br/> async fn test_htmlparse_alt_plain() { let t = TestContext::new().await; let raw = include_bytes!("../test-data/message/text_alt_plain.eml"); - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); assert_eq!( parser.html, r#"<!DOCTYPE html> @@ -353,7 +381,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x async fn test_htmlparse_html() { let t = TestContext::new().await; let raw = include_bytes!("../test-data/message/text_html.eml"); - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); // on windows, `\r\n` linends are returned from mimeparser, // however, rust multiline-strings use just `\n`; @@ -371,7 +399,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x async fn test_htmlparse_alt_html() { let t = TestContext::new().await; let raw = include_bytes!("../test-data/message/text_alt_html.eml"); - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); assert_eq!( parser.html.replace('\r', ""), // see comment in test_htmlparse_html() r##"<html> @@ -386,7 +414,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x async fn test_htmlparse_alt_plain_html() { let t = TestContext::new().await; let raw = include_bytes!("../test-data/message/text_alt_plain_html.eml"); - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); assert_eq!( parser.html.replace('\r', ""), // see comment in test_htmlparse_html() r##"<html> @@ -411,7 +439,7 @@ test some special html-characters as &lt; &gt; and &amp; but also &quot; and &#x assert!(test.find("data:").is_none()); // parsing converts cid: to data: - let parser = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); + let (parser, _) = HtmlMsgParser::from_bytes(&t.ctx, raw).await.unwrap(); assert!(parser.html.contains("<html>")); assert!(!parser.html.contains("Content-Id:")); assert!(parser.html.contains("data:image/jpeg;base64,/9j/4AAQ")); diff --git a/src/imap.rs b/src/imap.rs index d6319e67d..cbf241071 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -1301,7 +1301,7 @@ impl Session { /// Returns the last UID fetched successfully and the info about each downloaded message. /// If the message is incorrect or there is a failure to write a message to the database, /// it is skipped and the error is logged. - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub(crate) async fn fetch_many_msgs( &mut self, context: &Context, @@ -1560,52 +1560,54 @@ impl Session { return Ok(()); }; - let device_token_changed = context - .get_config(Config::DeviceToken) - .await? - .map_or(true, |config_token| device_token != config_token); - - if device_token_changed && self.can_metadata() && self.can_push() { - let folder = context - .get_config(Config::ConfiguredInboxFolder) + if self.can_metadata() && self.can_push() { + let device_token_changed = context + .get_config(Config::DeviceToken) .await? - .context("INBOX is not configured")?; + .map_or(true, |config_token| device_token != config_token); - let encrypted_device_token = - encrypt_device_token(&device_token).context("Failed to encrypt device token")?; + if device_token_changed { + let folder = context + .get_config(Config::ConfiguredInboxFolder) + .await? + .context("INBOX is not configured")?; - // We expect that the server supporting `XDELTAPUSH` capability - // has non-synchronizing literals support as well: - // <https://www.rfc-editor.org/rfc/rfc7888>. - let encrypted_device_token_len = encrypted_device_token.len(); + let encrypted_device_token = encrypt_device_token(&device_token) + .context("Failed to encrypt device token")?; - if encrypted_device_token_len <= 4096 { - self.run_command_and_check_ok(&format_setmetadata( - &folder, - &encrypted_device_token, - )) - .await - .context("SETMETADATA command failed")?; + // We expect that the server supporting `XDELTAPUSH` capability + // has non-synchronizing literals support as well: + // <https://www.rfc-editor.org/rfc/rfc7888>. + let encrypted_device_token_len = encrypted_device_token.len(); - // Store device token saved on the server - // to prevent storing duplicate tokens. - // The server cannot deduplicate on its own - // because encryption gives a different - // result each time. - context - .set_config_internal(Config::DeviceToken, Some(&device_token)) - .await?; - } else { - // If Apple or Google (FCM) gives us a very large token, - // do not even try to give it to IMAP servers. - // - // Limit of 4096 is arbitrarily selected - // to be the same as required by LITERAL- IMAP extension. - // - // Dovecot supports LITERAL+ and non-synchronizing literals - // of any length, but there is no reason for tokens - // to be that large even after OpenPGP encryption. - warn!(context, "Device token is too long for LITERAL-, ignoring."); + if encrypted_device_token_len <= 4096 { + self.run_command_and_check_ok(&format_setmetadata( + &folder, + &encrypted_device_token, + )) + .await + .context("SETMETADATA command failed")?; + + // Store device token saved on the server + // to prevent storing duplicate tokens. + // The server cannot deduplicate on its own + // because encryption gives a different + // result each time. + context + .set_config_internal(Config::DeviceToken, Some(&device_token)) + .await?; + } else { + // If Apple or Google (FCM) gives us a very large token, + // do not even try to give it to IMAP servers. + // + // Limit of 4096 is arbitrarily selected + // to be the same as required by LITERAL- IMAP extension. + // + // Dovecot supports LITERAL+ and non-synchronizing literals + // of any length, but there is no reason for tokens + // to be that large even after OpenPGP encryption. + warn!(context, "Device token is too long for LITERAL-, ignoring."); + } } context.push_subscribed.store(true, Ordering::Relaxed); } else if !context.push_subscriber.heartbeat_subscribed().await { @@ -2687,7 +2689,6 @@ mod tests { } } - #[allow(clippy::too_many_arguments)] async fn check_target_folder_combination( folder: &str, mvbox_move: bool, diff --git a/src/key.rs b/src/key.rs index b03d06610..dc3aca799 100644 --- a/src/key.rs +++ b/src/key.rs @@ -30,7 +30,39 @@ use crate::tools::{self, time_elapsed}; pub(crate) trait DcKey: Serialize + Deserializable + PublicKeyTrait + Clone { /// Create a key from some bytes. fn from_slice(bytes: &[u8]) -> Result<Self> { - Ok(<Self as Deserializable>::from_bytes(Cursor::new(bytes))?) + let res = <Self as Deserializable>::from_bytes(Cursor::new(bytes)); + if let Ok(res) = res { + return Ok(res); + } + + // Workaround for keys imported using + // Delta Chat core < 1.0.0. + // Old Delta Chat core had a bug + // that resulted in treating CRC24 checksum + // as part of the key when reading ASCII Armor. + // Some users that started using Delta Chat in 2019 + // have such corrupted keys with garbage bytes at the end. + // + // Garbage is at least 3 bytes long + // and may be longer due to padding + // at the end of the real key data + // and importing the key multiple times. + // + // If removing 10 bytes is not enough, + // the key is likely actually corrupted. + for garbage_bytes in 3..std::cmp::min(bytes.len(), 10) { + let res = <Self as Deserializable>::from_bytes(Cursor::new( + bytes + .get(..bytes.len().saturating_sub(garbage_bytes)) + .unwrap_or_default(), + )); + if let Ok(res) = res { + return Ok(res); + } + } + + // Removing garbage bytes did not help, return the error. + Ok(res?) } /// Create a key from a base64 string. @@ -565,6 +597,36 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD } } + /// Tests workaround for Delta Chat core < 1.0.0 + /// which parsed CRC24 at the end of ASCII Armor + /// as the part of the key. + /// Depending on the alignment and the number of + /// `=` characters at the end of the key, + /// this resulted in various number of garbage + /// octets at the end of the key, starting from 3 octets, + /// but possibly 4 or 5 and maybe more octets + /// if the key is imported or transferred + /// using Autocrypt Setup Message multiple times. + #[test] + fn test_ignore_trailing_garbage() { + // Test several variants of garbage. + for garbage in [ + b"\x02\xfc\xaa\x38\x4b\x5c".as_slice(), + b"\x02\xfc\xaa".as_slice(), + b"\x01\x02\x03\x04\x05".as_slice(), + ] { + let private_key = KEYPAIR.secret.clone(); + + let mut binary = DcKey::to_bytes(&private_key); + binary.extend(garbage); + + let private_key2 = + SignedSecretKey::from_slice(&binary).expect("Failed to ignore garbage"); + + assert_eq!(private_key.dc_fingerprint(), private_key2.dc_fingerprint()); + } + } + #[test] fn test_base64_roundtrip() { let key = KEYPAIR.public.clone(); diff --git a/src/message.rs b/src/message.rs index 75f3813cd..f7467b009 100644 --- a/src/message.rs +++ b/src/message.rs @@ -348,7 +348,7 @@ impl MsgId { let server_urls = Self::get_info_server_urls(context, msg.rfc724_mid).await?; for server_url in server_urls { // Format as RFC 5092 relative IMAP URL. - ret += &format!("\n{server_url}"); + ret += &format!("\nServer-URL: {server_url}"); } } let hop_info = self.hop_info(context).await?; @@ -953,18 +953,6 @@ impl Message { cmd != SystemMessage::Unknown } - /// Whether the message is still being created. - /// - /// Messages with attachments might be created before the - /// attachment is ready. In this case some more restrictions on - /// the attachment apply, e.g. if the file to be attached is still - /// being written to or otherwise will still change it can not be - /// copied to the blobdir. Thus those attachments need to be - /// created immediately in the blobdir with a valid filename. - pub fn is_increation(&self) -> bool { - self.viewtype.has_file() && self.state == MessageState::OutPreparing - } - /// Returns true if the message is an Autocrypt Setup Message. pub fn is_setupmessage(&self) -> bool { if self.viewtype != Viewtype::File { @@ -2206,38 +2194,6 @@ mod tests { ); } - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] - async fn test_prepare_message_and_send() { - let d = test::TestContext::new().await; - let ctx = &d.ctx; - - ctx.set_config(Config::ConfiguredAddr, Some("self@example.com")) - .await - .unwrap(); - - let chat = d.create_chat_with_contact("", "dest@example.com").await; - - let mut msg = Message::new(Viewtype::Text); - - let msg_id = chat::prepare_msg(ctx, chat.id, &mut msg).await.unwrap(); - - let _msg2 = Message::load_from_db(ctx, msg_id).await.unwrap(); - assert_eq!(_msg2.get_filemime(), None); - } - - /// Tests that message can be prepared even if account has no configured address. - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] - async fn test_prepare_not_configured() { - let d = test::TestContext::new().await; - let ctx = &d.ctx; - - let chat = d.create_chat_with_contact("", "dest@example.com").await; - - let mut msg = Message::new(Viewtype::Text); - - assert!(chat::prepare_msg(ctx, chat.id, &mut msg).await.is_ok()); - } - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_parse_webrtc_instance() { let (webrtc_type, url) = Message::parse_webrtc_instance("basicwebrtc:https://foo/bar"); @@ -2357,9 +2313,9 @@ mod tests { let mut msg = Message::new_text("Quoted message".to_string()); - // Prepare message for sending, so it gets a Message-Id. + // Send message, so it gets a Message-Id. assert!(msg.rfc724_mid.is_empty()); - let msg_id = chat::prepare_msg(ctx, chat.id, &mut msg).await.unwrap(); + let msg_id = chat::send_msg(ctx, chat.id, &mut msg).await.unwrap(); let msg = Message::load_from_db(ctx, msg_id).await.unwrap(); assert!(!msg.rfc724_mid.is_empty()); diff --git a/src/mimefactory.rs b/src/mimefactory.rs index 52820a143..878007304 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -1047,7 +1047,6 @@ impl MimeFactory { part.body(text) } - #[allow(clippy::cognitive_complexity)] async fn render_message( &mut self, context: &Context, @@ -1516,7 +1515,7 @@ async fn build_body_file( ) -> Result<(PartBuilder, String)> { let blob = msg .param - .get_blob(Param::File, context, true) + .get_blob(Param::File, context) .await? .context("msg has no file")?; let suffix = blob.suffix().unwrap_or("dat"); @@ -1905,7 +1904,7 @@ mod tests { ) .await .unwrap(); - let new_msg = incoming_msg_to_reply_msg( + let mut new_msg = incoming_msg_to_reply_msg( b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: bob@example.com\n\ To: alice@example.org\n\ @@ -1931,6 +1930,9 @@ mod tests { Original-Message-ID: <2893@example.com>\n\ Disposition: manual-action/MDN-sent-automatically; displayed\n\ \n", &t).await; + chat::send_msg(&t, new_msg.chat_id, &mut new_msg) + .await + .unwrap(); let mf = MimeFactory::from_msg(&t, new_msg).await.unwrap(); // The subject string should not be "Re: message opened" assert_eq!("Re: Hello, Bob", mf.subject_str(&t).await.unwrap()); @@ -2077,7 +2079,7 @@ mod tests { let mut new_msg = Message::new_text("Hi".to_string()); new_msg.chat_id = chat_id; - chat::prepare_msg(&t, chat_id, &mut new_msg).await.unwrap(); + chat::send_msg(&t, chat_id, &mut new_msg).await.unwrap(); let mf = MimeFactory::from_msg(&t, new_msg).await.unwrap(); @@ -2134,7 +2136,7 @@ mod tests { ) -> String { let t = TestContext::new_alice().await; let mut new_msg = incoming_msg_to_reply_msg(imf_raw, &t).await; - let incoming_msg = get_chat_msg(&t, new_msg.chat_id, 0, 2).await; + let incoming_msg = get_chat_msg(&t, new_msg.chat_id, 0, 1).await; if delete_original_msg { incoming_msg.id.trash(&t, false).await.unwrap(); @@ -2164,6 +2166,9 @@ mod tests { new_msg.set_quote(&t, Some(&incoming_msg)).await.unwrap(); } + chat::send_msg(&t, new_msg.chat_id, &mut new_msg) + .await + .unwrap(); let mf = MimeFactory::from_msg(&t, new_msg).await.unwrap(); mf.subject_str(&t).await.unwrap() } @@ -2184,9 +2189,6 @@ mod tests { let mut new_msg = Message::new_text("Hi".to_string()); new_msg.chat_id = chat_id; - chat::prepare_msg(context, chat_id, &mut new_msg) - .await - .unwrap(); new_msg } @@ -2197,7 +2199,7 @@ mod tests { let t = TestContext::new_alice().await; let context = &t; - let msg = incoming_msg_to_reply_msg( + let mut msg = incoming_msg_to_reply_msg( b"Received: (Postfix, from userid 1000); Mon, 4 Dec 2006 14:51:39 +0100 (CET)\n\ From: Charlie <charlie@example.com>\n\ To: alice@example.org\n\ @@ -2210,6 +2212,7 @@ mod tests { context, ) .await; + chat::send_msg(&t, msg.chat_id, &mut msg).await.unwrap(); let mimefactory = MimeFactory::from_msg(&t, msg).await.unwrap(); diff --git a/src/mimeparser.rs b/src/mimeparser.rs index 52219a8f0..4eb80b4d9 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -105,14 +105,12 @@ pub(crate) struct MimeMessage { /// received. pub(crate) footer: Option<String>, - // if this flag is set, the parts/text/etc. are just close to the original mime-message; - // clients should offer a way to view the original message in this case + /// If set, this is a modified MIME message; clients should offer a way to view the original + /// MIME message in this case. pub is_mime_modified: bool, - /// The decrypted, raw mime structure. - /// - /// This is non-empty iff `is_mime_modified` and the message was actually encrypted. It is used - /// for e.g. late-parsing HTML. + /// Decrypted, raw MIME structure. Nonempty iff `is_mime_modified` and the message was actually + /// encrypted. pub decoded_data: Vec<u8>, /// Hop info for debugging. @@ -1281,7 +1279,7 @@ impl MimeMessage { Ok(self.parts.len() > old_part_count) } - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] async fn do_add_single_file_part( &mut self, context: &Context, @@ -3091,11 +3089,7 @@ MDYyMDYxNTE1RTlDOEE4Cj4+CnN0YXJ0eHJlZgo4Mjc4CiUlRU9GCg== // Make sure the file is there even though the html is wrong: let param = &message.parts[0].param; - let blob: BlobObject = param - .get_blob(Param::File, &t, false) - .await - .unwrap() - .unwrap(); + let blob: BlobObject = param.get_blob(Param::File, &t).await.unwrap().unwrap(); let f = tokio::fs::File::open(blob.to_abs_path()).await.unwrap(); let size = f.metadata().await.unwrap().len(); assert_eq!(size, 154); diff --git a/src/net/http.rs b/src/net/http.rs index 94e85f68c..7360ed362 100644 --- a/src/net/http.rs +++ b/src/net/http.rs @@ -6,14 +6,17 @@ use http_body_util::BodyExt; use hyper_util::rt::TokioIo; use mime::Mime; use serde::Serialize; +use tokio::fs; +use crate::blob::BlobObject; use crate::context::Context; use crate::net::proxy::ProxyConfig; use crate::net::session::SessionStream; use crate::net::tls::wrap_rustls; +use crate::tools::{create_id, time}; /// HTTP(S) GET response. -#[derive(Debug)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct Response { /// Response body. pub blob: Vec<u8>, @@ -90,9 +93,144 @@ where Ok(sender) } -/// Retrieves the binary contents of URL using HTTP GET request. -pub async fn read_url_blob(context: &Context, url: &str) -> Result<Response> { - let mut url = url.to_string(); +/// Converts the URL to expiration and stale timestamps. +fn http_url_cache_timestamps(url: &str, mimetype: Option<&str>) -> (i64, i64) { + let now = time(); + + let expires = now + 3600 * 24 * 35; + let stale = if url.ends_with(".xdc") { + // WebXDCs are never stale, they just expire. + expires + } else if mimetype.is_some_and(|s| s.starts_with("image/")) { + // Cache images for 1 day. + // + // As of 2024-12-12 WebXDC icons at <https://webxdc.org/apps/> + // use the same path for all app versions, + // so may change, but it is not critical if outdated icon is displayed. + now + 3600 * 24 + } else { + // Revalidate everything else after 1 hour. + // + // This includes HTML, CSS and JS. + now + 3600 + }; + (expires, stale) +} + +/// Places the binary into HTTP cache. +async fn http_cache_put(context: &Context, url: &str, response: &Response) -> Result<()> { + let blob = BlobObject::create( + context, + &format!("http_cache_{}", create_id()), + response.blob.as_slice(), + ) + .await?; + + let (expires, stale) = http_url_cache_timestamps(url, response.mimetype.as_deref()); + context + .sql + .insert( + "INSERT OR REPLACE INTO http_cache (url, expires, stale, blobname, mimetype, encoding) + VALUES (?, ?, ?, ?, ?, ?)", + ( + url, + expires, + stale, + blob.as_name(), + response.mimetype.as_deref().unwrap_or_default(), + response.encoding.as_deref().unwrap_or_default(), + ), + ) + .await?; + + Ok(()) +} + +/// Retrieves the binary from HTTP cache. +/// +/// Also returns if the response is stale and should be revalidated in the background. +async fn http_cache_get(context: &Context, url: &str) -> Result<Option<(Response, bool)>> { + let now = time(); + let Some((blob_name, mimetype, encoding, is_stale)) = context + .sql + .query_row_optional( + "SELECT blobname, mimetype, encoding, stale + FROM http_cache WHERE url=? AND expires > ?", + (url, now), + |row| { + let blob_name: String = row.get(0)?; + let mimetype: Option<String> = Some(row.get(1)?).filter(|s: &String| !s.is_empty()); + let encoding: Option<String> = Some(row.get(2)?).filter(|s: &String| !s.is_empty()); + let stale_timestamp: i64 = row.get(3)?; + Ok((blob_name, mimetype, encoding, now > stale_timestamp)) + }, + ) + .await? + else { + return Ok(None); + }; + + let blob_object = BlobObject::from_name(context, blob_name)?; + let blob_abs_path = blob_object.to_abs_path(); + let blob = match fs::read(blob_abs_path) + .await + .with_context(|| format!("Failed to read blob for {url:?} cache entry.")) + { + Ok(blob) => blob, + Err(err) => { + // This should not happen, but user may go into the blobdir and remove files, + // antivirus may delete the file or there may be a bug in housekeeping. + warn!(context, "{err:?}."); + return Ok(None); + } + }; + + let (expires, _stale) = http_url_cache_timestamps(url, mimetype.as_deref()); + let response = Response { + blob, + mimetype, + encoding, + }; + + // Update expiration timestamp + // to prevent deletion of the file still in use. + // + // We do not update stale timestamp here + // as we have not revalidated the response. + // Stale timestamp is updated only + // when the URL is sucessfully fetched. + context + .sql + .execute( + "UPDATE http_cache SET expires=? WHERE url=?", + (expires, url), + ) + .await?; + + Ok(Some((response, is_stale))) +} + +/// Removes expired cache entries. +pub(crate) async fn http_cache_cleanup(context: &Context) -> Result<()> { + // Remove cache entries that are already expired + // or entries that will not expire in a year + // to make sure we don't have invalid timestamps that are way forward in the future. + context + .sql + .execute( + "DELETE FROM http_cache + WHERE ?1 > expires OR expires > ?1 + 31536000", + (time(),), + ) + .await?; + Ok(()) +} + +/// Fetches URL and updates the cache. +/// +/// URL is fetched regardless of whether there is an existing result in the cache. +async fn fetch_url(context: &Context, original_url: &str) -> Result<Response> { + let mut url = original_url.to_string(); // Follow up to 10 http-redirects for _i in 0..10 { @@ -139,16 +277,44 @@ pub async fn read_url_blob(context: &Context, url: &str) -> Result<Response> { }); let body = response.collect().await?.to_bytes(); let blob: Vec<u8> = body.to_vec(); - return Ok(Response { + let response = Response { blob, mimetype, encoding, - }); + }; + info!(context, "Inserting {original_url:?} into cache."); + http_cache_put(context, &url, &response).await?; + return Ok(response); } Err(anyhow!("Followed 10 redirections")) } +/// Retrieves the binary contents of URL using HTTP GET request. +pub async fn read_url_blob(context: &Context, url: &str) -> Result<Response> { + if let Some((response, is_stale)) = http_cache_get(context, url).await? { + info!(context, "Returning {url:?} from cache."); + if is_stale { + let context = context.clone(); + let url = url.to_string(); + tokio::spawn(async move { + // Fetch URL in background to update the cache. + info!(context, "Fetching stale {url:?} in background."); + if let Err(err) = fetch_url(&context, &url).await { + warn!(context, "Failed to revalidate {url:?}: {err:#}."); + } + }); + } + + // Return stale result. + return Ok(response); + } + + info!(context, "Not found {url:?} in cache, fetching."); + let response = fetch_url(context, url).await?; + Ok(response) +} + /// Sends an empty POST request to the URL. /// /// Returns response text and whether request was successful or not. @@ -241,3 +407,109 @@ pub(crate) async fn post_form<T: Serialize + ?Sized>( let bytes = response.collect().await?.to_bytes(); Ok(bytes) } + +#[cfg(test)] +mod tests { + use super::*; + use std::time::Duration; + + use crate::sql::housekeeping; + use crate::test_utils::TestContext; + use crate::tools::SystemTime; + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_http_cache() -> Result<()> { + let t = &TestContext::new().await; + + assert_eq!(http_cache_get(t, "https://webxdc.org/").await?, None); + + let html_response = Response { + blob: b"<!DOCTYPE html> ...".to_vec(), + mimetype: Some("text/html".to_string()), + encoding: None, + }; + + let xdc_response = Response { + blob: b"PK...".to_vec(), + mimetype: Some("application/octet-stream".to_string()), + encoding: None, + }; + let xdc_editor_url = "https://apps.testrun.org/webxdc-editor-v3.2.0.xdc"; + let xdc_pixel_url = "https://apps.testrun.org/webxdc-pixel-v2.xdc"; + + http_cache_put(t, "https://webxdc.org/", &html_response).await?; + + assert_eq!(http_cache_get(t, xdc_editor_url).await?, None); + assert_eq!(http_cache_get(t, xdc_pixel_url).await?, None); + assert_eq!( + http_cache_get(t, "https://webxdc.org/").await?, + Some((html_response.clone(), false)) + ); + + http_cache_put(t, xdc_editor_url, &xdc_response).await?; + http_cache_put(t, xdc_pixel_url, &xdc_response).await?; + assert_eq!( + http_cache_get(t, xdc_editor_url).await?, + Some((xdc_response.clone(), false)) + ); + assert_eq!( + http_cache_get(t, xdc_pixel_url).await?, + Some((xdc_response.clone(), false)) + ); + + assert_eq!( + http_cache_get(t, "https://webxdc.org/").await?, + Some((html_response.clone(), false)) + ); + + // HTML is stale after 1 hour, but .xdc is not. + SystemTime::shift(Duration::from_secs(3600 + 100)); + assert_eq!( + http_cache_get(t, "https://webxdc.org/").await?, + Some((html_response.clone(), true)) + ); + assert_eq!( + http_cache_get(t, xdc_editor_url).await?, + Some((xdc_response.clone(), false)) + ); + + // Stale cache entry can be renewed + // even before housekeeping removes old one. + http_cache_put(t, "https://webxdc.org/", &html_response).await?; + assert_eq!( + http_cache_get(t, "https://webxdc.org/").await?, + Some((html_response.clone(), false)) + ); + + // 35 days later pixel .xdc expires because we did not request it for 35 days and 1 hour. + // But editor is still there because we did not request it for just 35 days. + // We have not renewed the editor however, so it becomes stale. + SystemTime::shift(Duration::from_secs(3600 * 24 * 35 - 100)); + + // Run housekeeping to test that it does not delete the blob too early. + housekeeping(t).await?; + + assert_eq!( + http_cache_get(t, xdc_editor_url).await?, + Some((xdc_response.clone(), true)) + ); + assert_eq!(http_cache_get(t, xdc_pixel_url).await?, None); + + // Test that if the file is accidentally removed from the blobdir, + // there is no error when trying to load the cache entry. + for entry in std::fs::read_dir(t.get_blobdir())? { + let entry = entry.unwrap(); + let path = entry.path(); + std::fs::remove_file(path).expect("Failed to remove blob"); + } + + assert_eq!( + http_cache_get(t, xdc_editor_url) + .await + .context("Failed to get no cache response")?, + None + ); + + Ok(()) + } +} diff --git a/src/param.rs b/src/param.rs index b65cfd1d3..f1d3cb761 100644 --- a/src/param.rs +++ b/src/param.rs @@ -366,20 +366,15 @@ impl Params { /// /// This parses the parameter value as a [ParamsFile] and than /// tries to return a [BlobObject] for that file. If the file is - /// not yet a valid blob, one will be created by copying the file - /// only if `create` is set to `true`, otherwise an error is - /// returned. + /// not yet a valid blob, one will be created by copying the file. /// /// Note that in the [ParamsFile::FsPath] case the blob can be /// created without copying if the path already refers to a valid - /// blob. If so a [BlobObject] will be returned regardless of the - /// `create` argument. - #[allow(clippy::needless_lifetimes)] + /// blob. If so a [BlobObject] will be returned. pub async fn get_blob<'a>( &self, key: Param, context: &'a Context, - create: bool, ) -> Result<Option<BlobObject<'a>>> { let val = match self.get(key) { Some(val) => val, @@ -387,10 +382,7 @@ impl Params { }; let file = ParamsFile::from_param(context, val)?; let blob = match file { - ParamsFile::FsPath(path) => match create { - true => BlobObject::new_from_path(context, &path).await?, - false => BlobObject::from_path(context, &path)?, - }, + ParamsFile::FsPath(path) => BlobObject::new_from_path(context, &path).await?, ParamsFile::Blob(blob) => blob, }; Ok(Some(blob)) @@ -546,23 +538,20 @@ mod tests { let path: PathBuf = p.get_path(Param::File, &t).unwrap().unwrap(); assert_eq!(path, fname); - // Blob does not exist yet, expect error. - assert!(p.get_blob(Param::File, &t, false).await.is_err()); - fs::write(fname, b"boo").await.unwrap(); - let blob = p.get_blob(Param::File, &t, true).await.unwrap().unwrap(); + let blob = p.get_blob(Param::File, &t).await.unwrap().unwrap(); assert!(blob.as_file_name().starts_with("foo")); // Blob in blobdir, expect blob. let bar_path = t.get_blobdir().join("bar"); p.set(Param::File, bar_path.to_str().unwrap()); - let blob = p.get_blob(Param::File, &t, false).await.unwrap().unwrap(); + let blob = p.get_blob(Param::File, &t).await.unwrap().unwrap(); assert_eq!(blob, BlobObject::from_name(&t, "bar".to_string()).unwrap()); p.remove(Param::File); assert!(p.get_file(Param::File, &t).unwrap().is_none()); assert!(p.get_path(Param::File, &t).unwrap().is_none()); - assert!(p.get_blob(Param::File, &t, false).await.unwrap().is_none()); + assert!(p.get_blob(Param::File, &t).await.unwrap().is_none()); } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] diff --git a/src/pgp.rs b/src/pgp.rs index f729237d9..804d520c0 100644 --- a/src/pgp.rs +++ b/src/pgp.rs @@ -21,11 +21,9 @@ use tokio::runtime::Handle; use crate::constants::KeyGenType; use crate::key::{DcKey, Fingerprint}; -#[allow(missing_docs)] #[cfg(test)] pub(crate) const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt"; -#[allow(missing_docs)] pub const HEADER_SETUPCODE: &str = "passphrase-begin"; /// Preferred symmetric encryption algorithm. diff --git a/src/quota.rs b/src/quota.rs index 0070a76ca..a0e8df346 100644 --- a/src/quota.rs +++ b/src/quota.rs @@ -187,7 +187,7 @@ mod tests { Ok(()) } - #[allow(clippy::assertions_on_constants)] + #[expect(clippy::assertions_on_constants)] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_quota_thresholds() -> anyhow::Result<()> { assert!(QUOTA_ALLCLEAR_PERCENTAGE > 50); diff --git a/src/receive_imf.rs b/src/receive_imf.rs index b0fef70a0..ef10117cf 100644 --- a/src/receive_imf.rs +++ b/src/receive_imf.rs @@ -158,7 +158,7 @@ async fn insert_tombstone(context: &Context, rfc724_mid: &str) -> Result<MsgId> /// If `is_partial_download` is set, it contains the full message size in bytes. /// Do not confuse that with `replace_msg_id` that will be set when the full message is loaded /// later. -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] pub(crate) async fn receive_imf_inner( context: &Context, folder: &str, @@ -679,7 +679,7 @@ pub async fn from_field_to_contact_id( /// Creates a `ReceivedMsg` from given parts which might consist of /// multiple messages (if there are multiple attachments). /// Every entry in `mime_parser.parts` produces a new row in the `msgs` table. -#[allow(clippy::too_many_arguments, clippy::cognitive_complexity)] +#[expect(clippy::too_many_arguments)] async fn add_parts( context: &Context, mime_parser: &mut MimeMessage, @@ -1406,10 +1406,11 @@ async fn add_parts( // we save the full mime-message and add a flag // that the ui should show button to display the full message. - // a flag used to avoid adding "show full message" button to multiple parts of the message. - let mut save_mime_modified = mime_parser.is_mime_modified; + // We add "Show Full Message" button to the last message bubble (part) if this flag evaluates to + // `true` finally. + let mut save_mime_modified = false; - let mime_headers = if save_mime_headers || save_mime_modified { + let mime_headers = if save_mime_headers || mime_parser.is_mime_modified { let headers = if !mime_parser.decoded_data.is_empty() { mime_parser.decoded_data.clone() } else { @@ -1475,7 +1476,8 @@ async fn add_parts( } } - for part in &mime_parser.parts { + let mut parts = mime_parser.parts.iter().peekable(); + while let Some(part) = parts.next() { if part.is_reaction { let reaction_str = simplify::remove_footers(part.msg.as_str()); let is_incoming_fresh = mime_parser.incoming && !seen && !fetching_existing_messages; @@ -1519,14 +1521,11 @@ async fn add_parts( } else { (&part.msg, part.typ) }; - let part_is_empty = typ == Viewtype::Text && msg.is_empty() && part.param.get(Param::Quote).is_none(); - let mime_modified = save_mime_modified && !part_is_empty; - if mime_modified { - // Avoid setting mime_modified for more than one part. - save_mime_modified = false; - } + + save_mime_modified |= mime_parser.is_mime_modified && !part_is_empty && !hidden; + let save_mime_modified = save_mime_modified && parts.peek().is_none(); if part.typ == Viewtype::Text { let msg_raw = part.msg_raw.as_ref().cloned().unwrap_or_default(); @@ -1546,8 +1545,7 @@ async fn add_parts( // If you change which information is skipped if the message is trashed, // also change `MsgId::trash()` and `delete_expired_messages()` - let trash = - chat_id.is_trash() || (is_location_kml && msg.is_empty() && typ == Viewtype::Text); + let trash = chat_id.is_trash() || (is_location_kml && part_is_empty && !save_mime_modified); let row_id = context .sql @@ -1610,14 +1608,14 @@ RETURNING id }, hidden, part.bytes as isize, - if (save_mime_headers || mime_modified) && !trash { + if (save_mime_headers || save_mime_modified) && !trash { mime_headers.clone() } else { Vec::new() }, mime_in_reply_to, mime_references, - mime_modified, + save_mime_modified, part.error.as_deref().unwrap_or_default(), ephemeral_timer, ephemeral_timestamp, @@ -1843,7 +1841,7 @@ async fn lookup_chat_by_reply( Ok(Some((parent_chat.id, parent_chat.blocked))) } -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] async fn lookup_chat_or_create_adhoc_group( context: &Context, mime_parser: &MimeMessage, @@ -1978,7 +1976,7 @@ async fn is_probably_private_reply( /// than two members, a new ad hoc group is created. /// /// On success the function returns the created (chat_id, chat_blocked) tuple. -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] async fn create_group( context: &Context, mime_parser: &mut MimeMessage, @@ -2098,7 +2096,6 @@ async fn create_group( /// just omitted. /// /// * `is_partial_download` - whether the message is not fully downloaded. -#[allow(clippy::too_many_arguments)] async fn apply_group_changes( context: &Context, mime_parser: &mut MimeMessage, diff --git a/src/receive_imf/tests.rs b/src/receive_imf/tests.rs index f798407f8..0bb83ceb9 100644 --- a/src/receive_imf/tests.rs +++ b/src/receive_imf/tests.rs @@ -3827,6 +3827,61 @@ async fn test_messed_up_message_id() -> Result<()> { Ok(()) } +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn test_big_forwarded_with_big_attachment() -> Result<()> { + let t = &TestContext::new_bob().await; + + let raw = include_bytes!("../../test-data/message/big_forwarded_with_big_attachment.eml"); + let rcvd = receive_imf(t, raw, false).await?.unwrap(); + assert_eq!(rcvd.msg_ids.len(), 3); + + let msg = Message::load_from_db(t, rcvd.msg_ids[0]).await?; + assert_eq!(msg.get_viewtype(), Viewtype::Text); + assert_eq!(msg.get_text(), "Hello!"); + assert!(!msg.has_html()); + + let msg = Message::load_from_db(t, rcvd.msg_ids[1]).await?; + assert_eq!(msg.get_viewtype(), Viewtype::Text); + assert!(msg + .get_text() + .starts_with("this text with 42 chars is just repeated.")); + assert!(msg.get_text().ends_with("[...]")); + assert!(!msg.has_html()); + + let msg = Message::load_from_db(t, rcvd.msg_ids[2]).await?; + assert_eq!(msg.get_viewtype(), Viewtype::File); + assert!(msg.has_html()); + let html = msg.id.get_html(t).await?.unwrap(); + let tail = html + .split_once("Hello!") + .unwrap() + .1 + .split_once("From: AAA") + .unwrap() + .1 + .split_once("aaa@example.org") + .unwrap() + .1 + .split_once("To: Alice") + .unwrap() + .1 + .split_once("alice@example.org") + .unwrap() + .1 + .split_once("Subject: Some subject") + .unwrap() + .1 + .split_once("Date: Fri, 2 Jun 2023 12:29:17 +0000") + .unwrap() + .1; + assert_eq!( + tail.matches("this text with 42 chars is just repeated.") + .count(), + 128 + ); + Ok(()) +} + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_mua_user_adds_member() -> Result<()> { let t = TestContext::new_alice().await; diff --git a/src/smtp.rs b/src/smtp.rs index 7bc51a278..84b093642 100644 --- a/src/smtp.rs +++ b/src/smtp.rs @@ -104,7 +104,7 @@ impl Smtp { } /// Connect using the provided login params. - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub async fn connect( &mut self, context: &Context, diff --git a/src/smtp/connect.rs b/src/smtp/connect.rs index 5652d1427..869405cd3 100644 --- a/src/smtp/connect.rs +++ b/src/smtp/connect.rs @@ -45,7 +45,7 @@ async fn new_smtp_transport<S: AsyncBufRead + AsyncWrite + Unpin>( Ok(transport) } -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] pub(crate) async fn connect_and_auth( context: &Context, proxy_config: &Option<ProxyConfig>, diff --git a/src/sql.rs b/src/sql.rs index 47604778d..62a0b44b9 100644 --- a/src/sql.rs +++ b/src/sql.rs @@ -19,6 +19,7 @@ use crate::location::delete_orphaned_poi_locations; use crate::log::LogExt; use crate::message::{Message, MsgId}; use crate::net::dns::prune_dns_cache; +use crate::net::http::http_cache_cleanup; use crate::net::prune_connection_history; use crate::param::{Param, Params}; use crate::peerstate::Peerstate; @@ -720,6 +721,12 @@ pub async fn housekeeping(context: &Context) -> Result<()> { warn!(context, "Can't set config: {e:#}."); } + http_cache_cleanup(context) + .await + .context("Failed to cleanup HTTP cache") + .log_err(context) + .ok(); + if let Err(err) = remove_unused_files(context).await { warn!( context, @@ -846,6 +853,22 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> { .await .context("housekeeping: failed to SELECT value FROM config")?; + context + .sql + .query_map( + "SELECT blobname FROM http_cache", + (), + |row| row.get::<_, String>(0), + |rows| { + for row in rows { + maybe_add_file(&mut files_in_use, &row?); + } + Ok(()) + }, + ) + .await + .context("Failed to SELECT blobname FROM http_cache")?; + info!(context, "{} files in use.", files_in_use.len()); /* go through directories and delete unused files */ let blobdir = context.get_blobdir(); @@ -864,7 +887,6 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> { if p == blobdir && (is_file_in_use(&files_in_use, None, &name_s) - || is_file_in_use(&files_in_use, Some(".increation"), &name_s) || is_file_in_use(&files_in_use, Some(".waveform"), &name_s) || is_file_in_use(&files_in_use, Some("-preview.jpg"), &name_s)) { diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs index 15d89c6f1..dcaafbbff 100644 --- a/src/sql/migrations.rs +++ b/src/sql/migrations.rs @@ -1088,6 +1088,39 @@ CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid); .await?; } + inc_and_check(&mut migration_version, 125)?; + if dbversion < migration_version { + sql.execute_migration( + "CREATE TABLE http_cache ( + url TEXT PRIMARY KEY, + expires INTEGER NOT NULL, -- When the cache entry is considered expired, timestamp in seconds. + blobname TEXT NOT NULL, + mimetype TEXT NOT NULL DEFAULT '', -- MIME type extracted from Content-Type header. + encoding TEXT NOT NULL DEFAULT '' -- Encoding from Content-Type header. + ) STRICT", + migration_version, + ) + .await?; + } + + inc_and_check(&mut migration_version, 126)?; + if dbversion < migration_version { + // Recreate http_cache table with new `stale` column. + sql.execute_migration( + "DROP TABLE http_cache; + CREATE TABLE http_cache ( + url TEXT PRIMARY KEY, + expires INTEGER NOT NULL, -- When the cache entry is considered expired, timestamp in seconds. + stale INTEGER NOT NULL, -- When the cache entry is considered stale, timestamp in seconds. + blobname TEXT NOT NULL, + mimetype TEXT NOT NULL DEFAULT '', -- MIME type extracted from Content-Type header. + encoding TEXT NOT NULL DEFAULT '' -- Encoding from Content-Type header. + ) STRICT", + migration_version, + ) + .await?; + } + let new_version = sql .get_raw_config_int(VERSION_CFG) .await? diff --git a/test-data/message/big_forwarded_with_big_attachment.eml b/test-data/message/big_forwarded_with_big_attachment.eml new file mode 100644 index 000000000..f6ae39132 --- /dev/null +++ b/test-data/message/big_forwarded_with_big_attachment.eml @@ -0,0 +1,305 @@ +From: Alice <alice@example.org> +To: Bob <bob@example.net> +Date: Fri, 2 Jun 2023 13:29:17 +0000 +Message-ID: <foobar1@localhost> +Content-Type: multipart/mixed; boundary="zRs3OquGy6eU58KF" + + +--zRs3OquGy6eU58KF +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline + +Hello! + +--zRs3OquGy6eU58KF +Content-Type: message/rfc822 +Content-Disposition: inline + +From: AAA <aaa@example.org> +To: Alice <alice@example.org> +Subject: Some subject +Date: Fri, 2 Jun 2023 12:29:17 +0000 +Message-ID: <foobar@localhost> +In-Reply-To: <barbaz@localhost> +Content-Type: multipart/mixed; + boundary="_innerboundary_" +MIME-Version: 1.0 + +--_innerboundary_ +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: quoted-printable + +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. + +--=20 + +Kind regards, + +Bob + +--_innerboundary_ +Content-Type: text/plain; name="deltachat-log.txt" +Content-Description: deltachat-log.txt +Content-Disposition: attachment; filename="deltachat-log.txt"; + size=55254; creation-date="Fri, 02 Jun 2023 11:33:49 GMT"; + modification-date="Fri, 02 Jun 2023 12:29:17 GMT" + +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. +this text with 42 chars is just repeated. + +--_innerboundary_-- + +--zRs3OquGy6eU58KF--