From 74abb82de29ec2bcd72dc2aa35d88c47d66d4e27 Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 1 Feb 2023 00:00:46 +0000 Subject: [PATCH 1/3] Log server security (TLS/STARTTLS/plain) type --- CHANGELOG.md | 6 ++++++ src/login_param.rs | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89ce0603c..e716b6e25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ ## API-Changes +## 1.107.1 + +### Changes +- Log server security (TLS/STARTTLS/plain) type #4005 + + ## 1.107.0 ### Changes diff --git a/src/login_param.rs b/src/login_param.rs index bd5541047..1a80ef711 100644 --- a/src/login_param.rs +++ b/src/login_param.rs @@ -264,7 +264,7 @@ impl fmt::Display for LoginParam { write!( f, - "{} imap:{}:{}:{}:{}:cert_{}:{} smtp:{}:{}:{}:{}:cert_{}:{}", + "{} imap:{}:{}:{}:{}:{}:cert_{}:{} smtp:{}:{}:{}:{}:{}:cert_{}:{}", unset_empty(&self.addr), unset_empty(&self.imap.user), if !self.imap.password.is_empty() { @@ -274,6 +274,7 @@ impl fmt::Display for LoginParam { }, unset_empty(&self.imap.server), self.imap.port, + self.imap.security, self.imap.certificate_checks, if self.imap.oauth2 { "OAUTH2" @@ -288,6 +289,7 @@ impl fmt::Display for LoginParam { }, unset_empty(&self.smtp.server), self.smtp.port, + self.smtp.security, self.smtp.certificate_checks, if self.smtp.oauth2 { "OAUTH2" From 52a4b0c2b80fa72764077ef5e86d0ac99626ad0f Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 1 Feb 2023 09:41:06 +0000 Subject: [PATCH 2/3] Revert to async-smtp 0.5 to disable SMTP pipelining --- CHANGELOG.md | 3 +++ Cargo.lock | 4 ++-- Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e716b6e25..55ed0b35e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ ### Changes - Log server security (TLS/STARTTLS/plain) type #4005 +### Fixes +- Disable SMTP pipelining #4006 + ## 1.107.0 diff --git a/Cargo.lock b/Cargo.lock index 61b6edc4f..b3172d2d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "async-smtp" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ade89127f9e0d44f9e83cf574d499060005cd45b7dc76be89c0167487fe8edd" +checksum = "6da21e1dd19fbad3e095ad519fb1558ab77fd82e5c4778dca8f9be0464589e1e" dependencies = [ "async-native-tls", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index bbd777a48..414dd8e2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ ansi_term = { version = "0.12.1", optional = true } anyhow = "1" async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] } async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] } -async-smtp = { version = "0.6", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] } +async-smtp = { version = "0.5", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] } trust-dns-resolver = "0.22" tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] } tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar From 72e004c12b30aa9d8c78ecc7bde38520d56b05da Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 1 Feb 2023 14:52:06 +0000 Subject: [PATCH 3/3] Release 1.107.1 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- deltachat-ffi/Cargo.toml | 2 +- deltachat-jsonrpc/Cargo.toml | 2 +- deltachat-jsonrpc/typescript/package.json | 2 +- deltachat-rpc-server/Cargo.toml | 2 +- package.json | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3172d2d7..b7426971d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -873,7 +873,7 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "deltachat" -version = "1.107.0" +version = "1.107.1" dependencies = [ "ansi_term", "anyhow", @@ -948,7 +948,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.107.0" +version = "1.107.1" dependencies = [ "anyhow", "async-channel", @@ -970,7 +970,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.107.0" +version = "1.107.1" dependencies = [ "anyhow", "deltachat-jsonrpc", @@ -993,7 +993,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.107.0" +version = "1.107.1" dependencies = [ "anyhow", "deltachat", diff --git a/Cargo.toml b/Cargo.toml index 414dd8e2d..a8ca0308a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat" -version = "1.107.0" +version = "1.107.1" edition = "2021" license = "MPL-2.0" rust-version = "1.63" diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml index 1fb749414..1e16fb68f 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat_ffi" -version = "1.107.0" +version = "1.107.1" description = "Deltachat FFI" edition = "2018" readme = "README.md" diff --git a/deltachat-jsonrpc/Cargo.toml b/deltachat-jsonrpc/Cargo.toml index a885ce529..594d84012 100644 --- a/deltachat-jsonrpc/Cargo.toml +++ b/deltachat-jsonrpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-jsonrpc" -version = "1.107.0" +version = "1.107.1" 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 114f9824d..a2861e1a1 100644 --- a/deltachat-jsonrpc/typescript/package.json +++ b/deltachat-jsonrpc/typescript/package.json @@ -48,5 +48,5 @@ }, "type": "module", "types": "dist/deltachat.d.ts", - "version": "1.107.0" + "version": "1.107.1" } \ No newline at end of file diff --git a/deltachat-rpc-server/Cargo.toml b/deltachat-rpc-server/Cargo.toml index e6b018b45..e2674acb1 100644 --- a/deltachat-rpc-server/Cargo.toml +++ b/deltachat-rpc-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-rpc-server" -version = "1.107.0" +version = "1.107.1" description = "DeltaChat JSON-RPC server" edition = "2021" readme = "README.md" diff --git a/package.json b/package.json index 542dd1c4c..73de05999 100644 --- a/package.json +++ b/package.json @@ -60,5 +60,5 @@ "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit" }, "types": "node/dist/index.d.ts", - "version": "1.107.0" + "version": "1.107.1" } \ No newline at end of file