Mirrors/Vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-11 13:32:38 +01:00
Code Issues Releases Activity

Merge pull request #901 from sleweke/feature/opportunistic_tls

Browse Source 
Use opportunistic TLS in SMTP connections
This commit is contained in:
Daniel García 2020-03-14 14:41:00 +01:00 committed by GitHub
commit c6f64d8368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mail.rs
View File

@ -18,21 +18,21 @@ use chrono::NaiveDateTime;
fn mailer() -> SmtpTransport { fn mailer() -> SmtpTransport {
let host = CONFIG.smtp_host().unwrap(); let host = CONFIG.smtp_host().unwrap();
let client_security = if CONFIG.smtp_ssl() {
let tls = TlsConnector::builder() let tls = TlsConnector::builder()
.min_protocol_version(Some(Protocol::Tlsv11)) .min_protocol_version(Some(Protocol::Tlsv11))
.build() .build()
.unwrap(); .unwrap();
let params = ClientTlsParameters::new(host.clone(), tls); let tls_params = ClientTlsParameters::new(host.clone(), tls);
let client_security = if CONFIG.smtp_ssl() {
if CONFIG.smtp_explicit_tls() { if CONFIG.smtp_explicit_tls() {
ClientSecurity::Wrapper(params) ClientSecurity::Wrapper(tls_params)
} else { } else {
ClientSecurity::Required(params) ClientSecurity::Required(tls_params)
} }
} else { } else {
ClientSecurity::None ClientSecurity::Opportunistic(tls_params)
}; };
use std::time::Duration; use std::time::Duration;