Make driver reject unknown query type in summary (#602)

* Make driver reject unknown query type in summary

* Add unresolved_address attribute to ConnectionStub
  
  This fixes unit tests. A real connection has this attribute.
  The lack of it in the stub was unnoticed as it was not needed in any tests.

Author: robsdedude

neo4j/work/result.py

@@ -234,9 +234,14 @@ def _obtain_summary(self):
         """
         if self._summary is None:
             if self._metadata:
-                self._summary = ResultSummary(**self._metadata)
+                self._summary = ResultSummary(
+                    self._connection.unresolved_address, **self._metadata
+                )
             elif self._connection:
-                self._summary = ResultSummary(server=self._connection.server_info)
+                self._summary = ResultSummary(
+                    self._connection.unresolved_address,
+                    server=self._connection.server_info
+                )
 
         return self._summary
 

neo4j/work/summary.py

@@ -21,6 +21,8 @@
 
 from collections import namedtuple
 
+from neo4j._exceptions import BoltProtocolError
+
 BOLT_VERSION_1 = 1
 BOLT_VERSION_2 = 2
 BOLT_VERSION_3 = 3
@@ -45,7 +47,9 @@ class ResultSummary:
     #: Dictionary of parameters passed with the statement.
     parameters = None
 
-    #: A string that describes the type of query (``'r'`` = read-only, ``'rw'`` = read/write).
+    #: A string that describes the type of query
+    # ``'r'`` = read-only, ``'rw'`` = read/write, ``'w'`` = write-onlye,
+    # ``'s'`` = schema.
     query_type = None
 
     #: A :class:`neo4j.SummaryCounters` instance. Counters for operations the query triggered.
@@ -70,12 +74,19 @@ class ResultSummary:
     #: Unlike failures or errors, notifications do not affect the execution of a statement.
     notifications = None
 
-    def __init__(self, **metadata):
+    def __init__(self, address, **metadata):
         self.metadata = metadata
         self.server = metadata.get("server")
         self.database = metadata.get("db")
         self.query = metadata.get("query")
         self.parameters = metadata.get("parameters")
+        if "type" in metadata:
+            self.query_type = metadata["type"]
+            if self.query_type not in ["r", "w", "rw", "s"]:
+                raise BoltProtocolError(
+                    "Unexpected query type '%s' received from server. Consider "
+                    "updating the driver.", address
+                )
         self.query_type = metadata.get("type")
         self.plan = metadata.get("plan")
         self.profile = metadata.get("profile")

testkitbackend/backend.py

@@ -24,6 +24,9 @@
 import sys
 import traceback
 
+from neo4j._exceptions import (
+    BoltError
+)
 from neo4j.exceptions import (
     DriverError,
     Neo4jError,
@@ -152,7 +155,8 @@ def _process(self, request):
                     "Backend does not support some properties of the " + name +
                     " request: " + ", ".join(unsused_keys)
                 )
-        except (Neo4jError, DriverError, UnsupportedServerProduct) as e:
+        except (Neo4jError, DriverError, UnsupportedServerProduct,
+                BoltError) as e:
             log.debug(traceback.format_exc())
             if isinstance(e, Neo4jError):
                 msg = "" if e.message is None else str(e.message)

tests/unit/work/test_result.py

@@ -98,6 +98,7 @@ def __init__(self, records=None, run_meta=None, summary_meta=None,
         self.run_meta = run_meta
         self.summary_meta = summary_meta
         ConnectionStub.server_info.update({"server": "Neo4j/4.3.0"})
+        self.unresolved_address = None
 
     def send_all(self):
         self.sent += self.queued