c2cgeoportal-geoportal 2.8.1.170__py2.py3-none-any.whl → 2.8.1.171__py2.py3-none-any.whl

c2cgeoportal_geoportal/lib/common_headers.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2023, Camptocamp SA
+# Copyright (c) 2012-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,6 @@ from typing import Any, Dict, List, Optional, cast
 import pyramid.request
 import pyramid.response
 
-from c2cgeoportal_geoportal.lib import is_intranet
-
 _LOG = logging.getLogger(__name__)
 
 
@@ -119,6 +117,8 @@ def _set_common_headers(
 ) -> pyramid.response.Response:
     """Set the common headers."""
 
+    del request  # Unused
+
     response.headers.update(service_headers_settings.get("headers", {}))
 
     if cache in (Cache.PRIVATE, Cache.PRIVATE_NO):
@@ -136,10 +136,7 @@ def _set_common_headers(
     elif cache in (Cache.PUBLIC, Cache.PUBLIC_NO):
         response.cache_control.public = True
     elif cache in (Cache.PRIVATE, Cache.PRIVATE_NO):
-        if hasattr(request, "user") and request.user is not None or is_intranet(request):
-            response.cache_control.private = True
-        else:
-            response.cache_control.public = True
+        response.cache_control.private = True
     else:
         raise Exception("Invalid cache type")  # pylint: disable=broad-exception-raised
 

c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt

@@ -22,6 +22,12 @@ Version 2.8.1
 
    End of support by GitHub: https://github.blog/changelog/2024-04-10-github-hosted-runner-images-deprecation-notice-docker-compose-v1/.
 
+4. Previously the `Cache-Control` header was set to `public` when we are not authenticated to an endpoint
+   that use the authentication. But this didn't works in every cases, for example when we use the intranet
+   role and when we have a reverse proxy with cache. Now it's always set to private for all the endpoints
+   that use the authentication.
+
+
 =============
 Version 2.8.0
 =============

{c2cgeoportal_geoportal-2.8.1.170.dist-info → c2cgeoportal_geoportal-2.8.1.171.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.8.1.170.dist-info → c2cgeoportal_geoportal-2.8.1.171.dist-info}/RECORD

@@ -8,7 +8,7 @@ c2cgeoportal_geoportal/lib/cacheversion.py,sha256=M_0Ci0HPQASkcHbnvG33G9SOsFdRMK
 c2cgeoportal_geoportal/lib/caching.py,sha256=3tcz5ZCsdL0ByINiNFux3--zoqQbJVuYalhTPYrIDvE,6713
 c2cgeoportal_geoportal/lib/check_collector.py,sha256=-x5iFUMw0NfPalG1RI6WoKTiW1BlUvHTiAJy_2mMu2s,3414
 c2cgeoportal_geoportal/lib/checker.py,sha256=RdcGWUjDHowaxl5OZGM5uNrG-K5v4P5BtnfANJO3lfY,12549
-c2cgeoportal_geoportal/lib/common_headers.py,sha256=xVHJw8ihumvUG2TcIPv11E2MevoAMDmz6-k3nC6nU-0,6500
+c2cgeoportal_geoportal/lib/common_headers.py,sha256=sa3FqwE5_1G0heJu8ep9cZImoBqndITLA405IivY_Dc,6318
 c2cgeoportal_geoportal/lib/dbreflection.py,sha256=TL5xovttqEKkkjKTgOaS1IRtrUp4pY1H8l8XIjC8l_g,9638
 c2cgeoportal_geoportal/lib/filter_capabilities.py,sha256=JVx0nBWDdLMCfd0GwG7AdE4tb26DEuimkP87XEEQbXg,14434
 c2cgeoportal_geoportal/lib/fulltextsearch.py,sha256=6mUdf4EydFiI7gjx2vmcc4yyRRFs4cH3gg_XdBePAww,2271
@@ -135,7 +135,7 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl,sha256=y-X8uAZP9mEq3k6NygBI_FynZeEQ_IatFPXkzWs5UAQ,6181
 c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json,sha256=x3FFn3b67GPGCsjg36iGXCudjaTSfwGHcwHS6HHVpPQ,539
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml,sha256=_ctFv4lgUP4_7LozPND8jKwixN5jeaiB0bGSrnH4jV4,2559
-c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt,sha256=q4_d9d5DnfTRNPp8smHkRQ-9IAhQFj5sbQtv8mLbgxo,8264
+c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt,sha256=2vZ20rEGchwMzvvFMBsbY2glEZsYBItm9l5llbWMec4,8617
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py,sha256=Mxx4z7TnM3VHF8xxEorZjIw9uQRNGM7y5EHW7VYaEb8,1796
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_config-schema.yaml,sha256=bjpHnvjPDNr-wVodb3NC9XkCcr-hnJo8JhirX2t38MU,21183
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml,sha256=gQOPZqPUitn674cVrf-DonrRWZmZ7sLAE1NL9YXfBms,47538
@@ -173,7 +173,7 @@ c2cgeoportal_geoportal/views/tinyowsproxy.py,sha256=cfWyZc4mn003TF7XY03NC2S8svZo
 c2cgeoportal_geoportal/views/vector_tiles.py,sha256=jerhFjx3_qImXz0a3eQI4FLSSe0CGmkjSt6pAXzzxUg,3460
 tests/__init__.py,sha256=KxmbgvRWDSJoEDH1cXnDIjbfBsgCzs2KdkTPuzYMq84,3826
 tests/test_cachebuster.py,sha256=asI1X_qI0MGklYuKuWyqvCPVbvhQcUe4fX91Dk-hUsE,2923
-tests/test_caching.py,sha256=8exM2zAPPIoJLalFi8l3e1KA_l2WSwWGjTXDYN_tC9o,12493
+tests/test_caching.py,sha256=8mHfSvQPEBq6sT6wvHC5Hk3mpJsyHBuOVMp4w0k37j8,12499
 tests/test_checker.py,sha256=NaU6Ejg9XbwS2cwqXCtz5mJPRdBIPZb3d1MkXVufr0k,3638
 tests/test_decimaljson.py,sha256=CQrkqWs66kmq1iYur5kjzKhvdhw9b4TMcKEsuVayxA4,2223
 tests/test_headerstween.py,sha256=3PkfTbsUq2C7fEsckO_4aYu9-XGBSeOgf86ENSqx76o,2524
@@ -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.170.dist-info/METADATA,sha256=3uk4QqqrMtEXTmFHZcE7o-OfqJ00a7IsrBAdvz2E5ro,2172
-c2cgeoportal_geoportal-2.8.1.170.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.8.1.170.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
-c2cgeoportal_geoportal-2.8.1.170.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.8.1.170.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.8.1.171.dist-info/METADATA,sha256=l-yF5Tq-K3OkvFMG9DlULp1bd2rybqr3qxCfbAOPWTc,2172
+c2cgeoportal_geoportal-2.8.1.171.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+c2cgeoportal_geoportal-2.8.1.171.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
+c2cgeoportal_geoportal-2.8.1.171.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.8.1.171.dist-info/RECORD,,

tests/test_caching.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2023, Camptocamp SA
+# Copyright (c) 2015-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ class TestSetCorsHeaders(TestCase):
         # 1. If the Origin header is not present terminate this set of steps.
         #    The request is outside the scope of this specification.
         assert self._do("POST", {}) == {
-            "Cache-Control": "max-age=10, public",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
             "Vary": "Origin, Cookie",
@@ -71,7 +71,7 @@ class TestSetCorsHeaders(TestCase):
         #    any of the values in list of origins, do not set any additional
         #    headers and terminate this set of steps.
         assert self._do("POST", {"Origin": "http://foe.com"}) == {
-            "Cache-Control": "max-age=10, public",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
             "Vary": "Origin, Cookie",
@@ -82,7 +82,7 @@ class TestSetCorsHeaders(TestCase):
         #    header as value, and add a single Access-Control-Allow-Credentials
         #    header with the case-sensitive string "true" as value.
         assert self._do("POST", {"Origin": self.ORIGIN2}, credentials=True) == {
-            "Cache-Control": "max-age=10, public",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
             "Vary": "Origin, Cookie",
@@ -202,7 +202,7 @@ class TestSetCorsHeaders(TestCase):
     def test_not_configured(self):
         # If the service is not configured, then no CORS head.
         assert self._do("GET", {"Origin": self.ORIGIN1}, settings=None) == {
-            "Cache-Control": "max-age=10, public",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
             "Vary": "Origin, Cookie",
@@ -217,7 +217,7 @@ class TestSetCorsHeaders(TestCase):
         # An origin included in the access_control_allow_origin list is OK with
         # credentials
         assert self._do("POST", {"Origin": self.ORIGIN1}, credentials=True, settings=settings) == {
-            "Cache-Control": "max-age=10, public",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
             "Vary": "Origin, Cookie",
@@ -230,7 +230,7 @@ class TestSetCorsHeaders(TestCase):
         # 3. Otherwise, add a single Access-Control-Allow-Origin header, with
         #    either the value of the Origin header or the string "*" as value.
         assert self._do("POST", {"Origin": "http://www.guest.com"}, settings=settings) == {
-            "Cache-Control": "max-age=10, public",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
             "Vary": "Origin, Cookie",