From 0e365395bfa21dcc00d72260f5613dec3029b7a9 Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 21 Aug 2024 12:27:25 +0000 Subject: [PATCH 1/2] fix: do not panic on unknown CertificateChecks values --- src/login_param.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/login_param.rs b/src/login_param.rs index 35c86ec5c..e52b4147a 100644 --- a/src/login_param.rs +++ b/src/login_param.rs @@ -2,7 +2,7 @@ use std::fmt; -use anyhow::{ensure, Result}; +use anyhow::{ensure, Context as _, Result}; use crate::constants::{DC_LP_AUTH_FLAGS, DC_LP_AUTH_NORMAL, DC_LP_AUTH_OAUTH2}; use crate::context::Context; @@ -132,7 +132,8 @@ impl LoginParam { let key = &format!("{prefix}imap_certificate_checks"); let certificate_checks = if let Some(certificate_checks) = sql.get_raw_config_int(key).await? { - num_traits::FromPrimitive::from_i32(certificate_checks).unwrap() + num_traits::FromPrimitive::from_i32(certificate_checks) + .with_context(|| format!("Invalid {key} value"))? } else { Default::default() }; From 0d0f556f211f5a12755cd6b7944b88ee56028677 Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 21 Aug 2024 12:44:16 +0000 Subject: [PATCH 2/2] chore(release): prepare for 1.142.8 --- CHANGELOG.md | 7 +++++++ Cargo.lock | 10 +++++----- Cargo.toml | 2 +- deltachat-ffi/Cargo.toml | 2 +- deltachat-jsonrpc/Cargo.toml | 2 +- deltachat-jsonrpc/typescript/package.json | 2 +- deltachat-repl/Cargo.toml | 2 +- deltachat-rpc-client/pyproject.toml | 2 +- deltachat-rpc-server/Cargo.toml | 2 +- deltachat-rpc-server/npm-package/package.json | 2 +- package.json | 2 +- python/pyproject.toml | 2 +- release-date.in | 2 +- 13 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa60151ba..ff947fee2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [1.142.8] - 2024-08-21 + +### Fixes + +- Do not panic on unknown CertificateChecks values. + ## [1.142.7] - 2024-08-17 ### Fixes @@ -4767,3 +4773,4 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed [1.142.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.4...v1.142.5 [1.142.6]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.5...v1.142.6 [1.142.7]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.6...v1.142.7 +[1.142.8]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.7...v1.142.8 diff --git a/Cargo.lock b/Cargo.lock index a10f1fc1c..a74de862d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1353,7 +1353,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.142.7" +version = "1.142.8" dependencies = [ "ansi_term", "anyhow", @@ -1444,7 +1444,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.142.7" +version = "1.142.8" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.142.7" +version = "1.142.8" dependencies = [ "ansi_term", "anyhow", @@ -1484,7 +1484,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.142.7" +version = "1.142.8" dependencies = [ "anyhow", "deltachat", @@ -1513,7 +1513,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.142.7" +version = "1.142.8" dependencies = [ "anyhow", "deltachat", diff --git a/Cargo.toml b/Cargo.toml index f4a6dcbd4..f5007813d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat" -version = "1.142.7" +version = "1.142.8" edition = "2021" license = "MPL-2.0" rust-version = "1.77" diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml index 8376d3417..41f16eddd 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat_ffi" -version = "1.142.7" +version = "1.142.8" description = "Deltachat FFI" edition = "2018" readme = "README.md" diff --git a/deltachat-jsonrpc/Cargo.toml b/deltachat-jsonrpc/Cargo.toml index 7ff4663db..c86ab0644 100644 --- a/deltachat-jsonrpc/Cargo.toml +++ b/deltachat-jsonrpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-jsonrpc" -version = "1.142.7" +version = "1.142.8" 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 10ba243d1..a4cc33174 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.142.7" + "version": "1.142.8" } diff --git a/deltachat-repl/Cargo.toml b/deltachat-repl/Cargo.toml index 8cb14ec6f..97830a6c6 100644 --- a/deltachat-repl/Cargo.toml +++ b/deltachat-repl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-repl" -version = "1.142.7" +version = "1.142.8" license = "MPL-2.0" edition = "2021" repository = "https://github.com/deltachat/deltachat-core-rust" diff --git a/deltachat-rpc-client/pyproject.toml b/deltachat-rpc-client/pyproject.toml index e662e0ee7..a77cac333 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.142.7" +version = "1.142.8" 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 0f281d2ac..0c733ff03 100644 --- a/deltachat-rpc-server/Cargo.toml +++ b/deltachat-rpc-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-rpc-server" -version = "1.142.7" +version = "1.142.8" 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 2fe2e32aa..1a6cf8350 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.142.7" + "version": "1.142.8" } diff --git a/package.json b/package.json index 6775940a9..5f6332690 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.142.7" + "version": "1.142.8" } diff --git a/python/pyproject.toml b/python/pyproject.toml index bfec749de..1e804cb91 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "deltachat" -version = "1.142.7" +version = "1.142.8" 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/release-date.in b/release-date.in index f28644c84..d54dd1227 100644 --- a/release-date.in +++ b/release-date.in @@ -1 +1 @@ -2024-08-17 \ No newline at end of file +2024-08-21 \ No newline at end of file