Skip to content

Commit 0969de5

Browse files
authored
Merge pull request #1844 from deltachat/offline-autoconfig-certck
Automatic certificate checks for providers from DB
2 parents cf72d9a + 061bee3 commit 0969de5

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/configure/mod.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<Login
376376
p.mail_server = imap.hostname.to_string();
377377
p.mail_user = imap.apply_username_pattern(param.addr.clone());
378378
p.mail_port = imap.port as i32;
379-
p.imap_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
379+
p.imap_certificate_checks = CertificateChecks::Automatic;
380380
p.server_flags |= match imap.socket {
381381
provider::Socket::STARTTLS => DC_LP_IMAP_SOCKET_STARTTLS,
382382
provider::Socket::SSL => DC_LP_IMAP_SOCKET_SSL,
@@ -385,7 +385,7 @@ fn get_offline_autoconfig(context: &Context, param: &LoginParam) -> Option<Login
385385
p.send_server = smtp.hostname.to_string();
386386
p.send_user = smtp.apply_username_pattern(param.addr.clone());
387387
p.send_port = smtp.port as i32;
388-
p.smtp_certificate_checks = CertificateChecks::AcceptInvalidCertificates;
388+
p.smtp_certificate_checks = CertificateChecks::Automatic;
389389
p.server_flags |= match smtp.socket {
390390
provider::Socket::STARTTLS => DC_LP_SMTP_SOCKET_STARTTLS as i32,
391391
provider::Socket::SSL => DC_LP_SMTP_SOCKET_SSL as i32,
@@ -706,5 +706,14 @@ mod tests {
706706
let found_params = get_offline_autoconfig(&context, &params).unwrap();
707707
assert_eq!(found_params.mail_server, "imap.nauta.cu".to_string());
708708
assert_eq!(found_params.send_server, "smtp.nauta.cu".to_string());
709+
710+
assert_eq!(
711+
found_params.imap_certificate_checks,
712+
CertificateChecks::Automatic
713+
);
714+
assert_eq!(
715+
found_params.smtp_certificate_checks,
716+
CertificateChecks::Automatic
717+
);
709718
}
710719
}

src/login_param.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::fmt;
55

66
use crate::context::Context;
77

8-
#[derive(Copy, Clone, Debug, Display, FromPrimitive)]
8+
#[derive(Copy, Clone, Debug, Display, FromPrimitive, PartialEq, Eq)]
99
#[repr(i32)]
1010
#[strum(serialize_all = "snake_case")]
1111
pub enum CertificateChecks {

0 commit comments

Comments
 (0)