Fully enable KMIP 2.0 support for the server

This changes adds all of the final core updates necessary to allow
KMIP 2.0 message encoding/decoding support for the PyKMIP server.
Request and responses now dynamically adjust the KMIP version they
encode/decode under based on the KMIP version included in their
header segments. Extra server logging has also been added to show
the KMIP version specified by the client request.

Message tests have been updated to reflect these changes.

Author: PeterHamilton

kmip/core/messages/contents.py

@@ -277,6 +277,11 @@ def protocol_version_to_kmip_version(value):
             return enums.KMIPVersion.KMIP_1_4
         else:
             return None
+    elif value.major == 2:
+        if value.minor == 0:
+            return enums.KMIPVersion.KMIP_2_0
+        else:
+            return None
     else:
         return None
 

kmip/core/messages/messages.py

@@ -62,6 +62,10 @@ def read(self, istream, kmip_version=enums.KMIPVersion.KMIP_1_0):
         self.protocol_version = contents.ProtocolVersion()
         self.protocol_version.read(tstream, kmip_version=kmip_version)
 
+        kmip_version = contents.protocol_version_to_kmip_version(
+            self.protocol_version
+        )
+
         # Read the maximum response size if it is present
         if self.is_tag_next(Tags.MAXIMUM_RESPONSE_SIZE, tstream):
             self.maximum_response_size = contents.MaximumResponseSize()
@@ -185,6 +189,10 @@ def read(self, istream, kmip_version=enums.KMIPVersion.KMIP_1_0):
         self.protocol_version = contents.ProtocolVersion()
         self.protocol_version.read(tstream, kmip_version=kmip_version)
 
+        kmip_version = contents.protocol_version_to_kmip_version(
+            self.protocol_version
+        )
+
         self.time_stamp = contents.TimeStamp()
         self.time_stamp.read(tstream, kmip_version=kmip_version)
 
@@ -467,6 +475,10 @@ def read(self, istream, kmip_version=enums.KMIPVersion.KMIP_1_0):
         self.request_header = RequestHeader()
         self.request_header.read(istream, kmip_version=kmip_version)
 
+        kmip_version = contents.protocol_version_to_kmip_version(
+            self.request_header.protocol_version
+        )
+
         self.batch_items = []
         for _ in range(self.request_header.batch_count.value):
             batch_item = RequestBatchItem()
@@ -507,6 +519,10 @@ def read(self, istream, kmip_version=enums.KMIPVersion.KMIP_1_0):
         self.response_header = ResponseHeader()
         self.response_header.read(istream, kmip_version=kmip_version)
 
+        kmip_version = contents.protocol_version_to_kmip_version(
+            self.response_header.protocol_version
+        )
+
         self.batch_items = []
         for _ in range(self.response_header.batch_count.value):
             batch_item = ResponseBatchItem()

kmip/services/kmip_client.py

@@ -1576,8 +1576,10 @@ def _build_protocol_version(self):
             return ProtocolVersion(1, 2)
         elif self.kmip_version == enums.KMIPVersion.KMIP_1_3:
             return ProtocolVersion(1, 3)
-        else:
+        elif self.kmip_version == enums.KMIPVersion.KMIP_1_4:
             return ProtocolVersion(1, 4)
+        else:
+            return ProtocolVersion(2, 0)
 
     def _build_request_message(self, credential, batch_items):
         protocol_version = self._build_protocol_version()

kmip/services/server/engine.py

@@ -213,6 +213,11 @@ def process_request(self, request, credential=None):
 
         # Process the protocol version
         self._set_protocol_version(header.protocol_version)
+        self._logger.debug(
+            "Request specified KMIP version: {0}".format(
+                header.protocol_version
+            )
+        )
 
         # Process the maximum response size
         max_response_size = None

kmip/tests/unit/core/messages/test_messages.py

@@ -174,8 +174,8 @@ def setUp(self):
         self.encoding_kmip_2_0 = utils.BytearrayStream(
             b'\x42\x00\x7A\x01\x00\x00\x00\x70'
             b'\x42\x00\x69\x01\x00\x00\x00\x20'
-            b'\x42\x00\x6A\x02\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x00'
-            b'\x42\x00\x6B\x02\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x00'
+            b'\x42\x00\x6A\x02\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00'
+            b'\x42\x00\x6B\x02\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00'
             b'\x42\x00\x92\x09\x00\x00\x00\x08\x00\x00\x00\x00\x4F\x9A\x54\xE5'
             b'\x42\x01\x55\x08\x00\x00\x00\x20'
             b'\xD3\xC3\xBF\x31\xB8\xBF\xBB\xEF\x53\x12\x0F\xD0\x95\x1B\xE5\x38'
@@ -229,7 +229,7 @@ def test_read_kmip_2_0(self):
         )
 
         self.assertEqual(
-            contents.ProtocolVersion(major=1, minor=1),
+            contents.ProtocolVersion(major=2, minor=0),
             response_header.protocol_version
         )
         self.assertEqual(0x4F9A54E5, response_header.time_stamp.value)
@@ -250,7 +250,7 @@ def test_write_kmip_2_0(self):
         stream when including KMIP 2.0 fields.
         """
         response_header = messages.ResponseHeader(
-            protocol_version=contents.ProtocolVersion(major=1, minor=1),
+            protocol_version=contents.ProtocolVersion(major=2, minor=0),
             time_stamp=contents.TimeStamp(value=0x4F9A54E5),
             server_hashed_password=(
                 b'\xD3\xC3\xBF\x31\xB8\xBF\xBB\xEF'