PyPI - c2cgeoportal-geoportal - Versions diffs - 2.6.0__py2.py3-none-any.whl → 2.7.1.156__py2.py3-none-any.whl - Mend

c2cgeoportal-geoportal 2.6.0py2.py3-none-any.whl → 2.7.1.156py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (212) hide show

c2cgeoportal_geoportal/scripts/urllogin.py CHANGED Viewed

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2012-2021, Camptocamp SA
+# Copyright (c) 2012-2024, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -32,41 +30,51 @@ import binascii
 import json
 import sys
 import time
+from typing import cast
 from Crypto.Cipher import AES  # nosec
+from Crypto.Cipher.ChaCha20_Poly1305 import ChaCha20Poly1305Cipher  # nosec
 from c2cgeoportal_geoportal.scripts import fill_arguments, get_appsettings
-def create_token(aeskey, user, password, valid):
+def create_token(aeskey: str, user: str, password: str, valid: bool) -> str:
+    """Create the authenticated URL token."""
     auth = {"u": user, "p": password, "t": int(time.time()) + valid * 3600 * 24}
     if aeskey is None:
         print("urllogin is not configured")
         sys.exit(1)
-    cipher = AES.new(aeskey.encode("ascii"), AES.MODE_EAX)
+    cipher = cast(ChaCha20Poly1305Cipher, AES.new(aeskey.encode("ascii"), AES.MODE_EAX))
     data = json.dumps(auth)
     mod_len = len(data) % 16
     if mod_len != 0:
         data += "".join([" " for i in range(16 - mod_len)])
-    ciphertext, tag = cipher.encrypt_and_digest(data.encode("utf-8"))  # type: ignore
-    return binascii.hexlify(cipher.nonce + tag + ciphertext).decode("ascii")  # type: ignore
+    ciphertext, tag = cipher.encrypt_and_digest(data.encode("utf-8"))
+    return binascii.hexlify(cipher.nonce + tag + ciphertext).decode("ascii")
+def get_argparser() -> argparse.ArgumentParser:
+    """Get the argument parser for this script."""
-def main():
     parser = argparse.ArgumentParser(description="Generate an auth token")
-    fill_arguments(parser)
+    fill_arguments(parser, use_attribute=True)
     parser.add_argument("user", help="The username")
     parser.add_argument("password", help="The password")
     parser.add_argument("valid", type=int, default=1, nargs="?", help="Is valid for, in days")
+    return parser
+def main() -> None:
+    """Run the command."""
-    args = parser.parse_args()
+    args = get_argparser().parse_args()
     settings = get_appsettings(args)
     urllogin = settings.get("urllogin", {})
     aeskey = urllogin.get("aes_key")
     auth_enc = create_token(aeskey, args.user, args.password, args.valid)
-    print(("Use: auth={}".format(auth_enc)))
+    print(f"Use: auth={auth_enc}")
 if __name__ == "__main__":

c2cgeoportal_geoportal/templates/login.html CHANGED Viewed

