Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 15:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

steramline some teardown decision code, and add webpki_roots for cert-checking

Browse Source
This commit is contained in:
holger krekel
2019-11-12 12:48:01 +01:00
committed by dignifiedquire
parent 8595b92fcf
commit 5b73951b9b
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/imap.rs
View File

@@ -312,18 +312,21 @@ impl Imap {
return false; return false;
} }
let (teardown, can_idle, has_xlist) = match &mut *self.session.lock().await { let teardown = match &mut *self.session.lock().await {
Some(ref mut session) => match session.capabilities().await { Some(ref mut session) => match session.capabilities().await {
Ok(caps) => { Ok(caps) => {
if !context.sql.is_open() { if !context.sql.is_open() {
warn!(context, "IMAP-LOGIN as {} ok but ABORTING", lp.mail_user,); warn!(context, "IMAP-LOGIN as {} ok but ABORTING", lp.mail_user,);
(true, false, false) true
} else { } else {
let can_idle = caps.has_str("IDLE"); let can_idle = caps.has_str("IDLE");
let has_xlist = caps.has_str("XLIST"); let has_xlist = caps.has_str("XLIST");
let caps_list = caps let caps_list = caps
.iter() .iter()
.fold(String::new(), |s, c| s + &format!(" {:?}", c)); .fold(String::new(), |s, c| s + &format!(" {:?}", c));
self.config.write().await.can_idle = can_idle;
self.config.write().await.has_xlist = has_xlist;
*self.connected.lock().await = true;
emit_event!( emit_event!(
context, context,
Event::ImapConnected(format!( Event::ImapConnected(format!(
@@ -331,25 +334,22 @@ impl Imap {
lp.mail_user, caps_list, lp.mail_user, caps_list,
)) ))
); );
(false, can_idle, has_xlist) false
} }
} }
Err(err) => { Err(err) => {
info!(context, "CAPABILITY command error: {}", err); info!(context, "CAPABILITY command error: {}", err);
(true, false, false) true
} }
}, },
None => (true, false, false), None => true,
}; };
if teardown { if teardown {
self.unsetup_handle(context).await; self.disconnect(context);
self.free_connect_params().await;
false false
} else { } else {
self.config.write().await.can_idle = can_idle;
self.config.write().await.has_xlist = has_xlist;
*self.connected.lock().await = true;
true true
} }
}) })

5
src/login_param.rs
View File

@@ -6,6 +6,7 @@ use crate::error::Error;
use async_std::sync::Arc; use async_std::sync::Arc;
use rustls; use rustls;
use webpki; use webpki;
use webpki_roots;
#[derive(Copy, Clone, Debug, Display, FromPrimitive)] #[derive(Copy, Clone, Debug, Display, FromPrimitive)]
#[repr(i32)] #[repr(i32)]
@@ -270,6 +271,10 @@ impl rustls::ServerCertVerifier for NoCertificateVerification {
pub fn dc_build_tls_config(certificate_checks: CertificateChecks) -> rustls::ClientConfig { pub fn dc_build_tls_config(certificate_checks: CertificateChecks) -> rustls::ClientConfig {
let mut config = rustls::ClientConfig::new(); let mut config = rustls::ClientConfig::new();
config
.root_store
.add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
match certificate_checks { match certificate_checks {
CertificateChecks::Strict => {} CertificateChecks::Strict => {}
CertificateChecks::Automatic => { CertificateChecks::Automatic => {