c2cgeoportal-geoportal 2.9rc83__py3-none-any.whl → 2.9.0.352__py3-none-any.whl

c2cgeoportal_geoportal/scripts/theme2fts.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2023, Camptocamp SA
+# Copyright (c) 2014-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,13 +29,14 @@
 import gettext
 import os
 import sys
+import time
 from argparse import ArgumentParser, Namespace
 from collections.abc import Iterator
 from typing import TYPE_CHECKING, Any, Optional
 
 import pyramid.config
+import sqlalchemy.orm
 import transaction
-from sqlalchemy import func
 from sqlalchemy.orm.session import Session
 
 from c2cgeoportal_geoportal.lib.bashcolor import Color, colorize
@@ -89,6 +90,11 @@ def get_argparser() -> ArgumentParser:
         "--no-layers", action="store_false", dest="layers", help="do not import the layers (tree leaf)"
     )
     parser.add_argument("--package", help="the application package")
+    parser.add_argument(
+        "--stats",
+        action="store_true",
+        help="Print out statistics information",
+    )
     fill_arguments(parser)
     return parser
 
@@ -130,17 +136,8 @@ class Import:
             else:
                 raise KeyError(KeyError(msg))
 
-        # must be done only once we have loaded the project config
-        from c2cgeoportal_commons.models.main import (  # pylint: disable=import-outside-toplevel
-            FullTextSearch,
-            Interface,
-            Role,
-            Theme,
-        )
-
-        self.session = session
-        self.session.execute(FullTextSearch.__table__.delete().where(FullTextSearch.from_theme))
-
+        print("Loading translations")
+        start_time = time.time()
         self._: dict[str, gettext.NullTranslations] = {}
         for lang in self.languages:
             try:
@@ -152,13 +149,86 @@ class Import:
             except OSError as e:
                 self._[lang] = gettext.NullTranslations()
                 print(f"Warning: {e} (language: {lang})")
+        if self.options.stats:
+            print(
+                f"Translations loaded in {time.time() - start_time:.2f} seconds "
+                f"({len(self.languages)} languages)"
+            )
+
+        print("Loading the database")
+        # Must be done only once we have loaded the project config
+        from c2cgeoportal_commons.models.main import (  # pylint: disable=import-outside-toplevel
+            FullTextSearch,
+            Interface,
+            LayerGroup,
+            LayerWMS,
+            LayerWMTS,
+            Role,
+            Theme,
+        )
 
+        self.session = session
+        if self.options.stats:
+            print(
+                f"Session loaded in {time.time() - start_time:.2f} seconds "
+                f"({len(self.languages)} languages)"
+            )
+
+        print("Delete the full-text search table")
+        start_time = time.time()
+        self.session.execute(FullTextSearch.__table__.delete().where(FullTextSearch.from_theme))
+        if self.options.stats:
+            print(
+                f"Deleted old entries in the full-text search table in "
+                f"{time.time() - start_time:.2f} seconds"
+            )
+
+        print("Create cache")
+        start_time = time.time()
+        self._layerswms_cache = (
+            self.session.query(LayerWMS).options(sqlalchemy.orm.subqueryload(LayerWMS.metadatas)).all()
+        )
+        self._layerswmts_cache = (
+            self.session.query(LayerWMTS).options(sqlalchemy.orm.subqueryload(LayerWMTS.metadatas)).all()
+        )
+        self._layergroup_cache = (
+            self.session.query(LayerGroup)
+            .options(
+                sqlalchemy.orm.subqueryload(LayerGroup.children_relation),
+                sqlalchemy.orm.subqueryload(LayerWMS.metadatas),
+            )
+            .all()
+        )
+        all_themes = (
+            self.session.query(Theme)
+            .options(
+                sqlalchemy.orm.subqueryload(Theme.children_relation),
+                sqlalchemy.orm.subqueryload(LayerWMS.metadatas),
+            )
+            .all()
+        )
+        if self.options.stats:
+            print(
+                f"Cache created in {time.time() - start_time:.2f} seconds "
+                f"({len(self._layerswms_cache)} layerswms, "
+                f"{len(self._layerswmts_cache)} layerswmts, "
+                f"{len(self._layergroup_cache)} layergroups, "
+                f"{len(all_themes)} themes)"
+            )
+
+        print("Loading interfaces")
+        start_time = time.time()
         query = self.session.query(Interface)
         if options.interfaces is not None:
             query = query.filter(Interface.name.in_(options.interfaces))
         else:
             query = query.filter(Interface.name.notin_(options.exclude_interfaces))
         self.interfaces = query.all()