@@ -1,86 +1,90 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 <html lang="${lang}">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="Content-Language" content="${lang}" />
-        <title>${_('Login to Geoportal Application')}</title>
-        <style>
-            body {
-                background: #444444;
-                font-family: Helvetica, Arial, sans-serif;
-            }
-            * {
-                padding: 0;
-                margin: 0;
-            }
-            div#content {
-                background: #F5F5EF;
-                padding: 20px 30px;
-                width: 330px;
-                margin: 100px auto auto auto;
-                -webkit-border-radius: 10px;
-                border-radius: 10px;
-            }
-            td.field {
-                padding-top: 20px;
-            }
-            td.field p {
-                font-weight: bold;
-                color: #444444;
-                font-size: 80%;
-                margin-bottom: 3px;
-            }
-            td.field input {
-                -webkit-border-radius: 2px;
-                border-radius: 2px;
-                border: solid 1px #444444;
-                padding: 3px 6px;
-                font-size: 110%;
-                width: 250px;
-            }
-            td.buttons {
-                padding-top: 25px;
-                padding-bottom: 20px;
-                text-align: right;
-            }
-            td.buttons input {
-                padding: 1px 6px;
-                font-weight: bold;
-                color: #444444;
-            }
-        </style>
-    </head>
-    <body>
-        <div id="content">
-            <form method="POST" id="loginForm" action="${request.route_url('login', _query=login_params)}">
-                <table style="margin-left: auto; margin-right: auto;">
-                    <tbody>
-                        <tr>
-                            <td class="field"><p>
-                                <label for="email">${_('Username')}</label></p>
-                                <input id="login" name="login" type="text">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="field"><p>
-                                <label for="password">${_('Password')}</label></p>
-                                <input id="password" name="password" type="password">
-                            </td>
-                        </tr>
-% if two_fa:
-                        <tr>
-                            <td class="field">
-                                <p><label for="otp">${_('Authentication code')}</label></p>
-                                <input id="otp" name="otp" type="text" autocomplete="off">
-                            </td>
-                        </tr>
-% endif
-                        <tr>
-                            <td class="buttons"><input tabindex="4" value="${_('Login')}" type="submit"></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </form>
-        </div>
-    </body>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="Content-Language" content="${lang}" />
+    <title>${_('Login to Geoportal Application')}</title>
+    <style>
+      body {
+        background: #444444;
+        font-family: Helvetica, Arial, sans-serif;
+      }
+      * {
+        padding: 0;
+        margin: 0;
+      }
+      div#content {
+        background: #f5f5ef;
+        padding: 20px 30px;
+        width: 330px;
+        margin: 100px auto auto auto;
+        -webkit-border-radius: 10px;
+        border-radius: 10px;
+      }
+      td.field {
+        padding-top: 20px;
+      }
+      td.field p {
+        font-weight: bold;
+        color: #444444;
+        font-size: 80%;
+        margin-bottom: 3px;
+      }
+      td.field input {
+        -webkit-border-radius: 2px;
+        border-radius: 2px;
+        border: solid 1px #444444;
+        padding: 3px 6px;
+        font-size: 110%;
+        width: 250px;
+      }
+      td.buttons {
+        padding-top: 25px;
+        padding-bottom: 20px;
+        text-align: right;
+      }
+      td.buttons input {
+        padding: 1px 6px;
+        font-weight: bold;
+        color: #444444;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="content">
+      <form method="POST" id="loginForm" action="${request.route_url('login', _query=login_params)}">
+        <table style="margin-left: auto; margin-right: auto">
+          <tbody>
+            <tr>
+              <td class="field">
+                <p>
+                  <label for="email">${_('Username')}</label>
+                </p>
+                <input id="login" name="login" type="text" />
+              </td>
+            </tr>
+            <tr>
+              <td class="field">
+                <p>
+                  <label for="password">${_('Password')}</label>
+                </p>
+                <input id="password" name="password" type="password" />
+              </td>
+            </tr>
+            % if two_fa:
+            <tr>
+              <td class="field">
+                <p><label for="otp">${_('Authentication code')}</label></p>
+                <input id="otp" name="otp" type="text" autocomplete="off" />
+              </td>
+            </tr>
+            % endif
+            <tr>
+              <td class="buttons"><input tabindex="4" value="${_('Login')}" type="submit" /></td>
+            </tr>
+          </tbody>
+        </table>
+      </form>
+    </div>
+  </body>
 </html>

c2cgeoportal_geoportal/templates/notlogin.html CHANGED Viewed

@@ -1,62 +1,62 @@
 <!DOCTYPE html>
 <html lang="${lang}">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <meta name="Content-Language" content="${lang}" />
-        <title>${_('Login to Geoportal Application')}</title>
-        <style>
-            body {
-                background: #444444;
-                font-family: Helvetica, Arial, sans-serif;
-            }
-            * {
-                padding: 0;
-                margin: 0;
-            }
-            div#content {
-                background: #f5f5ef;
-                padding: 20px 30px;
-                width: 330px;
-                margin: 100px auto auto auto;
-                -webkit-border-radius: 10px;
-                border-radius: 10px;
-            }
-            td.field {
-                padding-top: 20px;
-            }
-            td.field p {
-                font-weight: bold;
-                color: #444444;
-                font-size: 80%;
-                margin-bottom: 3px;
-            }
-            td.field input {
-                -webkit-border-radius: 2px;
-                border-radius: 2px;
-                border: solid 1px #444444;
-                padding: 3px 6px;
-                font-size: 110%;
-                width: 250px;
-            }
-            td.buttons {
-                padding-top: 25px;
-                padding-bottom: 20px;
-                text-align: right;
-            }
-            td.buttons input {
-                padding: 1px 6px;
-                font-weight: bold;
-                color: #444444;
-            }
-        </style>
-    </head>
-    <body>
-        <div id="content">
-            <p>
-                ${_('The user is not correctly initialized you should login in the main application and try '
-                'again.')}
-            </p>
-            <p><a href="${request.route_url('base')}">${_('Main application')}</a></p>
-        </div>
-    </body>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="Content-Language" content="${lang}" />
+    <title>${_('Login to Geoportal Application')}</title>
+    <style>
+      body {
+        background: #444444;
+        font-family: Helvetica, Arial, sans-serif;
+      }
+      * {
+        padding: 0;
+        margin: 0;
+      }
+      div#content {
+        background: #f5f5ef;
+        padding: 20px 30px;
+        width: 330px;
+        margin: 100px auto auto auto;
+        -webkit-border-radius: 10px;
+        border-radius: 10px;
+      }
+      td.field {
+        padding-top: 20px;
+      }
+      td.field p {
+        font-weight: bold;
+        color: #444444;
+        font-size: 80%;
+        margin-bottom: 3px;
+      }
+      td.field input {
+        -webkit-border-radius: 2px;
+        border-radius: 2px;
+        border: solid 1px #444444;
+        padding: 3px 6px;
+        font-size: 110%;
+        width: 250px;
+      }
+      td.buttons {
+        padding-top: 25px;
+        padding-bottom: 20px;
+        text-align: right;
+      }
+      td.buttons input {
+        padding: 1px 6px;
+        font-weight: bold;
+        color: #444444;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="content">
+      <p>
+        ${_('The user is not correctly initialized you should login in the main application and try '
+        'again.')}
+      </p>
+      <p><a href="${request.route_url('base')}">${_('Main application')}</a></p>
+    </div>
+  </body>
 </html>

c2cgeoportal_geoportal/templates/testi18n.html CHANGED Viewed

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="UTF-8">
+  <head>
+    <meta charset="UTF-8" />
     <title>${title}</title>
-</head>
-<body>
+  </head>
+  <body>
     <h1>${title}</h1>
     <p>${_('my translation test')}</p>
-</body>
+  </body>
 </html>

c2cgeoportal_geoportal/views/__init__.py CHANGED Viewed

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011-2020, Camptocamp SA
+# Copyright (c) 2011-2021, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -27,17 +27,36 @@
 # of the authors and should not be interpreted as representing official policies,
 # either expressed or implied, of the FreeBSD Project.
+from typing import Dict, List
+import pyramid.config
+import pyramid.request
 from pyramid.httpexceptions import HTTPFound
-def add_ending_slash(request):
+def add_ending_slash(request: pyramid.request.Request) -> HTTPFound:
+    """Add an ending slash view."""
     return HTTPFound(location=request.path + "/")
-def add_redirect(config, name, from_, to):
-    def redirect_view(request):
+def add_redirect(config: pyramid.config.Configurator, name: str, from_: str, to: str) -> None:
+    """Add a redirect view."""
+    def redirect_view(request: pyramid.request.Request) -> HTTPFound:
         return HTTPFound(location=request.route_url(to))
     config.add_route(name, from_, request_method="GET")
     config.add_view(redirect_view, route_name=name)
+def restrict_headers(headers: Dict[str, str], whitelist: List[str], blacklist: List[str]) -> Dict[str, str]:
+    """
+    Filter headers with a whitelist then a blacklist.
+    Some default pyramid headers will be added back by pyramid.
+    """
+    if len(whitelist) > 0:
+        headers = {key: value for key, value in headers.items() if key in whitelist}
+    headers = {key: value for key, value in headers.items() if key not in blacklist}
+    return headers

c2cgeoportal_geoportal/views/dev.py CHANGED Viewed

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2011-2020, Camptocamp SA
+# Copyright (c) 2011-2021, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -31,25 +29,29 @@
 import logging
 import re
+import pyramid.request
+import pyramid.response
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
+from c2cgeoportal_commons.lib.url import Url
 from c2cgeoportal_geoportal.views.proxy import Proxy
 logger = logging.getLogger(__name__)
 class Dev(Proxy):
+    """All the development views."""
     THEME_RE = re.compile(r"/theme/.*$")
-    def __init__(self, request):
+    def __init__(self, request: pyramid.request.Request):
         super().__init__(request)
         self.dev_url = self.request.registry.settings["devserver_url"]
-    @view_config(route_name="dev")
-    def dev(self):
+    @view_config(route_name="dev")  # type: ignore
+    def dev(self) -> pyramid.response.Response:
         path = self.THEME_RE.sub("", self.request.path_info)
         if self.request.path.endswith("/dynamic.js"):
             return HTTPFound(location=self.request.route_url("dynamic", _query=self.request.params))
-        return self._proxy_response("dev", "{}/{}".format(self.dev_url.rstrip("/"), path.lstrip("/")))
+        return self._proxy_response("dev", Url(f"{self.dev_url.rstrip('/')}/{path.lstrip('/')}"))

c2cgeoportal_geoportal/views/dynamic.py CHANGED Viewed

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018-2021, Camptocamp SA
+# Copyright (c) 2018-2025, Camptocamp SA
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
@@ -30,8 +28,9 @@
 import re
 import urllib.parse
-from typing import Dict, List, Union
+from typing import Any, Dict, List, Union, cast
+import pyramid.request
 from pyramid.httpexceptions import HTTPNotFound
 from pyramid.view import view_config
 from sqlalchemy import func
@@ -39,22 +38,25 @@ from sqlalchemy import func
 from c2cgeoportal_commons import models
 from c2cgeoportal_commons.models import main
 from c2cgeoportal_geoportal.lib.cacheversion import get_cache_version
-from c2cgeoportal_geoportal.lib.caching import NO_CACHE, get_region, set_common_headers
+from c2cgeoportal_geoportal.lib.caching import get_region
+from c2cgeoportal_geoportal.lib.common_headers import Cache, set_common_headers
 CACHE_REGION = get_region("std")
 class DynamicView:
-    def __init__(self, request):
+    """The dynamic vies that provide the configuration of the client application."""
+    def __init__(self, request: pyramid.request.Request):
         self.request = request
         self.settings = request.registry.settings
         self.interfaces_config = self.settings["interfaces_config"]
-    def get(self, value, interface):
-        return self.interfaces_config.get(interface, {}).get(value, {})
+    def get(self, value: Dict[str, Any], interface: str) -> Dict[str, Any]:
+        return cast(Dict[str, Any], self.interfaces_config.get(interface, {}).get(value, {}))
-    @CACHE_REGION.cache_on_arguments()
-    def _fulltextsearch_groups(self):  # pylint: disable=no-self-use
+    @CACHE_REGION.cache_on_arguments()  # type: ignore
+    def _fulltextsearch_groups(self) -> List[str]:  # pylint: disable=no-self-use
         return [
             group[0]
             for group in models.DBSession.query(func.distinct(main.FullTextSearch.layer_name))
@@ -62,11 +64,30 @@ class DynamicView:
             .all()
         ]
-    def _interface(self, interface_config, interface_name, dynamic):
+    def _interface(
+        self,
+        interface_config: Dict[str, Any],
+        interface_name: str,
+        original_interface_name: str,
+        dynamic: Dict[str, Any],
+    ) -> Dict[str, Any]:
+        """
+        Get the interface configuration.
+        Arguments:
+            interface_config: Current interface configuration
+            interface_name: Interface name (we use in the configuration)
+            original_interface_name: Original interface name (directly for the query string)
+            dynamic: The values that's dynamically generated
+        """
         if "extends" in interface_config:
             constants = self._interface(
-                self.interfaces_config[interface_config["extends"]], interface_name, dynamic
+                self.interfaces_config[interface_config["extends"]],
+                interface_name,
+                original_interface_name,
+                dynamic,
             )
         else:
             constants = {}
@@ -87,7 +108,7 @@ class DynamicView:
         )
         for constant, config in interface_config.get("routes", {}).items():
