Skip to content

fix(imap): do not bubble up errors in IMAP candidate loop #8420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
link2xt merged 2 commits into from
Jul 16, 2026
+17 −5
Merged

fix(imap): do not bubble up errors in IMAP candidate loop #8420

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc1b06c
fix(imap): do not bubble up errors in IMAP candidate loop
link2xt Jun 6, 2026
0462e12
refactor: label the loop iterating over the candidates
link2xt Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/imap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ impl Imap {

let login_params = prioritize_server_login_params(&context.sql, &self.lp, "imap").await?;
let mut first_error = None;
for lp in login_params {
'candidate: for lp in login_params {
info!(context, "IMAP trying to connect to {}.", lp.connection);
let connection_candidate = lp.connection.clone();
let client = match Client::connect(
Expand All @@ -366,7 +366,7 @@ impl Imap {
Err(err) => {
warn!(context, "{err:#}.");
first_error.get_or_insert(err);
continue;
continue 'candidate;
}
};

Expand Down Expand Up @@ -395,18 +395,30 @@ impl Imap {

match login_res {
Ok(mut session) => {
let capabilities = determine_capabilities(&mut session).await?;
let capabilities = match determine_capabilities(&mut session).await {
Ok(capabilities) => capabilities,
Err(err) => {
warn!(context, "Failed to determine capabilities: {err:#}.");
continue 'candidate;
}
};
let resync_request_sender = self.resync_request_sender.clone();

let session = if capabilities.can_compress {
info!(context, "Enabling IMAP compression.");
let compressed_session = session
let compressed_session = match session
.compress(|s| {
let session_stream: Box<dyn SessionStream> = Box::new(s);
session_stream
})
.await
.context("Failed to enable IMAP compression")?;
{
Ok(compressed_session) => compressed_session,
Err(err) => {
warn!(context, "Failed to enable IMAP compression: {err:#}.");
continue 'candidate;
}
};
Session::new(
compressed_session,
capabilities,
Expand Down