Add support for qgis_server_url_tenant_suffix config setting

Author: manisandro

src/config_generator/capabilities_reader.py

@@ -3,6 +3,7 @@
 from xml.etree import ElementTree
 
 import os
+import posixpath
 import re
 import requests
 import traceback
@@ -30,6 +31,9 @@ def __init__(self, generator_config, logger, use_cached_project_metadata, cache_
         self.default_qgis_server_url = generator_config.get(
             'default_qgis_server_url', 'http://localhost:8001/ows/'
         ).rstrip('/') + '/'
+        self.qgis_server_url_tenant_suffix = generator_config.get(
+            'qgis_server_url_tenant_suffix', ''
+        ).strip('/')
 
         # layer opacity values for QGIS <= 3.10 from ConfigGenerator config
         self.layer_opacities = generator_config.get("layer_opacities", {})
@@ -44,18 +48,20 @@ def __init__(self, generator_config, logger, use_cached_project_metadata, cache_
 
     # WMS GetProjectSettings
 
-    def read_wms_service_capabilities(self, url, service_name, item, themes_config):
+    def read_wms_service_capabilities(self, service_name, item, themes_config):
         """Load and parse WMS GetProjectSettings for a theme item.
 
-        :param str url: service URL
         :param str service_name: service name
         :param object item: theme item
         :param object themes_config: themes config
         """
 
         try:
             # get GetProjectSettings
-            full_url = urljoin(self.default_qgis_server_url, url)
+            full_url = urljoin(
+                self.default_qgis_server_url,
+                posixpath.join(self.qgis_server_url_tenant_suffix, service_name)
+            )
 
             if len(full_url) > 2000:
                 self.logger.warning(
@@ -488,18 +494,20 @@ def collect_geometryless_layers(self, layer, internal_print_layers, ns, np,
 
     # WFS Capabilities
 
-    def read_wfs_service_capabilities(self, url, service_name, item):
+    def read_wfs_service_capabilities(self, service_name, item):
         """Load and parse WFS GetCapabilities for a theme item.
 
         NOTE: returns empty result if WFS does not contains any layers
 
-        :param str url: service URL
         :param str service_name: service name
         :param object item: theme item
         """
         try:
             # get GetProjectSettings
-            full_url = urljoin(self.default_qgis_server_url, url)
+            full_url = urljoin(
+                self.default_qgis_server_url,
+                posixpath.join(self.qgis_server_url_tenant_suffix, service_name )
+            )
 
             if len(full_url) > 2000:
                 self.logger.warning(

src/config_generator/feature_info_service_config.py

@@ -30,6 +30,9 @@ def __init__(self, generator_config, themes_reader, config_models,
         self.default_qgis_server_url = generator_config.get(
             'default_qgis_server_url', 'http://localhost:8001/ows/'
         ).rstrip('/') + '/'
+        self.qgis_server_url_tenant_suffix = generator_config.get(
+            'qgis_server_url_tenant_suffix', ''
+        ).strip('/')
         self.permissions_default_allow = generator_config.get(
             'permissions_default_allow', True
         )
@@ -54,6 +57,11 @@ def config(self):
             cfg_config['default_qgis_server_url'] = \
                 self.default_qgis_server_url
 
+        if 'qgis_server_url_tenant_suffix' not in cfg_config:
+            # use qgis_server_url_tenant_suffix from ConfigGenerator config
+            # if not set in service config
+            cfg_config['qgis_server_url_tenant_suffix'] = self.qgis_server_url_tenant_suffix
+
         config['config'] = cfg_config
 
         resources = OrderedDict()

src/config_generator/legend_service_config.py

@@ -33,6 +33,9 @@ def __init__(self, generator_config, themes_reader, config_models,
         self.default_qgis_server_url = generator_config.get(
             'default_qgis_server_url', 'http://localhost:8001/ows/'
         ).rstrip('/') + '/'
+        self.qgis_server_url_tenant_suffix = generator_config.get(
+            'qgis_server_url_tenant_suffix', ''
+        ).strip('/')
 
         self.themes_reader = themes_reader
 
@@ -49,6 +52,11 @@ def config(self):
             cfg_config['default_qgis_server_url'] = \
                 self.default_qgis_server_url
 
+        if 'qgis_server_url_tenant_suffix' not in cfg_config:
+            # use qgis_server_url_tenant_suffix from ConfigGenerator config
+            # if not set in service config
+            cfg_config['qgis_server_url_tenant_suffix'] = self.qgis_server_url_tenant_suffix
+
         config['config'] = cfg_config
 
         resources = OrderedDict()

src/config_generator/map_viewer_config.py

@@ -3,6 +3,7 @@
 import os
 import re
 from pathlib import Path
+import posixpath
 import requests
 import traceback
 import urllib.parse
@@ -103,6 +104,9 @@ def __init__(self, tenant_path, generator_config, themes_reader,
         self.default_qgis_server_url = generator_config.get(
             'default_qgis_server_url', 'http://localhost:8001/ows/'
         ).rstrip('/') + '/'
+        self.qgis_server_url_tenant_suffix = generator_config.get(
+            'qgis_server_url_tenant_suffix', ''
+        ).strip('/')
 
         # Use default map thumbnail instead of generating via GetMap
         self.use_default_map_thumbnail = generator_config.get(
@@ -650,7 +654,10 @@ def get_thumbnail(self, cfg_item, service_name, capabilities, assets_dir):
             layers.append(layer['name'])
 
         # WMS GetMap request
-        url = urllib.parse.urljoin(self.default_qgis_server_url, service_name)
+        url = urllib.parse.urljoin(
+            self.default_qgis_server_url,
+            posixpath.join(self.qgis_server_url_tenant_suffix, service_name)
+        )
 
         bboxw = extent[2] - extent[0]
         bboxh = extent[3] - extent[1]

src/config_generator/ogc_service_config.py

@@ -27,6 +27,9 @@ def __init__(self, generator_config, themes_reader, config_models,
         self.default_qgis_server_url = generator_config.get(
             'default_qgis_server_url', 'http://localhost:8001/ows/'
         ).rstrip('/') + '/'
+        self.qgis_server_url_tenant_suffix = generator_config.get(
+            'qgis_server_url_tenant_suffix', ''
+        ).strip('/')
 
         self.themes_reader = themes_reader
 
@@ -51,6 +54,10 @@ def config(self):
             # if not set in service config
             cfg_config['default_qgis_server_url'] = \
                 self.default_qgis_server_url
+        if 'qgis_server_url_tenant_suffix' not in cfg_config:
+            # use qgis_server_url_tenant_suffix from ConfigGenerator config
+            # if not set in service config
+            cfg_config['qgis_server_url_tenant_suffix'] = self.qgis_server_url_tenant_suffix
 
         config['config'] = cfg_config
 

src/config_generator/theme_reader.py

@@ -93,11 +93,11 @@ def read_metadata_for_theme(self, item, themes_config):
 
         self.logger.info("<b>Reading theme %s</b>" % url)
 
-        wms_capabilities = self.capabilities_reader.read_wms_service_capabilities(url, service_name, item, themes_config)
+        wms_capabilities = self.capabilities_reader.read_wms_service_capabilities(service_name, item, themes_config)
 
         wfs_capabilities = {}
         if self.generate_wfs_services:
-            wfs_capabilities = self.capabilities_reader.read_wfs_service_capabilities(url, service_name, item)
+            wfs_capabilities = self.capabilities_reader.read_wfs_service_capabilities(service_name, item)
 
         qgs_reader = QGSReader(
             self.config, self.logger, self.qgis_projects_base_dir,