mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

server: add option to use insecure SMTP connection

Browse Source
This commit is contained in:
Igor Rzegocki 2023-01-19 11:30:25 +01:00 committed by GitHub
parent 9018e6fa34
commit d722be8896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldap_config.docker_template.toml
View File

@ -113,7 +113,7 @@ key_file = "/data/private_key"
#server="smtp.gmail.com" #server="smtp.gmail.com"
## The SMTP port. ## The SMTP port.
#port=587 #port=587
## How the connection is encrypted, either "TLS" or "STARTTLS". ## How the connection is encrypted, either "NONE" (no encryption), "TLS" or "STARTTLS".
#smtp_encryption = "TLS" #smtp_encryption = "TLS"
## The SMTP user, usually your email address. ## The SMTP user, usually your email address.
#user="sender@gmail.com" #user="sender@gmail.com"

1
server/src/infra/cli.rs
View File

@ -117,6 +117,7 @@ pub struct LdapsOpts {
clap::arg_enum! { clap::arg_enum! {
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
pub enum SmtpEncryption { pub enum SmtpEncryption {
NONE,
TLS, TLS,
STARTTLS, STARTTLS,
} }

3
server/src/infra/configuration.rs
View File

@ -266,6 +266,9 @@ impl ConfigOverrider for SmtpOpts {
if let Some(password) = &self.smtp_password { if let Some(password) = &self.smtp_password {
config.smtp_options.password = SecUtf8::from(password.clone()); config.smtp_options.password = SecUtf8::from(password.clone());
} }
if let Some(smtp_encryption) = &self.smtp_encryption {
config.smtp_options.smtp_encryption = smtp_encryption.clone();
}
if let Some(tls_required) = self.smtp_tls_required { if let Some(tls_required) = self.smtp_tls_required {
config.smtp_options.tls_required = Some(tls_required); config.smtp_options.tls_required = Some(tls_required);
} }

19
server/src/infra/mail.rs
View File

@ -26,12 +26,21 @@ async fn send_email(to: Mailbox, subject: &str, body: String, options: &MailOpti
options.user.clone(), options.user.clone(),
options.password.unsecure().to_string(), options.password.unsecure().to_string(),
); );
let relay_factory = match options.smtp_encryption { let mailer = match options.smtp_encryption {
SmtpEncryption::TLS => AsyncSmtpTransport::<Tokio1Executor>::relay, SmtpEncryption::NONE => {
SmtpEncryption::STARTTLS => AsyncSmtpTransport::<Tokio1Executor>::starttls_relay, AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(&options.server)
}
SmtpEncryption::TLS => AsyncSmtpTransport::<Tokio1Executor>::relay(&options.server)?,
SmtpEncryption::STARTTLS => {
AsyncSmtpTransport::<Tokio1Executor>::starttls_relay(&options.server)?
}
}; };
let mailer = relay_factory(&options.server)?.credentials(creds).build(); mailer
mailer.send(email).await?; .credentials(creds)
.port(options.port)
.build()
.send(email)
.await?;
Ok(()) Ok(())
} }