geoservercloud 0.8.12.dev5__tar.gz → 0.8.13.dev1__tar.gz

{geoservercloud-0.8.12.dev5 → geoservercloud-0.8.13.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: geoservercloud
-Version: 0.8.12.dev5
+Version: 0.8.13.dev1
 Summary: Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services
 License: BSD-2-Clause
 Author: Camptocamp

{geoservercloud-0.8.12.dev5 → geoservercloud-0.8.13.dev1}/geoserver_acceptance_tests/tests/test_ogcapi_features.py

@@ -14,6 +14,7 @@ Tests verify compliance with OGC API Features Core specification:
 
 import json
 from collections.abc import Generator
+from xml.etree import ElementTree
 
 import pytest
 from sqlalchemy import Connection
@@ -21,6 +22,37 @@ from sqlalchemy.sql import text
 
 from geoservercloud import GeoServerCloud
 
+WFS_SETTINGS_PATH = "/rest/services/wfs/settings"
+
+PROPERTY_SELECTION_CONFORMANCE = (
+    "http://www.opengis.net/spec/ogcapi-features-6/1.0/conf/properties-features"
+)
+
+XML_HEADERS = {"Content-Type": "application/xml"}
+
+CONFORMANCE_SETTINGS = """
+<wfs>
+  <metadata>
+    <entry key="ogcapiFeatures">
+      <ogcapiFeatures>
+        <core>true</core>
+        <propertySelection>true</propertySelection>
+      </ogcapiFeatures>
+    </entry>
+  </metadata>
+</wfs>
+"""
+
+DEFAULT_CONFORMANCE_SETTINGS = """
+<wfs>
+  <metadata>
+    <entry key="ogcapiFeatures">
+      <ogcapiFeatures/>
+    </entry>
+  </metadata>
+</wfs>
+"""
+
 
 @pytest.fixture()
 def ogcapi_workspace() -> str:
@@ -399,3 +431,88 @@ def test_ogcapi_conformance(ogcapi_workspace: str, geoserver_ogcapi_workspace):
     assert any(
         "ogcapi-features" in cc or "features/core" in cc for cc in conformance_classes
     )
+
+
+@pytest.fixture()
+def wfs_ogcapi_conformance(geoserver: GeoServerCloud) -> Generator[None, None, None]:
+    """Leaves the OGC API Features conformance settings back at their defaults."""
+    yield
+    geoserver.rest_service.rest_client.put(
+        f"{WFS_SETTINGS_PATH}.xml",
+        headers=XML_HEADERS,
+        data=DEFAULT_CONFORMANCE_SETTINGS,
+    )
+
+
+def read_conformance_settings(geoserver: GeoServerCloud) -> ElementTree.Element:
+    """
+    Returns the ogcapiFeatures conformance element of the WFS settings, failing if
+    the REST API answered with the object rendered as a string instead.
+    """
+    response = geoserver.rest_service.rest_client.get(f"{WFS_SETTINGS_PATH}.xml")
+    assert response.status_code == 200
+
+    settings = ElementTree.fromstring(response.content)
+    entry = settings.find("./metadata/entry[@key='ogcapiFeatures']")
+    assert entry is not None, "the ogcapiFeatures metadata entry is missing"
+    assert not (entry.text or "").strip(), (
+        "the conformance object was stored as a string instead of an object: "
+        f"{entry.text!r}"
+    )
+
+    conformance = entry.find("ogcapiFeatures")
+    assert conformance is not None, "the ogcapiFeatures metadata entry has no object"
+    return conformance
+
+
+def test_wfs_settings_rest_roundtrip_preserves_ogcapi_conformance(
+    geoserver: GeoServerCloud, wfs_ogcapi_conformance: None
+):
+    """
+    Reading the WFS settings and writing the same document back must not replace the OGC API Features conformance
+    object with the string returned by its toString(), which later breaks the service with a ClassCastException.
+
+    See https://github.com/geoserver/geoserver-cloud/issues/872
+    """
+    geoserver.rest_service.rest_client.put(
+        f"{WFS_SETTINGS_PATH}.xml", headers=XML_HEADERS, data=CONFORMANCE_SETTINGS
+    )
+
+    conformance = read_conformance_settings(geoserver)
+    assert conformance.findtext("core") == "true"
+    assert conformance.findtext("propertySelection") == "true"
+
+    # the round trip from the issue: read the settings and write them back unchanged
+    settings = geoserver.rest_service.rest_client.get(f"{WFS_SETTINGS_PATH}.xml")
+    geoserver.rest_service.rest_client.put(
+        f"{WFS_SETTINGS_PATH}.xml", headers=XML_HEADERS, data=settings.content
+    )
+
+    conformance = read_conformance_settings(geoserver)
+    assert conformance.findtext("core") == "true"
+    assert conformance.findtext("propertySelection") == "true"
+
+
+def test_ogcapi_conformance_after_wfs_settings_rest_roundtrip(
+    geoserver: GeoServerCloud, wfs_ogcapi_conformance: None
+):
+    """
+    The OGC API Features service must still answer after the WFS settings went through a REST round trip.
+
+    See https://github.com/geoserver/geoserver-cloud/issues/872
+    """
+    geoserver.rest_service.rest_client.put(
+        f"{WFS_SETTINGS_PATH}.xml", headers=XML_HEADERS, data=CONFORMANCE_SETTINGS
+    )
+    settings = geoserver.rest_service.rest_client.get(f"{WFS_SETTINGS_PATH}.xml")
+    geoserver.rest_service.rest_client.put(
+        f"{WFS_SETTINGS_PATH}.xml", headers=XML_HEADERS, data=settings.content
+    )
+
+    response = geoserver.rest_service.rest_client.get(
+        "/ogc/features/v1/conformance", params={"f": "application/json"}
+    )
+    assert response.status_code == 200
+
+    conformance_classes = json.loads(response.content.decode("utf-8"))["conformsTo"]
+    assert PROPERTY_SELECTION_CONFORMANCE in conformance_classes

{geoservercloud-0.8.12.dev5 → geoservercloud-0.8.13.dev1}/geoservercloud/services/restclient.py

@@ -1,3 +1,4 @@
+import re
 from typing import Any
 
 import requests
@@ -6,6 +7,13 @@ from .restlogger import gs_logger
 
 TIMEOUT = 120
 
+# Depending on the order of the jars in WEB-INF/lib, vanilla GeoServer answers these
+# GWC "not found" errors with 500 instead of 404, keeping GWC's message as the
+# text/plain body.
+GWC_NOT_FOUND_MESSAGE = re.compile(
+    r'Unknown layer: .+|Failed to get GridSet\. A GridSet with name ".+" does not exist\.'
+)
+
 
 class RestClient:
     """
@@ -46,6 +54,7 @@ class RestClient:
             full_url,
             extra={"response": response},
         )
+        self.restore_gwc_not_found_status(response)
         if response.status_code != 404:
             response.raise_for_status()
         return response
@@ -130,10 +139,22 @@ class RestClient:
             full_url,
             extra={"response": response},
         )
+        self.restore_gwc_not_found_status(response)
         if response.status_code != 404:
             response.raise_for_status()
         return response
 
+    def restore_gwc_not_found_status(self, response: requests.Response) -> None:
+        if response.status_code != 500:
+            return
+        if not GWC_NOT_FOUND_MESSAGE.fullmatch(response.text.strip()):
+            return
+        gs_logger.warning(
+            "GeoServer answered a GWC not found error with 500, treating it as 404: %s",
+            response.url,
+        )
+        response.status_code = 404
+
     def log_payload(
         self, method: str, json: dict | None, data: bytes | str | None
     ) -> None:

{geoservercloud-0.8.12.dev5 → geoservercloud-0.8.13.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geoservercloud"
-version = "0.8.12.dev5"
+version = "0.8.13.dev1"
 description = "Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services"
 authors = ["Camptocamp <info@camptocamp.com>"]
 license = "BSD-2-Clause"