+        if self.options.stats:
+            print(f"Loaded {len(self.interfaces)} interfaces in " f"{time.time() - start_time:.2f} seconds")
+
+        print("Collecting data")
+        start_time = time.time()
 
         self.public_theme: dict[int, list[int]] = {}
         self.public_group: dict[int, list[int]] = {}
@@ -166,13 +236,45 @@ class Import:
             self.public_theme[interface.id] = []
             self.public_group[interface.id] = []
 
+        self.full_text_search: list[dict[str, Any]] = []
+
         for theme in self.session.query(Theme).filter_by(public=True).all():
             self._add_theme(theme)
 
         for role in self.session.query(Role).all():
-            for theme in self.session.query(Theme).all():
+            for theme in all_themes:
                 self._add_theme(theme, role)
 
+        if self.options.stats:
+            print(
+                f"Collected {len(self.full_text_search)} entries in "
+                f"{time.time() - start_time:.2f} seconds"
+            )
+
+        print(f"Starting to fill the full-text search table with {len(self.full_text_search)} entries")
+        start_time = time.time()
+        self.session.execute(
+            sqlalchemy.insert(FullTextSearch).values(
+                {
+                    "label": sqlalchemy.text(":label"),
+                    "role_id": sqlalchemy.text(":role_id"),
+                    "interface_id": sqlalchemy.text(":interface_id"),
+                    "lang": sqlalchemy.text(":lang"),
+                    "public": sqlalchemy.text(":public"),
+                    "ts": sqlalchemy.text("to_tsvector(:fts_lang, :fts_content)"),
+                    "actions": sqlalchemy.text("to_json(:actions)"),
+                    "from_theme": sqlalchemy.text(":from_theme"),
+                }
+            ),
+            self.full_text_search,
+        )
+        if self.options.stats:
+            print(
+                f"Filled the full-text search table in "
+                f"{time.time() - start_time:.2f} seconds "
+                f"({len(self.full_text_search)} entries)"
+            )
+
     def _add_fts(
         self,
         item: "c2cgeoportal_commons.models.main.TreeItem",
@@ -180,8 +282,6 @@ class Import:
         action: str,
         role: Optional["c2cgeoportal_commons.models.main.Role"],
     ) -> None:
