c2cgeoportal-geoportal 2.7.1.157__py2.py3-none-any.whl → 2.8.1.87__py2.py3-none-any.whl

c2cgeoportal_geoportal/views/layers.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2022, Camptocamp SA
+# Copyright (c) 2012-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,7 @@ from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Set, Tup
 import geojson.geometry
 import pyramid.request
 import pyramid.response
+import shapely.geometry
 import sqlalchemy.ext.declarative
 from geoalchemy2 import Geometry
 from geoalchemy2 import func as ga_func
@@ -49,8 +50,7 @@ from pyramid.httpexceptions import (
     HTTPNotFound,
 )
 from pyramid.view import view_config
-from shapely.geometry import asShape
-from shapely.geos import TopologicalError
+from shapely.errors import TopologicalError
 from shapely.ops import cascaded_union
 from sqlalchemy import Enum, Numeric, String, Text, Unicode, UnicodeText, exc, func
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
@@ -190,7 +190,7 @@ class Layers:
 
         feature = proto.read(self.request, filter=filter_)
         if isinstance(feature, HTTPException):
-            raise feature  # pylint: disable=raising-non-exception
+            raise feature
         return feature
 
     @view_config(route_name="layers_read_many", renderer="geojson")  # type: ignore
@@ -228,7 +228,7 @@ class Layers:
         geom = feature.geometry
         if not geom or isinstance(geom, geojson.geometry.Default):
             return feature
-        shape = asShape(geom)
+        shape = shapely.geometry.shape(geom)
         srid = self._get_geom_col_info(layer)[1]
         spatial_elt = from_shape(shape, srid=srid)
         allowed = models.DBSession.query(func.count(RestrictionArea.id))
@@ -275,7 +275,7 @@ class Layers:
             del obj  # unused
             geom = feature.geometry
             if geom and not isinstance(geom, geojson.geometry.Default):
-                shape = asShape(geom)
+                shape = shapely.geometry.shape(geom)
                 srid = self._get_geom_col_info(layer)[1]
                 spatial_elt = from_shape(shape, srid=srid)
                 allowed = models.DBSession.query(func.count(RestrictionArea.id))
@@ -298,7 +298,7 @@ class Layers:
         try:
             features = protocol.create(self.request)
             if isinstance(features, HTTPException):
-                raise features  # pylint: disable=raising-bad-type
+                raise features
             if features is not None:
                 for feature in features.features:  # pylint: disable=no-member
                     self._log_last_update(layer, feature)
@@ -346,7 +346,7 @@ class Layers:
             )
             spatial_elt = None
             if geom and not isinstance(geom, geojson.geometry.Default):
