Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-22 08:16:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Apply imap_certificate_checks config to StartTLS connections

Browse Source
This commit is contained in:
Alexander Krotov
2019-10-03 02:02:51 +03:00
parent bf1652a1be
commit 216266d7bf
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/imap.rs
View File

@@ -131,13 +131,14 @@ impl Client {
Ok(Client::Insecure(client, stream)) Ok(Client::Insecure(client, stream))
} }
pub fn secure<S: AsRef<str>>(self, domain: S) -> imap::error::Result<Client> { pub fn secure<S: AsRef<str>>(
self,
domain: S,
certificate_checks: CertificateChecks,
) -> imap::error::Result<Client> {
match self { match self {
Client::Insecure(client, stream) => { Client::Insecure(client, stream) => {
let tls = native_tls::TlsConnector::builder() let tls = dc_build_tls(certificate_checks).unwrap();
.danger_accept_invalid_hostnames(true)
.build()
.unwrap();
let client_sec = client.secure(domain, &tls)?; let client_sec = client.secure(domain, &tls)?;
@@ -395,7 +396,7 @@ impl Imap {
Client::connect_insecure((imap_server, imap_port)).and_then(|client| { Client::connect_insecure((imap_server, imap_port)).and_then(|client| {
if (server_flags & DC_LP_IMAP_SOCKET_STARTTLS) != 0 { if (server_flags & DC_LP_IMAP_SOCKET_STARTTLS) != 0 {
client.secure(imap_server) client.secure(imap_server, config.certificate_checks)
} else { } else {
Ok(client) Ok(client)
} }