changeset 53:5dc62a1ae1ba

Ignore empty secret
author Lewin Bormann <lbo@spheniscida.de>
date Thu, 03 Dec 2020 22:10:37 +0100
parents ac13f3a4299a
children 2d6770d7e8cf
files src/main.rs
diffstat 1 files changed, 27 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.rs	Thu Dec 03 22:08:45 2020 +0100
+++ b/src/main.rs	Thu Dec 03 22:10:37 2020 +0100
@@ -23,6 +23,15 @@
     last: Option<i32>,
     limit: Option<i64>,
 ) -> rocket_contrib::json::Json<types::LiveUpdate> {
+    let secret = if let Some(secret) = secret {
+        if secret.is_empty() {
+            None
+        } else {
+            Some(secret)
+        }
+    } else {
+        secret
+    };
     let db = db::DBQuery(&db.0);
     if let Some((geojson, newlast)) = db.check_for_new_rows(&name, &secret, &last, &limit) {
         rocket_contrib::json::Json(types::LiveUpdate::new(Some(newlast), Some(geojson), None))
@@ -50,6 +59,15 @@
                 .into(),
         );
     }
+    let secret = if let Some(secret) = secret {
+        if secret.is_empty() {
+            None
+        } else {
+            Some(secret)
+        }
+    } else {
+        secret
+    };
 
     http::return_json(&notify_manager.wait_for_notification(name, secret, timeout))
 }
@@ -71,6 +89,15 @@
                 .into(),
         );
     }
+    let secret = if let Some(secret) = secret {
+        if secret.is_empty() {
+            None
+        } else {
+            Some(secret)
+        }
+    } else {
+        secret
+    };
     let db = db::DBQuery(&db.0);
     let from_ts =
         from.and_then(util::flexible_timestamp_parse)