Merge pull request #123 from sebadob/nicer-ux-if-no-smtp-url-set

handle a not set SMTP_URL nicely for "just testing out" use cases
sebadob · Oct 30, 2023 · 8b98d3c · 8b98d3c
2 parents 2abb071 + e0360b1
commit 8b98d3c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/rauthy-common/src/constants.rs b/rauthy-common/src/constants.rs
@@ -163,10 +163,9 @@ lazy_static! {
         .expect("SMTP_USERNAME is not set")
         .trim()
         .to_string();
-    pub static ref SMTP_URL: String = env::var("SMTP_URL")
-        .expect("SMTP_URL is not set")
-        .trim()
-        .to_string();
+    pub static ref SMTP_URL: Option<String> = env::var("SMTP_URL")
+        .ok()
+        .map(|url| url.trim().to_string());
     pub static ref SMTP_FROM: String = env::var("SMTP_FROM")
         .expect("SMTP_FROM is not set")
         .trim()

diff --git a/rauthy-common/src/error_response.rs b/rauthy-common/src/error_response.rs
@@ -164,7 +164,7 @@ impl From<sqlx::Error> for ErrorResponse {
             sqlx::Error::Configuration(e) => (ErrorResponseType::Database, e.to_string()),
             sqlx::Error::Database(e) => {
                 let s = e.to_string();
-                if s.contains("UNIQUE") {
+                if s.contains("duplicate key") || s.contains("UNIQUE") {
                     // basically returns http 400 on duplicate id column errors -> no distinct err type
                     (ErrorResponseType::BadRequest, s)
                 } else {

diff --git a/rauthy-models/src/email.rs b/rauthy-models/src/email.rs
@@ -398,7 +398,11 @@ pub async fn sender(mut rx: Receiver<EMail>, test_mode: bool) {
 
     // to make the integration tests not panic, results are taken and just thrown away
     // not the nicest approach for now, but it works
-    if test_mode {
+    if test_mode || SMTP_URL.is_none() {
+        if SMTP_URL.is_none() {
+            error!("SMTP_URL is not configured, cannot send out any E-Mails!");
+        }
+
         loop {
             let req = rx.recv().await;
             if req.is_some() {
@@ -413,10 +417,11 @@ pub async fn sender(mut rx: Receiver<EMail>, test_mode: bool) {
         }
     }
 
+    let smtp_url = SMTP_URL.as_deref().unwrap();
     let mailer = {
         let mut retries = 0;
 
-        let mut conn = connect_test_smtp().await;
+        let mut conn = connect_test_smtp(smtp_url).await;
         while let Err(err) = conn {
             error!("{:?}", err);
 
@@ -426,7 +431,7 @@ pub async fn sender(mut rx: Receiver<EMail>, test_mode: bool) {
             retries += 1;
             tokio::time::sleep(Duration::from_secs(5)).await;
 
-            conn = connect_test_smtp().await;
+            conn = connect_test_smtp(smtp_url).await;
         }
         conn.unwrap()
     };
@@ -474,44 +479,46 @@ pub async fn sender(mut rx: Receiver<EMail>, test_mode: bool) {
     }
 }
 
-async fn connect_test_smtp() -> Result<AsyncSmtpTransport<lettre::Tokio1Executor>, ErrorResponse> {
+async fn connect_test_smtp(
+    smtp_url: &str,
+) -> Result<AsyncSmtpTransport<lettre::Tokio1Executor>, ErrorResponse> {
     let creds = authentication::Credentials::new(SMTP_USERNAME.clone(), SMTP_PASSWORD.clone());
 
     // always try fully wrapped TLS first
-    let mut conn = AsyncSmtpTransport::<lettre::Tokio1Executor>::relay(&SMTP_URL)
+    let mut conn = AsyncSmtpTransport::<lettre::Tokio1Executor>::relay(smtp_url)
         .expect("Connection Error with 'SMTP_URL'")
         .credentials(creds.clone())
         .timeout(Some(Duration::from_secs(10)))
         .build();
 
     match conn.test_connection().await {
         Ok(true) => {
-            info!("Successfully connected to {} via TLS", *SMTP_URL);
+            info!("Successfully connected to {} via TLS", smtp_url);
         }
         Ok(false) | Err(_) => {
             warn!(
                 "Could not connect to {} via TLS. Trying downgrade to STARTTLS",
-                *SMTP_URL,
+                smtp_url,
             );
 
             // only if full TLS fails, try STARTTLS
-            conn = AsyncSmtpTransport::<lettre::Tokio1Executor>::starttls_relay(&SMTP_URL)
+            conn = AsyncSmtpTransport::<lettre::Tokio1Executor>::starttls_relay(smtp_url)
                 .expect("Connection Error with 'SMTP_URL'")
                 .credentials(creds)
                 .timeout(Some(Duration::from_secs(10)))
                 .build();
 
             match conn.test_connection().await {
                 Ok(true) => {
-                    info!("Successfully connected to {} via STARTTLS", *SMTP_URL);
+                    info!("Successfully connected to {} via STARTTLS", smtp_url);
                 }
                 Ok(false) | Err(_) => {
-                    error!("Could not connect to {} via STARTTLS either", *SMTP_URL);
+                    error!("Could not connect to {} via STARTTLS either", smtp_url);
                     return Err(ErrorResponse::new(
                         ErrorResponseType::Internal,
                         format!(
                             "Could not connect to {} - neither TLS nor STARTTLS worked",
-                            *SMTP_URL
+                            smtp_url
                         ),
                     ));
                 }

diff --git a/rauthy.deploy.cfg b/rauthy.deploy.cfg
@@ -50,7 +50,7 @@ DATABASE_URL=sqlite::memory:
 
 SMTP_USERNAME=
 SMTP_PASSWORD=
-SMTP_URL=smtp.gmail.com
+SMTP_URL=smtp.change.me
 # Format: "Rauthy <[email protected]>"
 SMTP_FROM="Rauthy <[email protected]>"