BUG21090014: Fix handshake with MySQL server 5.5.8

peeyushgupta · peeyushgupta · commit f7acb70d0ef2 · 2015-06-19T13:33:18.000+05:30
We do not check for the end byte to be \x00 for MySQL
Server 5.5.8. In this particular version of the server,
the end byte was erroneously not send.

Unit tests are updated.
diff --git a/lib/mysql/connector/protocol.py b/lib/mysql/connector/protocol.py
@@ -173,6 +173,7 @@ def parse_handshake(self, packet):
          capabilities2,
          auth_data_length
         ) = struct_unpack('<I8sx2sBH2sBxxxxxxxxxx', packet[0:31])
+        res['server_version_original'] = res['server_version_original'].decode()
 
         packet = packet[31:]
 
@@ -186,15 +187,19 @@ def parse_handshake(self, packet):
                 auth_data2 = auth_data2[:-1]
 
         if capabilities & ClientFlag.PLUGIN_AUTH:
-            (packet, res['auth_plugin']) = utils.read_string(
-                packet, end=b'\x00')
+            if (b'\x00' not in packet
+                    and res['server_version_original'].startswith("5.5.8")):
+                # MySQL server 5.5.8 has a bug where end byte is not send
+                (packet, res['auth_plugin']) = (b'', packet)
+            else:
+                (packet, res['auth_plugin']) = utils.read_string(
+                    packet, end=b'\x00')
             res['auth_plugin'] = res['auth_plugin'].decode('utf-8')
         else:
             res['auth_plugin'] = 'mysql_native_password'
 
         res['auth_data'] = auth_data1 + auth_data2
         res['capabilities'] = capabilities
-        res['server_version_original'] = res['server_version_original'].decode()
         return res
 
     def parse_ok(self, packet):
diff --git a/tests/test_protocol.py b/tests/test_protocol.py
@@ -231,6 +231,11 @@ def test_parse_handshake(self):
         res = self._protocol.parse_handshake(handshake)
         self.assertEqual(exp, res)
 
+        # Test when end byte \x00 is not present for server 5.5.8
+        handshake = handshake[:-1]
+        res = self._protocol.parse_handshake(handshake)
+        self.assertEqual(exp, res)
+
     def test_parse_ok(self):
         """Parse OK-packet sent by MySQL"""
         res = self._protocol.parse_ok(OK_PACKET)
