c2cgeoportal-geoportal 2.9rc10__py3-none-any.whl → 2.9rc11__py3-none-any.whl

c2cgeoportal_geoportal/__init__.py

@@ -661,7 +661,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
         pregenerator=C2CPregenerator(role=True),
         request_method="POST",
     )
-    # The tow next views are used to serve the application on the URL /mapserv_proxy/<ogc server name>
+    # The two next views are used to serve the application on the URL /mapserv_proxy/<ogc server name>
     # instead of /mapserv_proxy?ogcserver=<ogc server name>, required for QGIS server landing page
     config.add_route(
         "mapserverproxy_get_path",
@@ -677,6 +677,21 @@ def includeme(config: pyramid.config.Configurator) -> None:
         pregenerator=C2CPregenerator(role=True),
         request_method="POST",
     )
+    # OGC Api routes
+    config.add_route(
+        "mapserverproxy_ogcapi_mapserver",
+        "/mapserv_proxy/{ogcserver}/ogcapi/*path",
+        mapserverproxy=True,
+        pregenerator=C2CPregenerator(role=True),
+        request_method="GET",
+    )
+    config.add_route(
+        "mapserverproxy_ogcapi_qgisserver",
+        "/mapserv_proxy/{ogcserver}/wfs3/*path",
+        mapserverproxy=True,
+        pregenerator=C2CPregenerator(role=True),
+        request_method="GET",
+    )
     add_cors_route(config, "/mapserv_proxy", "mapserver")
 
     # Add route to the tinyows proxy

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

@@ -82,6 +82,8 @@ services:
     environment:
       - PGOPTIONS
       - MAPSERVER_CONFIG_FILE=/etc/mapserver/mapserver.conf
+      - MAPSERVER_BASE_PATH=/mapserv_proxy
+      - OGCAPI_HTML_TEMPLATE_DIRECTORY=/usr/local/share/mapserver/ogcapi/templates/html-bootstrap4/
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AWS_DEFAULT_REGION

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.py

@@ -17,12 +17,47 @@ import requests
         ("https://front/c2c/health_check", {"checker": "check_collector"}, 2),
         ("https://front/admin/layertree", {}, 10),
         ("https://front/admin/layertree/children", {}, 10),
-        ("http://mapserver:8080/mapserv_proxy", {"SERVICE": "WMS", "REQUEST": "GetCapabilities"}, 60),
+        (
+            "http://mapserver:8080/mapserv_proxy/mapserver",
+            {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+            60,
+        ),
         (
             "https://front/mapserv_proxy",
-            {"ogcserver": "source for image/png", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+            {"ogcserver": "mapserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
             60,
         ),
+        # (
+        #     "http://qgisserver:8080/mapserv_proxy/",
+        #     {"SERVICE": "WMS", "REQUEST": "GetCapabilities", "MAP": "/etc/qgisserver/project.qgs"},
+        #     60,
+        # ),
+        # (
+        #     "https://front/mapserv_proxy",
+        #     {"ogcserver": "qgisserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
+        #     60,
+        # ),
+        # OGC API - Features
+        # (
+        #     "http://mapserver:8080/mapserv_proxy/mapserver/ogcapi/collections/osm_protected/items",
+        #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
+        #     60,
+        # ),
+        # (
+        #     "https://front/mapserv_proxy/mapserver/mapserver/ogcapi/collections/osm_open/items",
+        #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
+        #     60,
+        # ),
+        # (
+        #     "http://qgisserver:8080/mapserv_proxy/qgisserver/wfs3/collections/points/items",
+        #     {"map": "/etc/qgisserver/project.qgs", "bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
+        #     60,
+        # ),
+        # (
+        #     "https://front/mapserv_proxy/qgisserver/wfs3/collections/points/items",
+        #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
+        #     60,
+        # ),
     ],
 )
 def test_url(url: str, params: dict[str, str], timeout: int) -> None:

c2cgeoportal_geoportal/scripts/create_demo_theme.py

@@ -55,20 +55,25 @@ def main() -> None:
         )
 
         interfaces = session.query(Interface).all()
