matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00
Code Activity

Revert "Skip certificate chain validation when sending emails"

Browse Source 
This reverts commit af4f19df7b.
This commit is contained in:
Quentin Gliech
2023-11-03 15:50:49 +01:00
parent 854badb2fa
commit 6a5d48656b
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/email/src/transport.rs
View File

@ -75,30 +75,8 @@ impl Transport {
) -> Result<Self, lettre::transport::smtp::Error> { ) -> Result<Self, lettre::transport::smtp::Error> {
let mut t = match mode { let mut t = match mode {
SmtpMode::Plain => AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(hostname), SmtpMode::Plain => AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(hostname),
SmtpMode::StartTls => { SmtpMode::StartTls => AsyncSmtpTransport::<Tokio1Executor>::starttls_relay(hostname)?,
let tls_parameters = SmtpMode::Tls => AsyncSmtpTransport::<Tokio1Executor>::relay(hostname)?,
lettre::transport::smtp::client::TlsParameters::builder(hostname.to_owned())
.dangerous_accept_invalid_certs(true)
.build()?;
AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(hostname)
.port(lettre::transport::smtp::SUBMISSION_PORT)
.tls(lettre::transport::smtp::client::Tls::Required(
tls_parameters,
))
}
SmtpMode::Tls => {
let tls_parameters =
lettre::transport::smtp::client::TlsParameters::builder(hostname.to_owned())
.dangerous_accept_invalid_certs(true)
.build()?;
AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(hostname)
.port(lettre::transport::smtp::SUBMISSIONS_PORT)
.tls(lettre::transport::smtp::client::Tls::Wrapper(
tls_parameters,
))
}
}; };
if let Some(credentials) = credentials { if let Some(credentials) = credentials {