c2cgeoportal-geoportal 2.8.1.149__py2.py3-none-any.whl → 2.8.1.151__py2.py3-none-any.whl

c2cgeoportal_geoportal/lib/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -142,11 +142,12 @@ def get_setting(settings: Any, path: Iterable[str], default: Any = None) -> Any:
 
 
 @CACHE_REGION_OBJ.cache_on_arguments()  # type: ignore
-def get_ogc_server_wms_url_ids(request: pyramid.request.Request) -> Dict[str, List[int]]:
+def get_ogc_server_wms_url_ids(request: pyramid.request.Request, host: str) -> Dict[str, List[int]]:
     """Get the OGCServer ids mapped on the WMS URL."""
     from c2cgeoportal_commons.models import DBSession  # pylint: disable=import-outside-toplevel
     from c2cgeoportal_commons.models.main import OGCServer  # pylint: disable=import-outside-toplevel
 
+    del host  # used for cache
     errors: Set[str] = set()
     servers: Dict[str, List[int]] = {}
     for ogc_server in DBSession.query(OGCServer).all():
@@ -157,11 +158,12 @@ def get_ogc_server_wms_url_ids(request: pyramid.request.Request) -> Dict[str, Li
 
 
 @CACHE_REGION_OBJ.cache_on_arguments()  # type: ignore
-def get_ogc_server_wfs_url_ids(request: pyramid.request.Request) -> Dict[str, List[int]]:
+def get_ogc_server_wfs_url_ids(request: pyramid.request.Request, host: str) -> Dict[str, List[int]]:
     """Get the OGCServer ids mapped on the WFS URL."""
     from c2cgeoportal_commons.models import DBSession  # pylint: disable=import-outside-toplevel
     from c2cgeoportal_commons.models.main import OGCServer  # pylint: disable=import-outside-toplevel
 
+    del host  # used for cache
     errors: Set[str] = set()
     servers: Dict[str, List[int]] = {}
     for ogc_server in DBSession.query(OGCServer).all():

c2cgeoportal_geoportal/lib/filter_capabilities.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2023, Camptocamp SA
+# Copyright (c) 2014-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -113,7 +113,9 @@ def filter_capabilities(
     wms_structure_ = wms_structure(url, headers.get("Host"), request)
 
     ogc_server_ids = (
-        get_ogc_server_wms_url_ids(request) if wms else get_ogc_server_wfs_url_ids(request)
+        get_ogc_server_wms_url_ids(request, request.host)
+        if wms
+        else get_ogc_server_wfs_url_ids(request, request.host)
     ).get(url.url())
     gmf_private_layers = copy.copy(get_private_layers(ogc_server_ids))
     for id_ in list(get_protected_layers(request, ogc_server_ids).keys()):
@@ -151,7 +153,7 @@ def filter_wfst_capabilities(content: str, wfs_url: Url, request: pyramid.reques
     """Filter the WTS capabilities."""
 
     writable_layers: Set[str] = set()
-    ogc_server_ids = get_ogc_server_wfs_url_ids(request).get(wfs_url.url())
+    ogc_server_ids = get_ogc_server_wfs_url_ids(request, request.host).get(wfs_url.url())
     if ogc_server_ids is None:
         LOG.error("No OGC server found for WFS URL %s", wfs_url)
         raise pyramid.httpexceptions.HTTPInternalServerError("No OGC server found for WFS URL")

c2cgeoportal_geoportal/views/mapserverproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_geoportal/views/printproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@ class PrintProxy(Proxy):
         query_string = urllib.parse.urlencode(params)
 
         resp, content = self._capabilities(
-            templates, query_string, self.request.method, self.request.referrer
+            templates, query_string, self.request.method, self.request.referrer, self.request.host
         )
 
         response = self._build_response(resp, content, Cache.PRIVATE, "print")
@@ -74,12 +74,14 @@ class PrintProxy(Proxy):
 
     @CACHE_REGION.cache_on_arguments()  # type: ignore
     def _capabilities(
-        self, templates: List[str], query_string: Dict[str, str], method: str, referrer: str
+        self, templates: List[str], query_string: Dict[str, str], method: str, referrer: str, host: str
     ) -> Tuple[requests.Response, str]:
         del query_string  # Just for caching
         del method  # Just for caching
         del referrer  # Just for caching
-        # get URL
+        del host  # Just for caching
+
+        # Get URL
         _url = self.request.get_organization_print_url() + "/capabilities.json"
 
         response = self._proxy(Url(_url))

c2cgeoportal_geoportal/views/proxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -173,9 +173,10 @@ class Proxy:
         return response
 
     @CACHE_REGION.cache_on_arguments()  # type: ignore
-    def _proxy_cache(self, method: str, *args: Any, **kwargs: Any) -> pyramid.response.Response:
+    def _proxy_cache(self, host: str, method: str, *args: Any, **kwargs: Any) -> pyramid.response.Response:
         # Method is only for the cache
-        del method
+        del host, method
+
         kwargs["cache"] = True
         return self._proxy(*args, **kwargs)
 
@@ -191,7 +192,7 @@ class Proxy:
             headers_update = {}
         cache = kwargs.get("cache", False)
         if cache is True:
-            response = self._proxy_cache(url, self.request.method, **kwargs)
+            response = self._proxy_cache(url, self.request.host, self.request.method, **kwargs)
         else:
             response = self._proxy(url, **kwargs)
 

{c2cgeoportal_geoportal-2.8.1.149.dist-info → c2cgeoportal_geoportal-2.8.1.151.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.8.1.149
+Version: 2.8.1.151
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.8.1.149.dist-info → c2cgeoportal_geoportal-2.8.1.151.dist-info}/RECORD

@@ -1,7 +1,7 @@
 c2cgeoportal_geoportal/__init__.py,sha256=5VP1yGHCIrIMcsZAppi3mnj9sQPlKS4hpxWa4P5qHLY,32818
 c2cgeoportal_geoportal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/resources.py,sha256=6CMHJveA-nDBNHBO0MudHCu2tn0AdKXmLKrTv8Ulz08,2182
-c2cgeoportal_geoportal/lib/__init__.py,sha256=r4ecRV6b-wsub_QV-l4cfW3aqfho2uAEGaHgm5P-X94,10290
+c2cgeoportal_geoportal/lib/__init__.py,sha256=d0Z_99AxtbdZAtSUT8iOpRg5_ZV0lnERmkamri5x6TM,10374
 c2cgeoportal_geoportal/lib/authentication.py,sha256=5P4NWcmTDiZgSKvUbidzSHax-6ufwrIER2NBR7aP1UE,8911
 c2cgeoportal_geoportal/lib/bashcolor.py,sha256=LQgOgtFUvgJ4Ed3-YW3RPjvhBMZBbXBBkUZKE4unRCI,1889
 c2cgeoportal_geoportal/lib/cacheversion.py,sha256=M_0Ci0HPQASkcHbnvG33G9SOsFdRMKSHUP5G5Yt1yvI,2948
@@ -10,7 +10,7 @@ c2cgeoportal_geoportal/lib/check_collector.py,sha256=-x5iFUMw0NfPalG1RI6WoKTiW1B
 c2cgeoportal_geoportal/lib/checker.py,sha256=RdcGWUjDHowaxl5OZGM5uNrG-K5v4P5BtnfANJO3lfY,12549
 c2cgeoportal_geoportal/lib/common_headers.py,sha256=xVHJw8ihumvUG2TcIPv11E2MevoAMDmz6-k3nC6nU-0,6500
 c2cgeoportal_geoportal/lib/dbreflection.py,sha256=TL5xovttqEKkkjKTgOaS1IRtrUp4pY1H8l8XIjC8l_g,9638
-c2cgeoportal_geoportal/lib/filter_capabilities.py,sha256=E3WJ_xa12llOe9qEh2JNvHEd7N4hFD2lIduBvFZkqlM,14376
+c2cgeoportal_geoportal/lib/filter_capabilities.py,sha256=JVx0nBWDdLMCfd0GwG7AdE4tb26DEuimkP87XEEQbXg,14434
 c2cgeoportal_geoportal/lib/fulltextsearch.py,sha256=6mUdf4EydFiI7gjx2vmcc4yyRRFs4cH3gg_XdBePAww,2271
 c2cgeoportal_geoportal/lib/functionality.py,sha256=DqqLx3dwBY7QxpQgcDGh8NuxE1-sWVuSPk5k3bNE2bM,6293
 c2cgeoportal_geoportal/lib/headers.py,sha256=d6lelDs1fDh5xO8Dz34r-TRgSETY2bb1eEIDuk6FJHM,2622
@@ -158,13 +158,13 @@ c2cgeoportal_geoportal/views/geometry_processing.py,sha256=LpzAR6RgGS9XfsGLmNqD3
 c2cgeoportal_geoportal/views/i18n.py,sha256=7Avpt-aVEVlS3SrwtZkvuJ8_0gBZvVrCviyaIZBx7jY,5292
 c2cgeoportal_geoportal/views/layers.py,sha256=obRfvJE_IhqT0oQdyjv1Lce_KZVb8GWDrkpMZNYqZH0,28773
 c2cgeoportal_geoportal/views/login.py,sha256=H4BCgOrhlbx34g5J1Sx8SdpoEoRCyL6PFRv19du_Vdo,21302
-c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=LZRr86YerMJElSkQvfBX2aBMCoAdVyOPoFu3WzfaaeE,8167
+c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=b4c0-uuoBk8YVccpQ_6UVVqUzenrV-2edfBE0Q4c9Bw,8167
 c2cgeoportal_geoportal/views/memory.py,sha256=nb2repOnil0PdziEjCLOZ-84LFKLkdAlKTnnMQoXDdA,3627
 c2cgeoportal_geoportal/views/ogcproxy.py,sha256=xnbrLpB8ZZSU-P1_aM_9LZeFr7GJzbePB05Ls6tluTU,5231
 c2cgeoportal_geoportal/views/pdfreport.py,sha256=jRXOZxNwB2uMsFFNaUOb3Axc1W_ZW00mQ9EYRoENppE,9595
-c2cgeoportal_geoportal/views/printproxy.py,sha256=0BzC6yFSg7vC_V21QKg1fArA9c0-JFl6-Kig9p-iZ9g,5909
+c2cgeoportal_geoportal/views/printproxy.py,sha256=rsNXmZ1IBv9rXaCrCVRcc9cWkHOa3rX9NJgNFDNIp4A,5977
 c2cgeoportal_geoportal/views/profile.py,sha256=WOjnkLcL3nakQG0t2Zj6M0FWyG3T874nn7MXaa1Dl18,5394
-c2cgeoportal_geoportal/views/proxy.py,sha256=r61TJd-GuSsGkzS98snO8owU3cDxbYnksL9-ux9bK7I,10421
+c2cgeoportal_geoportal/views/proxy.py,sha256=dQ5Xot1R4FKH-zkGPei5mKUzYqguYztrgo1v93qJ1_k,10458
 c2cgeoportal_geoportal/views/raster.py,sha256=zdwXumFZZNx1Gxlqy_s_6Cm8l50vN6CUMkXYHsbWIdI,7567
 c2cgeoportal_geoportal/views/resourceproxy.py,sha256=Wxzb0HkWQtL5JZmbNFfTP9-m83vKImsURGIotC3qbXc,3181
 c2cgeoportal_geoportal/views/shortener.py,sha256=EP2geo-9hfce0ZQ6kzwpwnOb3ruGY2KwxBDtepJKYQI,6205
@@ -184,8 +184,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.8.1.149.dist-info/METADATA,sha256=VnBsfX1swPlUkJtbGXFNW5uRrXImwNyGForQrgA7-4Q,2172
-c2cgeoportal_geoportal-2.8.1.149.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.8.1.149.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
-c2cgeoportal_geoportal-2.8.1.149.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.8.1.149.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.8.1.151.dist-info/METADATA,sha256=0YrSG41p9H2KcIazVZVi_tHE7uNTdU8xac5GT2M_dko,2172
+c2cgeoportal_geoportal-2.8.1.151.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+c2cgeoportal_geoportal-2.8.1.151.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
+c2cgeoportal_geoportal-2.8.1.151.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.8.1.151.dist-info/RECORD,,