-        ogc_server = session.query(OGCServer).filter(OGCServer.name == "source for image/png").one()
+        ogc_jpeg = session.query(OGCServer).filter(OGCServer.name == "source for image/jpeg").one()
+        session.delete(ogc_jpeg)
+
+        ogc_server_mapserver = session.query(OGCServer).filter(OGCServer.name == "source for image/png").one()
+        ogc_server_mapserver.name = "mapserver"
+        ogc_server_mapserver.url = "config://mapserver/mapserv_proxy/mapserver?map=mapserver"
 
         layer_borders = LayerWMS("Borders", "borders")
         layer_borders.interfaces = interfaces
-        layer_borders.ogc_server = ogc_server
+        layer_borders.ogc_server = ogc_server_mapserver
         layer_density = LayerWMS("Density", "density")
         layer_density.interfaces = interfaces
-        layer_density.ogc_server = ogc_server
+        layer_density.ogc_server = ogc_server_mapserver
 
-        group = LayerGroup("Demo")
-        group.children = [layer_borders, layer_density]
+        group_mapserver = LayerGroup("MapServer")
+        group_mapserver.children = [layer_borders, layer_density]
 
         theme = Theme("Demo")
-        theme.children = [group]
+        theme.children = [group_mapserver]
         theme.interfaces = interfaces
 
         session.add(theme)

c2cgeoportal_geoportal/views/mapserverproxy.py

@@ -74,24 +74,7 @@ class MapservProxy(OGCProxy):
         # GetFeatureInfo requests. For GetLegendGraphic requests we do not send layer_name, but MapServer
         # should not use the DATA string for GetLegendGraphic.
 
-        if self.ogc_server.auth == main.OGCSERVER_AUTH_STANDARD:
-            self.params["role_ids"] = ",".join([str(e) for e in get_roles_id(self.request)])
-
-            # In some application we want to display the features owned by a user than we need his id.
-            self.params["user_id"] = self.user.id if self.user is not None else "-1"
-
-        # Do not allows direct variable substitution
-        for k in list(self.params.keys()):
-            if len(k) > 1 and k[:2].capitalize() == "S_":
-                _LOG.warning("Direct substitution not allowed (%s=%s).", k, self.params[k])
-                del self.params[k]
-
-        if (
-            self.ogc_server.auth == main.OGCSERVER_AUTH_STANDARD
-            and self.ogc_server.type == main.OGCSERVER_TYPE_MAPSERVER
-        ):
-            # Add functionalities params
-            self.params.update(get_mapserver_substitution_params(self.request))
+        self._setup_auth()
 
         # Get method
         method = self.request.method
@@ -165,6 +148,70 @@ class MapservProxy(OGCProxy):
 
         return response
 
