Merge branch 'main' into dependabot/pip/cryptography-44.0.1

Author: goloroden

eventsourcingdb/client.py

@@ -10,6 +10,7 @@
 from .is_heartbeat import is_heartbeat
 from .is_stream_error import is_stream_error
 from .is_event import is_event
+from .is_valid_server_header import is_valid_server_header
 from .parse_raw_message import parse_raw_message
 from .read_events import ReadEventsOptions
 
@@ -56,6 +57,8 @@ async def ping(self) -> None:
         ping_received_type = "io.eventsourcingdb.api.ping-received"
 
         response = await self.http_client.get("/api/v1/ping")
+        if not is_valid_server_header(response):
+            raise ServerError("Server must be EventSourcingDB")
         response_body = bytes.decode(await response.body.read(), encoding="utf-8")
 
         if response.status_code != HTTPStatus.OK:
@@ -80,6 +83,8 @@ async def verify_api_token(self) -> None:
             request_body=request_body,
         )
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Failed to verify API token: {response}'
@@ -118,6 +123,8 @@ async def write_events(
             request_body=request_body,
         )
 
+        if not is_valid_server_header(response):
+            raise ServerError("Server must be EventSourcingDB")
         if response.status_code != HTTPStatus.OK:
             raise ServerError(
                 f'Unexpected response status: {response}'
@@ -151,6 +158,8 @@ async def read_events(
         )
 
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Unexpected response status: {response}'
@@ -181,6 +190,8 @@ async def run_eventql_query(self, query: str) -> AsyncGenerator[Any]:
         )
 
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Unexpected response status: {response}'
@@ -222,6 +233,8 @@ async def observe_events(
         )
 
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Unexpected response status: {response}'
@@ -257,6 +270,8 @@ async def register_event_schema(self, event_type: str, json_schema: dict) -> Non
         )
 
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Unexpected response status: {response} '
@@ -276,6 +291,8 @@ async def read_subjects(
         )
 
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Unexpected response status: {response}'
@@ -306,6 +323,8 @@ async def read_event_type(self, event_type: str) -> EventType:
         )
 
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Unexpected response status: {response}'
@@ -340,6 +359,8 @@ async def read_event_types(self) -> AsyncGenerator[EventType]:
             raise InternalError(str(other_error)) from other_error
 
         async with response:
+            if not is_valid_server_header(response):
+                raise ServerError("Server must be EventSourcingDB")
             if response.status_code != HTTPStatus.OK:
                 raise ServerError(
                     f'Unexpected response status: {response}'

eventsourcingdb/is_valid_server_header.py

@@ -0,0 +1,13 @@
+from .http_client import Response
+
+
+def is_valid_server_header(response: Response) -> bool:
+    server_header = response.headers.get('Server')
+
+    if not server_header:
+        return False
+
+    if not server_header.startswith('EventSourcingDB/'):
+        return False
+
+    return True

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "eventsourcingdb"
-version = "1.6.0"
+version = "1.7.0"
 description = "The official Python client SDK for EventSourcingDB."
 authors = [{ name = "the native web GmbH", email = "[email protected]" }]
 requires-python = ">=3.11, <=3.13"