-                shape = asShape(geom)
+                shape = shapely.geometry.shape(geom)
                 spatial_elt = from_shape(shape, srid=srid)
                 allowed = allowed.filter(
                     or_(RestrictionArea.area.is_(None), RestrictionArea.area.ST_Contains(spatial_elt))
@@ -439,7 +439,7 @@ class Layers:
         protocol = self._get_protocol_for_layer(layer, before_delete=security_cb)
         response = protocol.delete(self.request, feature_id)
         if isinstance(response, HTTPException):
-            raise response  # pylint: disable=raising-non-exception
+            raise response
         set_common_headers(self.request, "layers", Cache.PRIVATE_NO, response=response)
         return response
 
@@ -506,7 +506,7 @@ def get_layer_class(
     """
     Get the SQLAlchemy class to edit a GeoMapFish layer.
 
-    Arguments:
+    Keyword Arguments:
 
         layer: The GeoMapFish layer
         with_last_update_columns: False to just have a class to access to the table and be able to
@@ -584,7 +584,6 @@ def get_layer_metadata(layer: "main.Layer") -> List[ColumnProperties]:
 
     for column_property in class_mapper(cls).iterate_properties:
         if isinstance(column_property, ColumnProperty):
-
             if len(column_property.columns) != 1:
                 raise NotImplementedError
 

c2cgeoportal_geoportal/views/login.py

@@ -1,4 +1,4 @@
-# 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
@@ -28,9 +28,9 @@
 
 import json
 import logging
-import secrets
 import sys
 import urllib.parse
+from random import Random
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import pyotp
@@ -88,7 +88,7 @@ class Login:
         if not hasattr(self.request, "is_valid_referer"):
             self.request.is_valid_referer = is_valid_referrer(self.request)
         if not self.request.is_valid_referer:
-            LOG.info("Invalid referer for %s: %s", self.request.path_qs, repr(self.request.referer))
+            LOG.info("Invalid referrer for %s: %s", self.request.path_qs, repr(self.request.referrer))
 
     @forbidden_view_config(renderer="login.html")  # type: ignore
     def loginform403(self) -> Union[Dict[str, Any], pyramid.response.Response]:
@@ -341,11 +341,12 @@ class Login:
 
     @staticmethod
     def generate_password() -> str:
-        all_chars = "123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        allchars = "123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        rand = Random()  # nosec
 
         password = ""  # nosec
         for _ in range(8):
-            password += secrets.choice(all_chars)
+            password += rand.choice(allchars)
 
         return password
 
@@ -397,6 +398,36 @@ class Login:
 
         return {"success": True}
 
+    @view_config(route_name="oauth2introspect")  # type: ignore
+    def oauth2introspect(self) -> pyramid.response.Response:
+        LOG.debug(
+            "Call OAuth create_introspect_response with:\nurl: %s\nmethod: %s\nbody:\n%s",
+            self.request.current_route_url(_query=self.request.GET),
+            self.request.method,
+            self.request.body,
+        )
+        headers, body, status = oauth2.get_oauth_client(
+            self.request.registry.settings
+        ).create_introspect_response(
+            self.request.current_route_url(_query=self.request.GET),
+            self.request.method,
+            self.request.body,
+            self.request.headers,
+        )
+        LOG.debug("OAuth create_introspect_response return status: %s", status)
+
+        # All requests to /token will return a json response, no redirection.
+        if status != 200:
+            if body:
+                raise exception_response(status, detail=body)
+            raise exception_response(status)
+        return set_common_headers(
+            self.request,
+            "login",
+            Cache.PRIVATE_NO,
+            response=Response(body, headers=headers.items()),
+        )
+
     @view_config(route_name="oauth2token")  # type: ignore
     def oauth2token(self) -> pyramid.response.Response:
         LOG.debug(
@@ -414,9 +445,6 @@ class Login:
         )
         LOG.debug("OAuth create_token_response return status: %s", status)
 
-        if hasattr(self.request, "tm"):
-            self.request.tm.commit()
-
         # All requests to /token will return a json response, no redirection.
         if status != 200:
             if body:
@@ -429,6 +457,33 @@ class Login:
             response=Response(body, headers=headers.items()),
         )
 
+    @view_config(route_name="oauth2revoke_token")  # type: ignore
+    def oauth2revoke_token(self) -> pyramid.response.Response:
+        LOG.debug(
+            "Call OAuth create_revocation_response with:\nurl: %s\nmethod: %s\nbody:\n%s",
+            self.request.create_revocation_response(_query=self.request.GET),
+            self.request.method,
+            self.request.body,
+        )
+        headers, body, status = oauth2.get_oauth_client(
+            self.request.registry.settings
+        ).create_authorize_response(
+            self.request.current_route_url(_query=self.request.GET),
+            self.request.method,
+            self.request.body,
+            self.request.headers,
+        )
+        if status != 200:
+            if body:
+                raise exception_response(status, detail=body)
+            raise exception_response(status)
+        return set_common_headers(
+            self.request,
+            "login",
+            Cache.PRIVATE_NO,
+            response=Response(body, headers=headers.items()),
+        )
+
     @view_config(route_name="oauth2loginform", renderer="login.html")  # type: ignore
     def oauth2loginform(self) -> Dict[str, Any]:
         set_common_headers(self.request, "login", Cache.PUBLIC)

c2cgeoportal_geoportal/views/mapserverproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 import logging
 from typing import Any, Dict, Set
 
-from pyramid.httpexceptions import HTTPFound, HTTPInternalServerError, HTTPUnauthorized
+from pyramid.httpexceptions import HTTPForbidden, HTTPFound, HTTPInternalServerError, HTTPUnauthorized
 from pyramid.request import Request
 from pyramid.response import Response
 from pyramid.view import view_config
@@ -67,7 +67,7 @@ class MapservProxy(OGCProxy):
                 raise HTTPUnauthorized(
                     headers={"WWW-Authenticate": 'Basic realm="Access to restricted layers"'}
                 )
-            raise HTTPUnauthorized(headers={"WWW-Authenticate": 'Bearer realm="Access to restricted layers"'})
+            raise HTTPForbidden("Basic auth is not enabled")
 
         # We have a user logged in. We need to set group_id and possible layer_name in the params. We set
         # layer_name when either QUERY_PARAMS or LAYERS is set in the WMS params, i.e. for GetMap and
@@ -108,7 +108,6 @@ class MapservProxy(OGCProxy):
                 self.params = {}
             else:
                 if self.ogc_server.type != main.OGCSERVER_TYPE_QGISSERVER or "user_id" not in self.params:
-
                     use_cache = self.lower_params["request"] in ("getlegendgraphic",)
 
                     # no user_id and role_id or cached queries

c2cgeoportal_geoportal/views/ogcproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2022, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,8 @@ class OGCProxy(Proxy):
         if "user_id" in self.params:
             del self.params["user_id"]
 
+        main_ogc_server = self.request.registry.settings.get("main_ogc_server")
+
         self.lower_params = self._get_lower_params(self.params)
 
         # We need original case for OGCSERVER parameter value
@@ -69,11 +71,13 @@ class OGCProxy(Proxy):
             self.ogc_server = self._get_ogcserver_byname(request.matchdict["ogcserver"])
         elif "ogcserver" in self.lower_key_params:
             self.ogc_server = self._get_ogcserver_byname(self.lower_key_params["ogcserver"])
+        elif main_ogc_server is not None:
+            self.ogc_server = self._get_ogcserver_byname(main_ogc_server)
         elif not has_default_ogc_server:
             raise HTTPBadRequest("The querystring argument 'ogcserver' is required")
 
     @CACHE_REGION.cache_on_arguments()  # type: ignore
-    def _get_ogcserver_byname(self, name: str) -> main.OGCServer:  # pylint: disable=no-self-use
+    def _get_ogcserver_byname(self, name: str) -> main.OGCServer:
         try:
             result = DBSession.query(main.OGCServer).filter(main.OGCServer.name == name).one()
             DBSession.expunge(result)

c2cgeoportal_geoportal/views/pdfreport.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2021, Camptocamp SA
+# Copyright (c) 2011-2023, 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-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -64,24 +64,22 @@ class PrintProxy(Proxy):
         query_string = urllib.parse.urlencode(params)
 
         resp, content = self._capabilities(
-            templates, query_string, self.request.method, self.request.referrer, self.request.host
+            templates, query_string, self.request.method, self.request.referrer
         )
 
         response = self._build_response(resp, content, Cache.PRIVATE, "print")
-        # Mapfish print will check the referer header to return the capabilities.
-        response.vary += ("Referer",)
+        # Mapfish print will check the referrer header to return the capabilities.
+        response.vary += ("Referrer", "Referer")
         return response
 
     @CACHE_REGION.cache_on_arguments()  # type: ignore
     def _capabilities(
-        self, templates: List[str], query_string: Dict[str, str], method: str, referrer: str, host: str
+        self, templates: List[str], query_string: Dict[str, str], method: str, referrer: str
     ) -> Tuple[requests.Response, str]:
         del query_string  # Just for caching
         del method  # Just for caching
         del referrer  # Just for caching
-        del host  # Just for caching
-
-        # Get URL
+        # get URL
         _url = self.request.get_organization_print_url() + "/capabilities.json"
 
         response = self._proxy(Url(_url))

c2cgeoportal_geoportal/views/profile.py

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

c2cgeoportal_geoportal/views/proxy.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -47,7 +45,7 @@ CACHE_REGION = get_region("std")
 
 
 class Proxy:
-    """Some methodes used by all the proxy."""
+    """Some methods used by all the proxy."""
 
     def __init__(self, request: pyramid.request.Request):
         self.request = request
@@ -175,10 +173,9 @@ class Proxy:
         return response
 
     @CACHE_REGION.cache_on_arguments()  # type: ignore
-    def _proxy_cache(self, host: str, method: str, *args: Any, **kwargs: Any) -> pyramid.response.Response:
+    def _proxy_cache(self, method: str, *args: Any, **kwargs: Any) -> pyramid.response.Response:
         # Method is only for the cache
-        del host, method
-
+        del method
         kwargs["cache"] = True
         return self._proxy(*args, **kwargs)
 
@@ -194,7 +191,7 @@ class Proxy:
             headers_update = {}
         cache = kwargs.get("cache", False)
         if cache is True:
-            response = self._proxy_cache(url, self.request.host, self.request.method, **kwargs)
+            response = self._proxy_cache(url, self.request.method, **kwargs)
         else:
             response = self._proxy(url, **kwargs)
 
@@ -252,7 +249,7 @@ class Proxy:
 
     @staticmethod
     def _get_lower_params(params: Dict[str, str]) -> Dict[str, str]:
-        return dict((k.lower(), str(v).lower()) for k, v in params.items())
+        return {k.lower(): str(v).lower() for k, v in params.items()}
 
     def get_headers(self) -> Dict[str, str]:
         headers: Dict[str, str] = self.request.headers

c2cgeoportal_geoportal/views/raster.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2021, Camptocamp SA
+# Copyright (c) 2012-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -167,7 +167,7 @@ class Raster:
             result = None if result == layer.get("nodata", dataset.nodata) else result
         else:
             LOG.debug(
-                "Out of index for layer: %s (%s), " "lon/lat: %dx%d, index: %dx%d, shape: %dx%d.",
+                "Out of index for layer: %s (%s), lon/lat: %dx%d, index: %dx%d, shape: %dx%d.",
                 name,
                 layer["file"],
                 lon,

c2cgeoportal_geoportal/views/resourceproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2021, Camptocamp SA
+# Copyright (c) 2011-2023, 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-2022, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -71,7 +71,6 @@ class Shortener:
 
     @view_config(route_name="shortener_create", renderer="json")  # type: ignore
     def create(self) -> Dict[str, str]:
-
         if "url" not in self.request.params:
             raise HTTPBadRequest("The parameter url is required")