c2cgeoportal-geoportal 2.7.1.140__py2.py3-none-any.whl → 2.7.1.142__py2.py3-none-any.whl

c2cgeoportal_geoportal/lib/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2021, 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
@@ -112,7 +112,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()):
@@ -150,7 +152,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())
 
     for gmf_layer in list(get_writable_layers(request, ogc_server_ids).values()):
         writable_layers |= set(gmf_layer.layer.split(","))

c2cgeoportal_geoportal/views/mapserverproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2021, 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-2021, 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,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2011-2022, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -175,9 +175,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)
 
@@ -193,7 +194,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.7.1.140.dist-info → c2cgeoportal_geoportal-2.7.1.142.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.7.1.140.dist-info → c2cgeoportal_geoportal-2.7.1.142.dist-info}/RECORD

@@ -1,7 +1,7 @@
 c2cgeoportal_geoportal/__init__.py,sha256=9s5YOvb5qlaQf_TmonFKXMwx6a-pLAG2brbRrb4Kbuc,32401
 c2cgeoportal_geoportal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/resources.py,sha256=6CMHJveA-nDBNHBO0MudHCu2tn0AdKXmLKrTv8Ulz08,2182
-c2cgeoportal_geoportal/lib/__init__.py,sha256=jsDLoTJT5ZTZuXB7tuAgprayqzzORyC3dbGyqNQnbvE,10290
+c2cgeoportal_geoportal/lib/__init__.py,sha256=d0Z_99AxtbdZAtSUT8iOpRg5_ZV0lnERmkamri5x6TM,10374
 c2cgeoportal_geoportal/lib/authentication.py,sha256=OlqVnfzNeSrA7cnCTk3hPkSNEWBBrTtwb2KifcsLSU4,8997
 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=ZdpACmoeeiNO16wM0oZc3bHkXgH8-0lYpWa7b_-937E,12323
 c2cgeoportal_geoportal/lib/common_headers.py,sha256=qwIWaNA_wMeJ2UrbtBFG0v3R26HgEn8npBRtSbjeyTE,6458
 c2cgeoportal_geoportal/lib/dbreflection.py,sha256=XWShaJrAE2vDAzAh-z2YfIVBrGiIzJ_WZEzd2Thne5I,9629
-c2cgeoportal_geoportal/lib/filter_capabilities.py,sha256=jsmP6yiIE6nuT2pbP32CudrSx0wgC-S_NVZcSfpKmUU,14172
+c2cgeoportal_geoportal/lib/filter_capabilities.py,sha256=vEvQ2SyITKI_A7XshhHODy_N31URliwEWKoJkwOKnHA,14230
 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
@@ -152,13 +152,13 @@ c2cgeoportal_geoportal/views/geometry_processing.py,sha256=OlvpcDSrvqy-xykmycWh5
 c2cgeoportal_geoportal/views/i18n.py,sha256=7Avpt-aVEVlS3SrwtZkvuJ8_0gBZvVrCviyaIZBx7jY,5292
 c2cgeoportal_geoportal/views/layers.py,sha256=EqaICEToh5MOdp9h7gG60peuV6PBAyw6euqliA174LU,28850
 c2cgeoportal_geoportal/views/login.py,sha256=BugfdgTg4f73yo6e1uSshEYu0MZhwS9YaLo0c9JYPrM,19104
-c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=Oyc9T_L9-yNYKrOszp28vLFgxzDTTwHGYVhLdCGWy70,8203
+c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=yl2O6FJZxJ1TVU7DvQpaTLT1JsNlqId9Sgiv44Umd4A,8203
 c2cgeoportal_geoportal/views/memory.py,sha256=nb2repOnil0PdziEjCLOZ-84LFKLkdAlKTnnMQoXDdA,3627
 c2cgeoportal_geoportal/views/ogcproxy.py,sha256=M9hkxgIga29SoJ4VNwkzkiOkQiOsyyXMrMUwSN0W73U,5065
 c2cgeoportal_geoportal/views/pdfreport.py,sha256=0cNXsfUmIlbvsgjVyg7031cY6OBwA6c6bAfYvSDMeRE,9576
-c2cgeoportal_geoportal/views/printproxy.py,sha256=DxKQkb87k3HMm7hfhdmxjYFR3v67WEGaVFlXv5mezGM,5897
+c2cgeoportal_geoportal/views/printproxy.py,sha256=buHwibEfM2mm88F3-CNjeiykpHeCz0FtT5r1Y8mEt_g,5965
 c2cgeoportal_geoportal/views/profile.py,sha256=9ZXIsjJoV3_uRx0H3iQ0256xiu5OpIaMPAMmKEbaBuk,5394
-c2cgeoportal_geoportal/views/proxy.py,sha256=mxvBva4oEGh6O5IT2Q6BTzftl-P2_MhNIiVe3j6Ar8Q,10453
+c2cgeoportal_geoportal/views/proxy.py,sha256=0PWwckJdU5EXGLaa27yLBZimBSU2DiMO4VcVsCE2MmI,10490
 c2cgeoportal_geoportal/views/raster.py,sha256=7diNkV-YGtg4di_QDV-Bbbe6phB76bPYLnmnE4ZBXc0,7570
 c2cgeoportal_geoportal/views/resourceproxy.py,sha256=aKOJUOI5Em2Z3BI61I2br_sUmx8ospFv_RExxmqkyXA,3181
 c2cgeoportal_geoportal/views/shortener.py,sha256=I9GjjlkR9sX5CwsRSsY9PLjyLue_c_nHgVrFnh3gTBQ,6206
@@ -178,8 +178,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=CrYzEnYjowvDJxJp56gEAaUEk5vX
 tests/test_raster.py,sha256=oRyOc90WixD9Y-iR3pMdkHuR0JwKART9DxNH5QwyilM,12074
 tests/test_wmstparsing.py,sha256=ZAlL6OQkYmzFTKu70OQ6Xej-7ZNB7UltSs2V_PbXDac,9135
 tests/xmlstr.py,sha256=vIvIFWIE2GFUMfAtG0hTMZC2jx-pQBuzOOq2FjQlyjA,6010
-c2cgeoportal_geoportal-2.7.1.140.dist-info/METADATA,sha256=4Lsc-wd6X-D0JJG_LRmbY8LpHrtgm91kRBBWmdqgvZI,2036
-c2cgeoportal_geoportal-2.7.1.140.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.7.1.140.dist-info/entry_points.txt,sha256=_EqfKA_CKejpkgK0xWDTB9K8an0TKqIWHoyCJrRpU80,1414
-c2cgeoportal_geoportal-2.7.1.140.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.7.1.140.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.7.1.142.dist-info/METADATA,sha256=GPl0nAibLAQMyb7Y26uqKJ7LnJOdY40HRD6mv20AMP0,2036
+c2cgeoportal_geoportal-2.7.1.142.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+c2cgeoportal_geoportal-2.7.1.142.dist-info/entry_points.txt,sha256=_EqfKA_CKejpkgK0xWDTB9K8an0TKqIWHoyCJrRpU80,1414
+c2cgeoportal_geoportal-2.7.1.142.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.7.1.142.dist-info/RECORD,,