+    def _setup_auth(self) -> None:
+        if self.ogc_server.auth == main.OGCSERVER_AUTH_STANDARD:
+            self.params["role_ids"] = ",".join([str(e) for e in get_roles_id(self.request)])
+
+            # In some application we want to display the features owned by a user than we need his id.
+            self.params["user_id"] = self.user.id if self.user is not None else "-1"
+
+        # Do not allows direct variable substitution
+        for k in list(self.params.keys()):
+            if len(k) > 1 and k[:2].capitalize() == "S_":
+                _LOG.warning("Direct substitution not allowed (%s=%s).", k, self.params[k])
+                del self.params[k]
+
+        if (
+            self.ogc_server.auth == main.OGCSERVER_AUTH_STANDARD
+            and self.ogc_server.type == main.OGCSERVER_TYPE_MAPSERVER
+        ):
+            # Add functionalities params
+            self.params.update(get_mapserver_substitution_params(self.request))
+
+    @view_config(route_name="mapserverproxy_ogcapi_mapserver")  # type: ignore
+    def proxy_ogcapi_mapserver(self) -> Response:
+        return self.proxy_ogcapi("ogcapi")
+
+    @view_config(route_name="mapserverproxy_ogcapi_qgisserver")  # type: ignore
+    def proxy_ogcapi_qgisserver(self) -> Response:
+        return self.proxy_ogcapi("wfs3")
+
+    def proxy_ogcapi(self, subpath: str) -> Response:
+        self._setup_auth()
+
+        use_cache = False
+
+        errors: set[str] = set()
+
+        _url = self._get_wfs_url(errors)
+        if _url is not None:
+            _url.path = "/".join([_url.path.rstrip("/"), subpath, *self.request.matchdict["path"]])
+            _LOG.warning("URL: %s", _url)
+        _LOG.warning(self.request.matchdict)
+
+        if _url is None:
+            _LOG.error("Error getting the URL:\n%s", "\n".join(errors))
+            raise HTTPInternalServerError()
+
+        cache_control = Cache.PRIVATE_NO
+
+        headers = self.get_headers()
+        # Add headers for Geoserver
+        if self.ogc_server.auth == main.OGCSERVER_AUTH_GEOSERVER and self.user is not None:
+            headers["sec-username"] = self.user.username
+            headers["sec-roles"] = ";".join(get_roles_name(self.request))
+
+        response = self._proxy_callback(
+            cache_control,
+            url=_url,
+            params=self.params,
+            cache=use_cache,
+            headers=headers,
+            body=self.request.body,
+        )
+
+        return response
+
     def _proxy_callback(
         self, cache_control: Cache, url: Url, params: dict[str, str], **kwargs: Any
     ) -> Response:

{c2cgeoportal_geoportal-2.9rc10.dist-info → c2cgeoportal_geoportal-2.9rc11.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9rc10.dist-info → c2cgeoportal_geoportal-2.9rc11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-c2cgeoportal_geoportal/__init__.py,sha256=5-7394kNTaBZOvSFSv5XxMHKqmKaYKg4RNzyqjbtxzQ,38735
+c2cgeoportal_geoportal/__init__.py,sha256=Te7K9wopbz8ehFtjy_OW30BnTg5Sk_XD94Gws_1740M,39215
 c2cgeoportal_geoportal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/resources.py,sha256=n42Gns8DKw32GstDoUdNgud6xdAidaRwgAuNHqGH-c4,2158
 c2cgeoportal_geoportal/lib/__init__.py,sha256=_67fO_aXQZRnxPXcShHBcs38mdYU5ch0FNX89RwMTgA,10431
@@ -68,7 +68,7 @@ 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=h2sJ976jL2lmMxoRKTfzyInd6Rc0bLeF3BLQTyMO9R0,13537
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml,sha256=VdRZO71CRtmyBzhUXXtwZ1HBpLPT_58BhQUFKKgxkeI,13680
 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=4gsJGJi-yoxmHuQy1B-E5HKKq9LyzBuRcKaBoP7G1_0,2529
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml,sha256=ZpQ33JhdBxkoUNBV9kB5f07p8DpqgvJ3-Mp0SzLnJ6w,2380
@@ -132,7 +132,7 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/qgisserver/pg_s
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup,sha256=48fii_o6y9VbAb-ToG9qU0flS6kEXk6lfHsgtufgrwg,5205
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore,sha256=dfOEwiN8us_JulAZCEgM9WyqHUWEbnlowOgm5nQ0NR8,5425
 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=5zk1UE2E8fObwSjE0ynM5qFEUkPUDy2yceoD-nm7U8Q,1681
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.py,sha256=uleNaLIMz9gKXVl8ZF_pkqKVaY4o9-LUdUogrXY7I7Y,2971
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl,sha256=OK6ZFMlYMx1wcx8leK42LA8p0P56HuEAP8fupuxDI34,6181
 c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json,sha256=x3FFn3b67GPGCsjg36iGXCudjaTSfwGHcwHS6HHVpPQ,539
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml,sha256=8tPCziX4Wh6a2EOdjpLtvyqNtKcI7Rtjo8-bLQO8_Gg,2741
@@ -142,7 +142,7 @@ c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml,sha256=eafKkn_K87pXrtX1pGoEav3_1ELz3oiGLviNEV6vkOI,49133
 c2cgeoportal_geoportal/scripts/__init__.py,sha256=hHwjhQaM_T2EaupeFIyjl0N67Bcl3M99UMcCdYAjQlQ,2929
 c2cgeoportal_geoportal/scripts/c2cupgrade.py,sha256=7smnq2yxs1hAF1CiyE9WfgAqNKjjtrtHevY321i-wio,36826
-c2cgeoportal_geoportal/scripts/create_demo_theme.py,sha256=HgU3vf_1lzbqAGLPhrQioqR74kuT4aHpayICBJ6y5iA,3082
+c2cgeoportal_geoportal/scripts/create_demo_theme.py,sha256=4S3WPfwzIV4j1LYGYHD1KHDEfVXMfI_iEafNcxqC37A,3423
 c2cgeoportal_geoportal/scripts/manage_users.py,sha256=Ih3X_V_xUw59Ums4a1x6qQQtz9VtE7PaxAj-tiZIOPg,5586
 c2cgeoportal_geoportal/scripts/pcreate.py,sha256=1zy-khluuf2gnqA_hJAFy6HFBxDdrqf-__iSZx4R9rs,11588
 c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=Tx1jUfDUwNtwZ5TCyfpldZIbIkzZiQ3dq-kv_YQ9yFE,13737
@@ -159,7 +159,7 @@ c2cgeoportal_geoportal/views/geometry_processing.py,sha256=6dNDjl09mEKGZwJ3ZZkEC
 c2cgeoportal_geoportal/views/i18n.py,sha256=RUuH_HPyjQrij8tfjlketSdRZkE_fpZzgtFq4jSKCr4,5331
 c2cgeoportal_geoportal/views/layers.py,sha256=aEF2Z-eG6bP6B8aSl653wY7BcM7UDMYpSsf_yta_yBM,29178
 c2cgeoportal_geoportal/views/login.py,sha256=s17aSGm-RnmOns9X1etTXjDBMSnJI3HkaaUX8AOKe_s,28833
-c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=SFFs8JSoBWytoPz1sdh1HLFky70LR2D8tk8EEXRkHtM,8161
+c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=MIhhKymJnd22G8g_vchRQeUM6Kj_JQMQKcA7dx4KGdE,9704
 c2cgeoportal_geoportal/views/memory.py,sha256=ttkX7DVcnlA1KsTtQEGZv66qGbjVFbeJGbrvxp6uh04,3748
 c2cgeoportal_geoportal/views/ogcproxy.py,sha256=2i3cuZ2cRybEH-DvAQbrLnUxd9y3B0iKnwkpaJvhwSc,5215
 c2cgeoportal_geoportal/views/pdfreport.py,sha256=nJ_V4Z74YHtYFw1ZIAJer8iz5KMedHPPbgBUy2qkpCU,9616
@@ -185,8 +185,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.9rc10.dist-info/METADATA,sha256=dG23j4_HvtqQ1ZkYGvvNRiRIBEQHQcr5NfYn8_QKieA,1886
-c2cgeoportal_geoportal-2.9rc10.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc10.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc10.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc10.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc11.dist-info/METADATA,sha256=eYjUQAmiBf6Ny6ETtc2qcJAX45ctlFyb5HDstOe8s24,1886
+c2cgeoportal_geoportal-2.9rc11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc11.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc11.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc11.dist-info/RECORD,,