-        from c2cgeoportal_commons.models.main import FullTextSearch  # pylint: disable=import-outside-toplevel
-
         key = (
             item.name if self.options.name else item.id,
             interface.id,
@@ -190,22 +290,25 @@ class Import:
         if key not in self.imported:
             self.imported.add(key)
             for lang in self.languages:
-                fts = FullTextSearch()
-                fts.label = self._render_label(item, lang)
-                fts.role = role
-                fts.interface = interface
-                fts.lang = lang
-                fts.public = role is None
-                fts.ts = func.to_tsvector(
-                    self.fts_languages[lang],
-                    " ".join(
-                        [self.fts_normalizer(self._[lang].gettext(item.name))]
-                        + [v.strip() for m in item.get_metadata("searchAlias") for v in m.value.split(",")]
-                    ),
+                content = " ".join(
+                    [
+                        self.fts_normalizer(self._[lang].gettext(item.name)),
+                        *[v.strip() for m in item.get_metadata("searchAlias") for v in m.value.split(",")],
+                    ]
+                )
+                self.full_text_search.append(
+                    {
+                        "label": self._render_label(item, lang),
+                        "role_id": role.id if role is not None else None,
+                        "interface_id": interface.id,
+                        "lang": lang,
+                        "public": role is None,
+                        "fts_lang": self.fts_languages[lang],
+                        "fts_content": content,
+                        "actions": [{"action": action, "data": item.name}],
+                        "from_theme": True,
+                    }
                 )
-                fts.actions = [{"action": action, "data": item.name}]
-                fts.from_theme = True
-                self.session.add(fts)
 
     def _add_theme(
         self,
@@ -268,8 +371,13 @@ class Import:
 
     @staticmethod
     def _layer_visible(
-        layer: "c2cgeoportal_commons.models.main.Layer", role: "c2cgeoportal_commons.models.main.Role"
+        layer: "c2cgeoportal_commons.models.main.Layer",
+        role: Optional["c2cgeoportal_commons.models.main.Role"],
     ) -> bool:
+        if layer.public:
+            return True
+        if role is None:
+            return False
         for restrictionarea in layer.restrictionareas:
             if role in restrictionarea.roles:
                 return True
@@ -281,10 +389,7 @@ class Import:
         interface: "c2cgeoportal_commons.models.main.Interface",
         role: Optional["c2cgeoportal_commons.models.main.Role"],
     ) -> bool:
-        if role is None:
-            fill = layer.public and interface in layer.interfaces
-        else:
-            fill = interface in layer.interfaces and not layer.public and self._layer_visible(layer, role)
+        fill = interface in layer.interfaces and self._layer_visible(layer, role)
 
         if fill and self.options.layers:
             self._add_fts(layer, interface, "add_layer", role)

c2cgeoportal_geoportal/scripts/urllogin.py

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

c2cgeoportal_geoportal/views/__init__.py

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

c2cgeoportal_geoportal/views/dev.py

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

c2cgeoportal_geoportal/views/entry.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -148,9 +148,11 @@ def canvas_view(request: pyramid.request.Request, interface_config: dict[str, An
 def custom_view(
     request: pyramid.request.Request, interface_config: dict[str, Any]
 ) -> pyramid.response.Response:
-    """Get view used as entry point of a canvas interface."""
+    """Get view used as entry point of a canvas or custom interface."""
 
     set_common_headers(request, "index", Cache.PUBLIC_NO, content_type="text/html")
+    # Force urllogin to be converted to cookie when requesting the main HTML page
+    request.user  # noqa
 
     html_filename = interface_config.get("html_filename", f"{interface_config['name']}.html")
     if not html_filename.startswith("/"):

c2cgeoportal_geoportal/views/fulltextsearch.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,7 @@ from sqlalchemy import ColumnElement, and_, desc, func, or_
 from c2cgeoportal_commons.models import DBSession
 from c2cgeoportal_commons.models.main import FullTextSearch, Interface
 from c2cgeoportal_geoportal import locale_negotiator
+from c2cgeoportal_geoportal.lib import get_roles_id
 from c2cgeoportal_geoportal.lib.caching import get_region
 from c2cgeoportal_geoportal.lib.common_headers import Cache, set_common_headers
 from c2cgeoportal_geoportal.lib.fulltextsearch import Normalize
@@ -98,16 +99,21 @@ class FullTextSearchView:
         ]
         terms_ts = "&".join(w + ":*" for w in terms_array if w != "")
         _filter: ColumnElement[bool] = FullTextSearch.ts.op("@@")(func.to_tsquery(language, terms_ts))
-
         if self.request.user is None:
-            _filter = and_(_filter, FullTextSearch.public.is_(True))
+            _filter = and_(
+                _filter,
+                or_(
+                    FullTextSearch.public.is_(True),
+                    FullTextSearch.role_id.in_(get_roles_id(self.request)),
+                ),
+            )
         else:
             _filter = and_(
                 _filter,
                 or_(
                     FullTextSearch.public.is_(True),
                     FullTextSearch.role_id.is_(None),
-                    FullTextSearch.role_id.in_([r.id for r in self.request.user.roles]),
+                    FullTextSearch.role_id.in_(get_roles_id(self.request)),
                 ),
             )
 

c2cgeoportal_geoportal/views/geometry_processing.py

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

c2cgeoportal_geoportal/views/i18n.py

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

c2cgeoportal_geoportal/views/layers.py

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

c2cgeoportal_geoportal/views/login.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@ class Login:
 
     def _functionality(self) -> dict[str, list[str | int | float | bool | list[Any] | dict[str, Any]]]:
         functionality = {}
+
         for func_ in get_setting(self.settings, ("functionalities", "available_in_templates"), []):
             functionality[func_] = get_functionality(func_, self.request, is_intranet(self.request))
         return functionality
@@ -274,7 +275,7 @@ class Login:
                 f"is not the current host '{self.request.host}' "
                 f"or part of allowed_hosts: {', '.join(allowed_hosts)}"
             )
-            _LOG.debug(message)
+            _LOG.error(message)
             return HTTPBadRequest(message)
 
         if status == 302:
@@ -295,10 +296,11 @@ class Login:
         if self.authentication_settings.get("openid_connect", {}).get("enabled", False):
             client = oidc.get_oidc_client(self.request, self.request.host)
             if hasattr(client, "revoke_token"):
-                user_info = json.loads(self.request.authenticated_userid)
-                client.revoke_token(user_info["access_token"])
-                if user_info.get("refresh_token") is not None:
-                    client.revoke_token(user_info["refresh_token"])
+                access_token = self.request.cookies.get("access_token")
+                client.revoke_token(access_token)
+                refresh_token = self.request.cookies.get("refresh_token")
+                if refresh_token is not None:
+                    client.revoke_token(refresh_token)
 
         headers = forget(self.request)
 
@@ -330,7 +332,8 @@ class Login:
         if user is not None:
             result.update(
                 {
-                    "username": user.display_name,
+                    "username": user.username,
+                    "display_name": user.display_name,
                     "email": user.email,
                     "roles": [{"name": r.name, "id": r.id} for r in user.roles],
                 }
@@ -375,6 +378,10 @@ class Login:
                 _LOG.info("The login '%s' does not exist.", login)
                 raise HTTPUnauthorized("See server logs for details")
 
+            if user.deactivated:
+                _LOG.info("The login '%s' is deactivated.", login)
+                raise HTTPUnauthorized("See server logs for details")
+
             if self.two_factor_auth:
                 if not self._validate_2fa_totp(user, otp):
                     _LOG.info("The second factor is wrong for user '%s'.", login)
@@ -638,6 +645,9 @@ class Login:
         client = oidc.get_oidc_client(self.request, self.request.host)
         assert models.DBSession is not None
 
+        if "code_verifier" not in self.request.cookies or "code_challenge" not in self.request.cookies:
+            raise HTTPBadRequest("Missing code verifier or code challenge cookies.")
+
         token_response = client.authorization_code_flow.handle_authentication_result(
             "?" + urllib.parse.urlencode(self.request.params),
             code_verifier=self.request.cookies["code_verifier"],
@@ -670,7 +680,7 @@ class Login:
                     # TODO respect the user interface...
                     json.dumps(
                         {
-                            "username": user.display_name,
+                            "username": user.username,
                             "email": user.email,
                             "is_intranet": is_intranet(self.request),
                             "functionalities": self._functionality(),

c2cgeoportal_geoportal/views/mapserverproxy.py

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

c2cgeoportal_geoportal/views/memory.py

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

c2cgeoportal_geoportal/views/ogcproxy.py

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

c2cgeoportal_geoportal/views/pdfreport.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2025, 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-2024, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_geoportal/views/profile.py

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

c2cgeoportal_geoportal/views/raster.py

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

c2cgeoportal_geoportal/views/resourceproxy.py

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

c2cgeoportal_geoportal/views/shortener.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2024, Camptocamp SA
+# Copyright (c) 2013-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@ logger = logging.getLogger(__name__)
 
 
 class Shortener:
-    """All the views conserne the shortener."""
+    """All the views concern the shortener."""
 
     def __init__(self, request: pyramid.request.Request):
         self.request = request
@@ -55,8 +55,7 @@ class Shortener:
         if "base_url" in self.settings:
             self.short_bases.append(self.settings["base_url"])
 
-    @view_config(route_name="shortener_get")  # type: ignore[misc]
-    def get(self) -> HTTPFound:
+    def _read(self) -> str:
         assert DBSession is not None
 
         ref = self.request.matchdict["ref"]
@@ -68,8 +67,19 @@ class Shortener:
         short_urls[0].nb_hits += 1
         short_urls[0].last_hit = datetime.now()
 
+        return short_urls[0].url
+
+    @view_config(route_name="shortener_get")  # type: ignore[misc]
+    def get(self) -> HTTPFound:
+        long_url = self._read()
+        set_common_headers(self.request, "shortener", Cache.PUBLIC_NO)
+        return HTTPFound(location=long_url)
+
+    @view_config(route_name="shortener_fetch", renderer="json")  # type: ignore[misc]
+    def fetch(self) -> dict[str, str]:
+        long_url = self._read()
         set_common_headers(self.request, "shortener", Cache.PUBLIC_NO)
-        return HTTPFound(location=short_urls[0].url)
+        return {"long_url": long_url}
 
     @view_config(route_name="shortener_create", renderer="json")  # type: ignore[misc]
     def create(self) -> dict[str, str]:
@@ -80,9 +90,15 @@ class Shortener:
 
         url = self.request.params["url"]
 
+        url_length = len(url)
+        if "#" in url:
+            url_parsed = urlparse(url)
+            if url_parsed.fragment:
+                url_length -= len(url_parsed.fragment) + 1
+
         # see: https://httpd.apache.org/docs/2.2/mod/core.html#limitrequestline
-        if len(url) > 8190:
-            raise HTTPBadRequest(f"The parameter url is too long ({len(url)} > {8190})")
+        if url_length > 8190:
+            raise HTTPBadRequest(f"The parameter url is too long ({url_length} > {8190})")
 
         allowed_hosts = self.settings.get("allowed_hosts", [])
         url_hostname, ok = is_allowed_url(self.request, url, allowed_hosts)

c2cgeoportal_geoportal/views/theme.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -402,7 +402,16 @@ class Theme:
         mixed: bool = True,
     ) -> tuple[dict[str, Any] | None, set[str]]:
         errors: set[str] = set()
-        layer_info = {"id": layer.id, "name": layer.name, "metadata": self._get_metadata_list(layer, errors)}
+        layer_info = {
+            "id": layer.id,
+            "name": layer.name,
+            "public": (
+                layer.public
+                or self.request.get_organization_role("anonymous")
+                in [r.name for ra in layer.restrictionareas for r in ra.roles]
+            ),
+            "metadata": self._get_metadata_list(layer, errors),
+        }
         if re.search("[/?#]", layer.name):
             errors.add(f"The layer has an unsupported name '{layer.name}'.")
         if layer.geo_table:
@@ -822,6 +831,11 @@ class Theme:
                 theme_theme = {
                     "id": theme.id,
                     "name": theme.name,
+                    "public": (
+                        theme.public
+                        or self.request.get_organization_role("anonymous")
+                        in [role.name for role in theme.restricted_roles]
+                    ),
                     "icon": icon,
                     "children": children,
                     "functionalities": self._get_functionalities(theme),
@@ -897,6 +911,7 @@ class Theme:
     ) -> tuple[Optional[etree.Element], set[str]]:  # pylint: disable=c-extension-no-member
         errors = set()
 
+        wfs_url = wfs_url.clone()
         wfs_url.add_query(
             {
                 "SERVICE": "WFS",
@@ -1278,8 +1293,7 @@ class Theme:
         if not self.request.user:
             raise pyramid.httpexceptions.HTTPForbidden()
 
-        admin_roles = [r for r in self.request.user.roles if r.name == ("role_admin")]
-        if not admin_roles:
+        if not self.request.has_permission("admin"):
             raise pyramid.httpexceptions.HTTPForbidden()
 
         self._ogc_server_clear_cache(

c2cgeoportal_geoportal/views/tinyowsproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2024, Camptocamp SA
+# Copyright (c) 2015-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,7 @@ import logging
 from typing import Any
 
 import pyramid.request
+import sqlalchemy.exc
 from defusedxml import ElementTree
 from pyramid.httpexceptions import HTTPBadRequest, HTTPForbidden, HTTPInternalServerError, HTTPUnauthorized
 from pyramid.view import view_config
@@ -59,11 +60,16 @@ class TinyOWSProxy(OGCProxy):
         self.settings = request.registry.settings.get("tinyowsproxy", {})
 
         assert "tinyows_url" in self.settings, "tinyowsproxy.tinyows_url must be set"
-        self.ogc_server = (
-            models.DBSession.query(main.OGCServer)
-            .filter(main.OGCServer.name == self.settings["ogc_server"])
-            .one()
-        )
+        try:
+            self.ogc_server = (
+                models.DBSession.query(main.OGCServer)
+                .filter(main.OGCServer.name == self.settings["ogc_server"])
+                .one()
+            )
+        except sqlalchemy.exc.NoResultFound:
+            raise HTTPBadRequest(  # pylint: disable=raise-missing-from
+                f"OGC server {self.settings['ogc_server']} not found"
+            )
 
         self.user = self.request.user
 

c2cgeoportal_geoportal/views/vector_tiles.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