Normalize trailing slash of public_server_url

bbox-services · Nov 11, 2024 · 020ff8d · 020ff8d
1 parent 22900ba
commit 020ff8d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/bbox-feature-server/src/inventory.rs b/bbox-feature-server/src/inventory.rs
@@ -25,7 +25,7 @@ use std::collections::HashMap;
 pub struct Inventory {
     // Key: collection_id
     feat_collections: HashMap<String, FeatureCollection>,
-    public_server_url: Option<String>,
+    base_url: String,
 }
 
 #[derive(Clone)]
@@ -37,18 +37,25 @@ pub struct FeatureCollection {
 
 impl Inventory {
     pub fn new(public_server_url: Option<String>) -> Self {
+        let base_url = format!(
+            "{}/",
+            public_server_url
+                .as_deref()
+                .unwrap_or("")
+                .trim_end_matches('/')
+        );
         Inventory {
             feat_collections: HashMap::new(),
-            public_server_url,
+            base_url,
         }
     }
 
     pub fn base_url(&self) -> &str {
-        self.public_server_url.as_deref().unwrap_or("/")
+        &self.base_url
     }
 
     pub fn href_prefix(&self) -> &str {
-        self.public_server_url.as_deref().unwrap_or("")
+        self.base_url.trim_end_matches('/')
     }
 
     pub async fn scan(config: &CollectionsCfg, public_server_url: Option<String>) -> Inventory {

diff --git a/bbox-map-server/src/inventory.rs b/bbox-map-server/src/inventory.rs
@@ -5,7 +5,7 @@ use serde_xml_rs::from_reader;
 #[derive(Serialize, Clone, Default, Debug)]
 pub struct Inventory {
     pub wms_services: Vec<WmsService>,
-    pub public_server_url: Option<String>,
+    base_url: String,
 }
 
 #[derive(Serialize, Clone, Debug)]
@@ -23,8 +23,22 @@ pub enum CapType {
 }
 
 impl Inventory {
+    pub fn new(wms_services: Vec<WmsService>, public_server_url: Option<String>) -> Self {
+        let base_url = format!(
+            "{}/",
+            public_server_url
+                .as_deref()
+                .unwrap_or("")
+                .trim_end_matches('/')
+        );
+        Inventory {
+            wms_services,
+            base_url,
+        }
+    }
+
     pub fn base_url(&self) -> &str {
-        self.public_server_url.as_deref().unwrap_or("/")
+        &self.base_url
     }
 }
 

diff --git a/bbox-map-server/src/wms_fcgi_backend.rs b/bbox-map-server/src/wms_fcgi_backend.rs
@@ -301,9 +301,6 @@ pub fn detect_backends(
             );
         }
     }
-    let inventory = Inventory {
-        wms_services: wms_inventory,
-        public_server_url,
-    };
+    let inventory = Inventory::new(wms_inventory, public_server_url);
     Ok((pools, inventory))
 }