Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 21:06:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Automatic certificate checks for providers from DB

Browse Source 
When certificate checks setting is Automatic, strict_tls setting
from provider database is applied dynamically in Imap.connect() and
Smtp.connect().
This commit is contained in:
Alexander Krotov
2020-08-16 12:00:00 +03:00
parent 231946646c
commit 061bee382b
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/configure/mod.rs
View File

@@ -376,7 +376,7 @@ fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<Login
p.mail_server = imap.hostname.to_string(); p.mail_server = imap.hostname.to_string();
p.mail_user = imap.apply_username_pattern(param.addr.clone()); p.mail_user = imap.apply_username_pattern(param.addr.clone());
p.mail_port = imap.port as i32; p.mail_port = imap.port as i32;
p.imap_certificate_checks = CertificateChecks::AcceptInvalidCertificates; p.imap_certificate_checks = CertificateChecks::Automatic;
p.server_flags |= match imap.socket { p.server_flags |= match imap.socket {
provider::Socket::STARTTLS => DC_LP_IMAP_SOCKET_STARTTLS, provider::Socket::STARTTLS => DC_LP_IMAP_SOCKET_STARTTLS,
provider::Socket::SSL => DC_LP_IMAP_SOCKET_SSL, provider::Socket::SSL => DC_LP_IMAP_SOCKET_SSL,
@@ -385,7 +385,7 @@ fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<Login
p.send_server = smtp.hostname.to_string(); p.send_server = smtp.hostname.to_string();
p.send_user = smtp.apply_username_pattern(param.addr.clone()); p.send_user = smtp.apply_username_pattern(param.addr.clone());
p.send_port = smtp.port as i32; p.send_port = smtp.port as i32;
p.smtp_certificate_checks = CertificateChecks::AcceptInvalidCertificates; p.smtp_certificate_checks = CertificateChecks::Automatic;
p.server_flags |= match smtp.socket { p.server_flags |= match smtp.socket {
provider::Socket::STARTTLS => DC_LP_SMTP_SOCKET_STARTTLS as i32, provider::Socket::STARTTLS => DC_LP_SMTP_SOCKET_STARTTLS as i32,
provider::Socket::SSL => DC_LP_SMTP_SOCKET_SSL as i32, provider::Socket::SSL => DC_LP_SMTP_SOCKET_SSL as i32,
@@ -706,5 +706,14 @@ mod tests {
let found_params = get_offline_autoconfig(&context, &params).unwrap(); let found_params = get_offline_autoconfig(&context, &params).unwrap();
assert_eq!(found_params.mail_server, "imap.nauta.cu".to_string()); assert_eq!(found_params.mail_server, "imap.nauta.cu".to_string());
assert_eq!(found_params.send_server, "smtp.nauta.cu".to_string()); assert_eq!(found_params.send_server, "smtp.nauta.cu".to_string());
assert_eq!(
found_params.imap_certificate_checks,
CertificateChecks::Automatic
);
assert_eq!(
found_params.smtp_certificate_checks,
CertificateChecks::Automatic
);
} }
} }

2
src/login_param.rs
View File

@@ -5,7 +5,7 @@ use std::fmt;
use crate::context::Context; use crate::context::Context;
#[derive(Copy, Clone, Debug, Display, FromPrimitive)] #[derive(Copy, Clone, Debug, Display, FromPrimitive, PartialEq, Eq)]
#[repr(i32)] #[repr(i32)]
#[strum(serialize_all = "snake_case")] #[strum(serialize_all = "snake_case")]
pub enum CertificateChecks { pub enum CertificateChecks {