c2cgeoportal-geoportal 2.9rc93__py3-none-any.whl → 2.9rc95__py3-none-any.whl

c2cgeoportal_geoportal/scaffolds/advance_update/cookiecutter.json

@@ -5,6 +5,8 @@
   "extent": "",
   "extent_mapserver": "",
   "authtkt_secret": "",
+  "tilecloud_chain_session_secret": "",
+  "tilecloud_chain_session_salt": "",
   "unsafe_long_version": false,
   "geomapfish_version": "",
   "geomapfish_main_version": "",

c2cgeoportal_geoportal/scaffolds/create/cookiecutter.json

@@ -5,6 +5,8 @@
   "extent": "",
   "extent_mapserver": "",
   "authtkt_secret": "",
+  "tilecloud_chain_session_secret": "",
+  "tilecloud_chain_session_salt": "",
   "unsafe_long_version": false,
   "geomapfish_version": "",
   "geomapfish_main_version": "",

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml

@@ -199,6 +199,8 @@ services:
       - DEVELOPMENT
       - VISIBLE_ENTRY_POINT
       - TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
+      - TILECLOUD_CHAIN_SESSION_SECRET
+      - TILECLOUD_CHAIN_SESSION_SALT
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AZURE_STORAGE_CONNECTION_STRING

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default

@@ -43,6 +43,9 @@ GEOPORTAL_INTERNAL_PORT=8080
 TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
 TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
 TILECLOUDCHAIN_INTERNAL_PORT=8080
+TILECLOUD_CHAIN_SESSION_SECRET={{cookiecutter.tilecloud_chain_session_secret}}
+TILECLOUD_CHAIN_SESSION_SALT={{cookiecutter.tilecloud_chain_session_salt}}
+
 # For internal print
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project

@@ -40,10 +40,6 @@ TILEGENERATION_SQS_QUEUE=<queue_name>
 TILEGENERATION_S3_BUCKET=<bucket_name>
 TILEGENERATION_AZURE_CONTAINER=<container_name>
 
-# Should be filed with a strong secret, with e.g. `pwgen --secure 16`
-# TILECLOUD_CHAIN_SESSION_SECRET=
-# TILECLOUD_CHAIN_SESSION_SALT=
-
 # For production
 # FRONT_INNER_PORT=80
 # FRONT_CONFIG=haproxy

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/project.yaml

@@ -10,6 +10,8 @@ template_vars:
   srid: {{cookiecutter.srid}}
   extent: {{cookiecutter.extent}}
   authtkt_secret: {{cookiecutter.authtkt_secret}}
+  tilecloud_chain_session_secret: {{cookiecutter.tilecloud_chain_session_secret}}
+  tilecloud_chain_session_salt: {{cookiecutter.tilecloud_chain_session_salt}}
 env:
   files:
     - env.default

c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json

@@ -5,6 +5,8 @@
   "extent": "",
   "extent_mapserver": "",
   "authtkt_secret": "",
+  "tilecloud_chain_session_secret": "",
+  "tilecloud_chain_session_salt": "",
   "unsafe_long_version": false,
   "geomapfish_version": "",
   "geomapfish_main_version": "",

c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml

@@ -805,6 +805,7 @@ vars:
         relevant_for:
           - layer_wmts
           - layer_cog
+          - layer_wms
       - name: printLayers
         description: >
           Comma-separated list of WMS layers used instead of the WMTS layer for printing.

c2cgeoportal_geoportal/scripts/pcreate.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024, Camptocamp SA
+# Copyright (c) 2021-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -178,7 +178,9 @@ class PCreateCommand:
         context: dict[str, str | int] = {
             "project": project_name,
             "package": pkg_name,
-            "authtkt_secret": gen_authtkt_secret(),
+            "authtkt_secret": gen_secret(),
+            "tilecloud_chain_session_secret": "secret" if os.environ.get("CI") == "true" else gen_secret(),
+            "tilecloud_chain_session_salt": "secret" if os.environ.get("CI") == "true" else gen_secret(16),
         }
         context.update(self.read_project_file())
         if os.environ.get("CI") == "true":
@@ -287,9 +289,13 @@ class PCreateCommand:
         return None
 
 
