Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-26 18:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: merge ImapConfig into Imap

Browse Source
This commit is contained in:
link2xt
2024-03-01 19:04:33 +00:00
parent cd9f6c3d5b
commit 4e8979f7c8
1 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/imap.rs
View File

@@ -71,7 +71,17 @@ const BODY_PARTIAL: &str = "(FLAGS RFC822.SIZE BODY.PEEK[HEADER])";
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct Imap { pub(crate) struct Imap {
pub(crate) idle_interrupt_receiver: Receiver<()>, pub(crate) idle_interrupt_receiver: Receiver<()>,
config: ImapConfig,
/// Email address.
addr: String,
/// Login parameters.
lp: ServerLoginParam,
/// SOCKS 5 configuration.
socks5_config: Option<Socks5Config>,
strict_tls: bool,
login_failed_once: bool, login_failed_once: bool,
pub(crate) connectivity: ConnectivityStore, pub(crate) connectivity: ConnectivityStore,
@@ -151,17 +161,6 @@ impl FolderMeaning {
} }
} }
#[derive(Debug)]
struct ImapConfig {
/// Email address.
pub addr: String,
pub lp: ServerLoginParam,
/// SOCKS 5 configuration.
pub socks5_config: Option<Socks5Config>,
pub strict_tls: bool,
}
struct UidGrouper<T: Iterator<Item = (i64, u32, String)>> { struct UidGrouper<T: Iterator<Item = (i64, u32, String)>> {
inner: Peekable<T>, inner: Peekable<T>,
} }
@@ -244,16 +243,13 @@ impl Imap {
CertificateChecks::AcceptInvalidCertificates CertificateChecks::AcceptInvalidCertificates
| CertificateChecks::AcceptInvalidCertificates2 => false, | CertificateChecks::AcceptInvalidCertificates2 => false,
}; };
let config = ImapConfig {
let imap = Imap {
idle_interrupt_receiver,
addr: addr.to_string(), addr: addr.to_string(),
lp: lp.clone(), lp: lp.clone(),
socks5_config, socks5_config,
strict_tls, strict_tls,
};
let imap = Imap {
idle_interrupt_receiver,
config,
login_failed_once: false, login_failed_once: false,
connectivity: Default::default(), connectivity: Default::default(),
// 1 connection per minute + a burst of 2. // 1 connection per minute + a burst of 2.
@@ -297,7 +293,7 @@ impl Imap {
/// instead if you are going to actually use connection rather than trying connection /// instead if you are going to actually use connection rather than trying connection
/// parameters. /// parameters.
pub(crate) async fn connect(&mut self, context: &Context) -> Result<Session> { pub(crate) async fn connect(&mut self, context: &Context) -> Result<Session> {
if self.config.lp.server.is_empty() { if self.lp.server.is_empty() {
bail!("IMAP operation attempted while it is torn down"); bail!("IMAP operation attempted while it is torn down");
} }
@@ -325,21 +321,19 @@ impl Imap {
info!(context, "Connecting to IMAP server"); info!(context, "Connecting to IMAP server");
self.connectivity.set_connecting(context).await; self.connectivity.set_connecting(context).await;
self.ratelimit.write().await.send(); self.ratelimit.write().await.send();
let connection_res: Result<Client> = if self.config.lp.security == Socket::Starttls let connection_res: Result<Client> =
|| self.config.lp.security == Socket::Plain if self.lp.security == Socket::Starttls || self.lp.security == Socket::Plain {
{ let imap_server: &str = self.lp.server.as_ref();
let config = &mut self.config; let imap_port = self.lp.port;
let imap_server: &str = config.lp.server.as_ref();
let imap_port = config.lp.port;
if let Some(socks5_config) = &config.socks5_config { if let Some(socks5_config) = &self.socks5_config {
if config.lp.security == Socket::Starttls { if self.lp.security == Socket::Starttls {
Client::connect_starttls_socks5( Client::connect_starttls_socks5(
context, context,
imap_server, imap_server,
imap_port, imap_port,
socks5_config.clone(), socks5_config.clone(),
config.strict_tls, self.strict_tls,
) )
.await .await
} else { } else {
@@ -351,39 +345,37 @@ impl Imap {
) )
.await .await
} }
} else if config.lp.security == Socket::Starttls { } else if self.lp.security == Socket::Starttls {
Client::connect_starttls(context, imap_server, imap_port, config.strict_tls).await Client::connect_starttls(context, imap_server, imap_port, self.strict_tls).await
} else { } else {
Client::connect_insecure(context, imap_server, imap_port).await Client::connect_insecure(context, imap_server, imap_port).await
} }
} else { } else {
let config = &self.config; let imap_server: &str = self.lp.server.as_ref();
let imap_server: &str = config.lp.server.as_ref(); let imap_port = self.lp.port;
let imap_port = config.lp.port;
if let Some(socks5_config) = &config.socks5_config { if let Some(socks5_config) = &self.socks5_config {
Client::connect_secure_socks5( Client::connect_secure_socks5(
context, context,
imap_server, imap_server,
imap_port, imap_port,
config.strict_tls, self.strict_tls,
socks5_config.clone(), socks5_config.clone(),
) )
.await .await
} else { } else {
Client::connect_secure(context, imap_server, imap_port, config.strict_tls).await Client::connect_secure(context, imap_server, imap_port, self.strict_tls).await
} }
}; };
let client = connection_res?; let client = connection_res?;
let config = &self.config; let imap_user: &str = self.lp.user.as_ref();
let imap_user: &str = config.lp.user.as_ref(); let imap_pw: &str = self.lp.password.as_ref();
let imap_pw: &str = config.lp.password.as_ref(); let oauth2 = self.lp.oauth2;
let oauth2 = self.config.lp.oauth2;
let login_res = if oauth2 { let login_res = if oauth2 {
info!(context, "Logging into IMAP server with OAuth 2"); info!(context, "Logging into IMAP server with OAuth 2");
let addr: &str = config.addr.as_ref(); let addr: &str = self.addr.as_ref();
let token = get_oauth2_access_token(context, addr, imap_pw, true) let token = get_oauth2_access_token(context, addr, imap_pw, true)
.await? .await?
@@ -407,7 +399,7 @@ impl Imap {
self.login_failed_once = false; self.login_failed_once = false;
context.emit_event(EventType::ImapConnected(format!( context.emit_event(EventType::ImapConnected(format!(
"IMAP-LOGIN as {}", "IMAP-LOGIN as {}",
self.config.lp.user self.lp.user
))); )));
self.connectivity.set_connected(context).await; self.connectivity.set_connected(context).await;
info!(context, "Successfully logged into IMAP server"); info!(context, "Successfully logged into IMAP server");
@@ -415,7 +407,7 @@ impl Imap {
} }
Err(err) => { Err(err) => {
let imap_user = self.config.lp.user.to_owned(); let imap_user = self.lp.user.to_owned();
let message = stock_str::cannot_login(context, &imap_user).await; let message = stock_str::cannot_login(context, &imap_user).await;
warn!(context, "{} ({:#})", message, err); warn!(context, "{} ({:#})", message, err);