From 6a5d48656bed7d652f4ccc53fd5ba5ceacf1099c Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Fri, 3 Nov 2023 15:50:49 +0100
Subject: [PATCH] Revert "Skip certificate chain validation when sending
 emails"

This reverts commit af4f19df7bf50852ac657ff016705b43cc380240.
---
 crates/email/src/transport.rs | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/crates/email/src/transport.rs b/crates/email/src/transport.rs
index 6691fb0d..435ef5d1 100644
--- a/crates/email/src/transport.rs
+++ b/crates/email/src/transport.rs
@@ -75,30 +75,8 @@ impl Transport {
     ) -> Result<Self, lettre::transport::smtp::Error> {
         let mut t = match mode {
             SmtpMode::Plain => AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(hostname),
-            SmtpMode::StartTls => {
-                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::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,
-                    ))
-            }
+            SmtpMode::StartTls => AsyncSmtpTransport::<Tokio1Executor>::starttls_relay(hostname)?,
+            SmtpMode::Tls => AsyncSmtpTransport::<Tokio1Executor>::relay(hostname)?,
         };
 
         if let Some(credentials) = credentials {