filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Log config errors + Do not send EHLO after AUTH

Browse Source
This commit is contained in:
mdecimus
2024-01-09 18:03:12 +01:00
parent c7be16692e
commit 407c051e93
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/smtp/src/outbound/session.rs
View File

@@ -63,7 +63,7 @@ impl Message {
params: SessionParams<'_>,
) -> Status<(), Error> {
// Obtain capabilities
let mut capabilities = match say_helo(&mut smtp_client, &params).await {
let capabilities = match say_helo(&mut smtp_client, &params).await {
Ok(capabilities) => capabilities,
Err(status) => {
tracing::info!(
@@ -93,7 +93,8 @@ impl Message {
}
// Refresh capabilities
capabilities = match say_helo(&mut smtp_client, &params).await {
// Disabled as some SMTP servers deauthenticate after EHLO
/*capabilities = match say_helo(&mut smtp_client, &params).await {
Ok(capabilities) => capabilities,
Err(status) => {
tracing::info!(
@@ -106,7 +107,7 @@ impl Message {
quit(smtp_client).await;
return status;
}
};
};*/
}
// MAIL FROM

4
crates/utils/src/lib.rs
View File

@@ -58,6 +58,7 @@ impl<T> UnwrapFailure<T> for Option<T> {
match self {
Some(result) => result,
None => {
tracing::error!("{message}");
eprintln!("{message}");
std::process::exit(1);
}
@@ -70,6 +71,8 @@ impl<T, E: std::fmt::Display> UnwrapFailure<T> for Result<T, E> {
match self {
Ok(result) => result,
Err(err) => {
tracing::error!("{message}: {err}");
#[cfg(feature = "test_mode")]
panic!("{message}: {err}");
@@ -84,6 +87,7 @@ impl<T, E: std::fmt::Display> UnwrapFailure<T> for Result<T, E> {
}
pub fn failed(message: &str) -> ! {
tracing::error!("{message}");
eprintln!("{message}");
std::process::exit(1);
}