-            route_name = interface_name if config.get("currentInterface", False) else config["name"]
+            route_name = original_interface_name if config.get("currentInterface", False) else config["name"]
             params: Dict[str, str] = {}
             params.update(config.get("params", {}))
             for name, dyn in config.get("dynamic_params", {}).items():
@@ -98,14 +119,29 @@ class DynamicView:
         return constants
-    @view_config(route_name="dynamic", renderer="json")
-    def dynamic(self):
-        interface_name = self.request.get_organization_interface(self.request.params.get("interface"))
+    @view_config(route_name="dynamic", renderer="json")  # type: ignore
+    def dynamic(self) -> Dict[str, Any]:
+        self.request.response.headers["Vary"] = "Host"
+        original_interface_name = self.request.params.get("interface")
+        interface_name = self.request.get_organization_interface(original_interface_name)
         if interface_name not in self.interfaces_config:
             raise HTTPNotFound("Interface {} doesn't exists in the 'interfaces_config'.")
         interface_config = self.interfaces_config[interface_name]
+        lang_urls_suffix = interface_config.get("lang_urls_suffix", "")
+        i18next_configuration = self.settings.get("i18next", {})
+        i18next_configuration.setdefault("backend", {})
+        if "loadPath" not in i18next_configuration["backend"]:
+            path: List[str] = [
+                self.request.route_url("base").rstrip("/"),
+                "static-{{ns}}",
+                get_cache_version(),
+                "locales",
+                "{{lng}}.json",
+            ]
+            i18next_configuration["backend"]["loadPath"] = "/".join(path)
         dynamic = {
             "interface": interface_name,
@@ -113,14 +149,15 @@ class DynamicView:
             "two_factor": self.request.registry.settings.get("authentication", {}).get("two_factor", False),
             "lang_urls": {
                 lang: self.request.static_url(
-                    "/etc/geomapfish/static/{lang}.json".format(lang=lang),
+                    f"/etc/geomapfish/static/{lang}{lang_urls_suffix}.json",
                 )
                 for lang in self.request.registry.settings["available_locale_names"]
             },
+            "i18next_configuration": i18next_configuration,
             "fulltextsearch_groups": self._fulltextsearch_groups(),
         }
-        constants = self._interface(interface_config, interface_name, dynamic)
+        constants = self._interface(interface_config, interface_name, original_interface_name, dynamic)
         do_redirect = False
         url = None
@@ -159,5 +196,5 @@ class DynamicView:
                 else:
                     constants["redirectUrl"] = no_redirect_url
-        set_common_headers(self.request, "dynamic", NO_CACHE)
+        set_common_headers(self.request, "dynamic", Cache.PUBLIC_NO)
         return {"constants": constants, "doRedirect": do_redirect, "redirectUrl": url}

c2cgeoportal-geoportal 2.6.0__py2.py3-none-any.whl → 2.7.1.156__py2.py3-none-any.whl

c2cgeoportal-geoportal 2.6.0py2.py3-none-any.whl → 2.7.1.156py2.py3-none-any.whl