-def gen_authtkt_secret() -> str:
-    """Generate a random authtkt secret."""
-    return subprocess.run(["pwgen", "64"], stdout=subprocess.PIPE, check=True).stdout.decode().strip()
+def gen_secret(length: int = 64) -> str:
+    """Generate a random secret."""
+    return (
+        subprocess.run(["pwgen", "--secure", str(length)], stdout=subprocess.PIPE, check=True)
+        .stdout.decode()
+        .strip()
+    )
 
 
 if __name__ == "__main__":  # pragma: no cover

{c2cgeoportal_geoportal-2.9rc93.dist-info → c2cgeoportal_geoportal-2.9rc95.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9rc93.dist-info → c2cgeoportal_geoportal-2.9rc95.dist-info}/RECORD

@@ -54,9 +54,9 @@ c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoport
 c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/index.js,sha256=rxXFRQeGxBTLmhOUmFpIaGZda1Gk5Qi_VsXdbaOfwXo,260
 c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/js/{{cookiecutter.package}}module.js,sha256=TYZUcLOinHKhzn-l35pwqe0kNOhX90TzFOVj1KyaVaI,614
 c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-c2cgeoportal_geoportal/scaffolds/advance_update/cookiecutter.json,sha256=1LVOM-j_nd00J89q0EI3bQUvIysbidApaVHDibA2ydk,524
+c2cgeoportal_geoportal/scaffolds/advance_update/cookiecutter.json,sha256=bPfC6rSo4Tfua-rNWheDaK0EpFlOH-gzFptAgFtRzwE,602
 c2cgeoportal_geoportal/scaffolds/advance_update/{{cookiecutter.project}}/geoportal/CONST_Makefile,sha256=aclNEH4Lw_Ih98MeA15prkJhZzob4ph2pJTDGcCca-g,4023
