[IMP] refine CORS settings architecture and update Cargo.toml

Author: RaoufGhrissi

aw-server/Cargo.toml

@@ -34,7 +34,6 @@ aw-datastore = { path = "../aw-datastore" }
 aw-models = { path = "../aw-models" }
 aw-transform = { path = "../aw-transform" }
 aw-query = { path = "../aw-query" }
-regex = "1.12.3"
 
 [target.'cfg(target_os="linux")'.dependencies]
 sd-notify = "0.4.2"

aw-server/src/config.rs

@@ -49,10 +49,10 @@ pub struct AWConfig {
     pub cors_regex_from_settings: Vec<String>,
 
     #[serde(skip)]
-    pub allow_aw_chrome_extension_from_settings: Option<bool>,
+    pub allow_aw_chrome_extension_from_settings: bool,
 
     #[serde(skip)]
-    pub allow_all_mozilla_extension_from_settings: Option<bool>,
+    pub allow_all_mozilla_extension_from_settings: bool,
 
     // A mapping of watcher names to paths where the
     // custom visualizations are located.
@@ -72,8 +72,8 @@ impl Default for AWConfig {
             allow_all_mozilla_extension: default_false(),
             cors_from_settings: default_cors(),
             cors_regex_from_settings: default_cors(),
-            allow_aw_chrome_extension_from_settings: None,
-            allow_all_mozilla_extension_from_settings: None,
+            allow_aw_chrome_extension_from_settings: default_true(),
+            allow_all_mozilla_extension_from_settings: default_false(),
             custom_static: default_custom_static(),
         }
     }

aw-server/src/endpoints/cors.rs

@@ -14,15 +14,11 @@ pub fn cors(config: &AWConfig) -> rocket_cors::Cors {
     allowed_regex_origins.extend(config.cors_regex_from_settings.clone());
 
     // Settings-based flags override file-based config flags
-    let allow_chrome = config.allow_aw_chrome_extension_from_settings
-        .unwrap_or(config.allow_aw_chrome_extension);
-    if allow_chrome {
+    if config.allow_aw_chrome_extension_from_settings {
         allowed_regex_origins.push("chrome-extension://nglaklhklhcoonedhgnpgddginnjdadi".to_string());
     }
 
-    let allow_mozilla = config.allow_all_mozilla_extension_from_settings
-        .unwrap_or(config.allow_all_mozilla_extension);
-    if allow_mozilla {
+    if config.allow_all_mozilla_extension_from_settings {
         allowed_regex_origins.push("moz-extension://.*".to_string());
     }
 
@@ -31,6 +27,7 @@ pub fn cors(config: &AWConfig) -> rocket_cors::Cors {
             "http://127.0.0.1:27180".to_string(), 
             "http://localhost:27180".to_string(),
         ]);
+        allowed_regex_origins.push("chrome-extension://.*".to_string());
     }
 
     let allowed_origins = AllowedOrigins::some(&allowed_exact_origins, &allowed_regex_origins);
@@ -40,6 +37,7 @@ pub fn cors(config: &AWConfig) -> rocket_cors::Cors {
         .collect();
     let allowed_headers = AllowedHeaders::all(); // TODO: is this unsafe?
 
+    // You can also deserialize this
     rocket_cors::CorsOptions {
         allowed_origins,
         allowed_methods,

aw-server/src/endpoints/mod.rs

@@ -159,10 +159,14 @@ pub fn build_rocket(server_state: ServerState, mut config: AWConfig) -> rocket::
             config.cors_regex_from_settings = parse_cors_list(raw);
         }
         if let Ok(raw) = db.get_key_value("settings.allow_aw_chrome_extension") {
-            config.allow_aw_chrome_extension_from_settings = parse_bool(raw);
+            if let Some(val) = parse_bool(raw) {
+                config.allow_aw_chrome_extension_from_settings = val;
+            }
         }
         if let Ok(raw) = db.get_key_value("settings.allow_all_mozilla_extension") {
-            config.allow_all_mozilla_extension_from_settings = parse_bool(raw);
+            if let Some(val) = parse_bool(raw) {
+                config.allow_all_mozilla_extension_from_settings = val;
+            }
         }
     } // lock released here
     let cors = cors::cors(&config);