-c2cgeoportal_geoportal/scaffolds/create/cookiecutter.json,sha256=1LVOM-j_nd00J89q0EI3bQUvIysbidApaVHDibA2ydk,524
+c2cgeoportal_geoportal/scaffolds/create/cookiecutter.json,sha256=bPfC6rSo4Tfua-rNWheDaK0EpFlOH-gzFptAgFtRzwE,602
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.dockerignore,sha256=YAccTFn5uVsUa_Qhw4wrovfnfvFxP-7rB0Q_kEUHbZ4,530
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.editorconfig,sha256=cpHwgH23FLEQ6gV2O0Xa-iKxCaaVHhTKiFA91moh1sQ,297
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.gitignore,sha256=NNaSfLn7_4sIXta39BzRfGQJfUqBq-U4lbgtkXStgkY,449
@@ -68,13 +68,13 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile,sha256
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/README.rst,sha256=QJcaUtT05atb5x8SJYflSt0YIJkbAz0Zh39_FYtyFks,423
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build,sha256=CjYe1cIL-TsKPbdxy1zStTUEGguILXpyUC63X2_Cy8c,7010
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml,sha256=sNzJxDQX54WfKgJhhVhDm4a05z3Rz1j6Oocl1QHzeyQ,518
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml,sha256=3kFdmXZWx-CiEBoT694Cqul78wR1tIYna6IET0yF7po,13728
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml,sha256=93LJk6uUYI7HtLVBZhWH_G_J1IWZX22a1fPCmCiwu8g,13804
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml,sha256=YE44s31kI79j5ypud4RS69sSDGFH1ROHNNAkyWxZ4jk,576
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml,sha256=X5vtxQ0pvLy6FSrooVmt90j4C4YNxtkSKzbPDOb4uB8,2615
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml,sha256=ZpQ33JhdBxkoUNBV9kB5f07p8DpqgvJ3-Mp0SzLnJ6w,2380
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default,sha256=dy2HMaFVI72-sVvQdxMioXJnd8Kz5vAkdEJzQJoz8GU,3145
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project,sha256=dVxvb9Dji7FKDuh-60NKiy_UfHigc5LPyL901BSBrPU,2250
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/project.yaml,sha256=3tNtVcoIug5LNZoZsUpjm_YRCZQMAKzYWNL9ZdjkPC8,495
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default,sha256=nqNpC44SfFcmlbfHIPyjRBHyFT57_bpzd5mpBo-7ShE,3300
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project,sha256=Bq17dg5AfDvr9zRCFL0v2_wJPCeWOOdWly6Y6GocplE,2113
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/project.yaml,sha256=PQZ87F25DbcQS_AcaT-uVmcdclkVnM3v-Te7onivXc8,655
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/pyproject.toml,sha256=RnvMmtD40v3rju1HoIOX7pQfVHUKPptxaVDoZxuF7oU,107
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/run_alembic.sh,sha256=VcrDFPAGlrxXtn4N8RcPhI90uZ8shDrGowALuwx8gnM,235
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/setup.cfg,sha256=_Oj7PwahkYUSneIrjn2mXwo0m6b27dTCZhAwWXFWqUA,221
@@ -135,18 +135,18 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/multi-t
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.py,sha256=RXBFB9xc-SJ6D2UVHjooGoWbMvROiMTOxi2evFnkAtE,2961
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl,sha256=EdoI4sfBw1Neq4Qwx7kSHCK_wcUCyBKNhJSclYKVW4o,6197
-c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json,sha256=x3FFn3b67GPGCsjg36iGXCudjaTSfwGHcwHS6HHVpPQ,539
+c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json,sha256=SoXjnW7KpNpm1fSGDEIZrr-_LbR7yiYmXKbdeXatflw,617
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml,sha256=8tPCziX4Wh6a2EOdjpLtvyqNtKcI7Rtjo8-bLQO8_Gg,2741
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt,sha256=yjofPpXBpDCHGojIkEqshwL7-vxQoVYKiBZMFURbnMs,11429
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py,sha256=FNZI6uMsZttVpWi0_TEmBgV6MjQDUmE5ar9be3FFkV8,1794
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/.CONST_vars.yaml.swp,sha256=ZaB6IqVy0WDyGXRP7VQf8_LL_wjccSdthJtdIzw8FmE,16384
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_config-schema.yaml,sha256=yGKWjxc_U50dOpgknUwdAUHg1HK0Txn4fhEC1KeKg9c,23603
-c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml,sha256=Vey5px6ROX7beoRhV5a1YHcUekF5EQxhYmd3-CySCOE,48922
+c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml,sha256=-2mKeRBafv55R0NREh6AeAEOmLEfZF5ciDy6u1NUeHg,48944
 c2cgeoportal_geoportal/scripts/__init__.py,sha256=hHwjhQaM_T2EaupeFIyjl0N67Bcl3M99UMcCdYAjQlQ,2929
 c2cgeoportal_geoportal/scripts/c2cupgrade.py,sha256=oWgl5ngJaUVXDKJqJ33aZB8ET_XcFxsYZb18KqO4-yo,36825
 c2cgeoportal_geoportal/scripts/create_demo_theme.py,sha256=-SL-fvAPjgiJZEKYcbhXsZm713txhtWQB18X231k6xQ,3263
 c2cgeoportal_geoportal/scripts/manage_users.py,sha256=Ih3X_V_xUw59Ums4a1x6qQQtz9VtE7PaxAj-tiZIOPg,5586
-c2cgeoportal_geoportal/scripts/pcreate.py,sha256=AcBIGBQJCvr5fch6HbseKuOCBEpuwr_3w6uokuREZJM,10984
+c2cgeoportal_geoportal/scripts/pcreate.py,sha256=xU87K_JYwFE6U4zEGjHvqNj2iiSuAhPkfWMpI576mZ8,11245
 c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=Tx1jUfDUwNtwZ5TCyfpldZIbIkzZiQ3dq-kv_YQ9yFE,13737
 c2cgeoportal_geoportal/scripts/urllogin.py,sha256=qGOOvx2ZN3qnENGzo8NScRqfFC06l1yc48vU6Qx3MBo,3319
 c2cgeoportal_geoportal/templates/login.html,sha256=Jy8CUw2KrSviePknsvWJLDqCUXam-vPhnMUv7UcD4Pc,2475
@@ -187,8 +187,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.9rc93.dist-info/METADATA,sha256=CfbeGfl7QFzaJ99o8kOTLV07VcQFu0e3azcUCW4b0RQ,1886
-c2cgeoportal_geoportal-2.9rc93.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc93.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc93.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc93.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc95.dist-info/METADATA,sha256=J_c6Fjs_UxYwucOSfVbyZTYmFmVfQltl1OCLL0EAi5I,1886
+c2cgeoportal_geoportal-2.9rc95.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc95.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc95.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc95.dist-info/RECORD,,