Parse Tarantool version id from greeting

Author: rtsisyk

tarantool/connection.py

@@ -12,8 +12,6 @@
 import socket
 import msgpack
 
-import base64
-
 try:
     from ctypes import c_ssize_t
 except ImportError:
@@ -53,8 +51,8 @@
     RetryWarning,
     NetworkWarning)
 
-from tarantool.schema import Schema
-from tarantool.utils import check_key
+from .schema import Schema
+from .utils import check_key, greeting_decode
 
 
 class Connection(object):
@@ -134,10 +132,15 @@ def connect_basic(self):
             raise NetworkError(e)
 
     def handshake(self):
-            greeting = self._recv(IPROTO_GREETING_SIZE)
-            self._salt = base64.decodestring(greeting[64:])[:20]
-            if self.user:
-                self.authenticate(self.user, self.password)
+        greeting_buf = self._recv(IPROTO_GREETING_SIZE)
+        greeting = greeting_decode(greeting_buf)
+        if greeting.protocol != "Binary":
+            raise NetworkError("Unsupported protocol: " + greeting.protocol)
+        self.version_id = greeting.version_id
+        self.uuid = greeting.uuid
+        self._salt = greeting.salt
+        if self.user:
+            self.authenticate(self.user, self.password)
 
     def connect(self):
         '''

tarantool/utils.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
 import six
+import base64
+import uuid
 
 def check_key(*args, **kwargs):
     if 'first' not in kwargs:
@@ -18,3 +20,48 @@ def check_key(*args, **kwargs):
     for key in args:
         assert isinstance(key, six.integer_types + six.string_types)
     return list(args)
+
+def version_id(major, minor, patch):
+    return (((major << 8) | minor) << 8) | patch
+
+def greeting_decode(greeting_buf):
+    class Greeting:
+        version_id = 0
+        protocol = None
+        uuid = None
+        salt = None
+
+    # Tarantool 1.6.6
+    # Tarantool 1.6.6-102-g4e9bde2
+    # Tarantool 1.6.8 (Binary) 3b151c25-4c4a-4b5d-8042-0f1b3a6f61c3
+    # Tarantool 1.6.8-132-g82f5424 (Lua console)
+    result = Greeting()
+    try:
+        (product, _, tail) = greeting_buf[0:63].partition(' ')
+        if product.startswith("Tarantool "):
+            raise Exception()
+        # Parse a version string - 1.6.6-83-gc6b2129 or 1.6.7
+        (version, _, tail) = tail.partition(' ')
+        version = version.split('-')[0].split('.')
+        result.version_id = version_id(int(version[0]), int(version[1]),
+                                       int(version[2]))
+        if len(tail) > 0 and tail[0] == '(':
+            (protocol, _, tail) = tail[1:].partition(') ')
+            # Extract protocol name - a string between (parentheses)
+            result.protocol = protocol
+            if result.protocol != "Binary":
+                return result
+            # Parse UUID for binary protocol
+            (uuid_buf, _, tail) = tail.partition(' ')
+            if result.version_id >= version_id(1, 6, 7):
+                result.uuid = uuid.UUID(uuid_buf.strip())
+        elif result.version_id < version_id(1, 6, 7):
+            # Tarantool < 1.6.7 doesn't add "(Binary)" to greeting
+            result.protocol = "Binary"
+        elif len(tail.strip()) != 0:
+            raise Exception("x") # Unsuported greeting
+        result.salt = base64.decodestring(greeting_buf[64:])[:20]
+        return result
+    except Exception as e:
+        print('exx', e)
+        raise ValueError("Invalid greeting: " + greeting_buf)

tests/suites/test_protocol.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env ipython
+
+import unittest
+from tarantool.utils import greeting_decode, version_id
+import uuid
+
+class TestSuite_Protocol(unittest.TestCase):
+
+    def test_00_greeting_1_6(self):
+        buf = "Tarantool 1.6.6                                                \n" + \
+              "AtQnb9SAIaKazZZy9lJKvK3urtbjCEJndhRVbslSPGc=                   \n";
+        greeting = greeting_decode(buf)
+        self.assertEqual(greeting.version_id, version_id(1, 6, 6))
+        self.assertEqual(greeting.protocol, "Binary")
+        self.assertIsNone(greeting.uuid)
+        self.assertIsNotNone(greeting.salt)
+
+    def test_01_greeting_1_6_with_tag(self):
+        buf = "Tarantool 1.6.6-232-gcf47324                                   \n" + \
+              "AtQnb9SAIaKazZZy9lJKvK3urtbjCEJndhRVbslSPGc=                   \n";
+        greeting = greeting_decode(buf)
+        self.assertEqual(greeting.version_id, version_id(1, 6, 6))
+        self.assertEqual(greeting.protocol, "Binary")
+        self.assertIsNone(greeting.uuid)
+        self.assertIsNotNone(greeting.salt)
+
+    def test_02_greeting_1_6_console(self):
+        buf = "Tarantool 1.6.6-132-g82f5424 (Lua console)                     \n" + \
+              "type 'help' for interactive help                               \n";
+        greeting = greeting_decode(buf)
+        self.assertEqual(greeting.version_id, version_id(1, 6, 6))
+        self.assertEqual(greeting.protocol, "Lua console")
+        self.assertIsNone(greeting.uuid)
+        self.assertIsNone(greeting.salt)
+
+    def test_03_greeting_1_6_7(self):
+        buf = "Tarantool 1.6.7 (Binary) 52dc2837-8001-48fe-bdce-c493c04599ce  \n" + \
+              "Z+2F+VRlyK1nKT82xQtxqEggMtkTK5RtPYf27JryRas=                   \n";
+        greeting = greeting_decode(buf)
+        self.assertEqual(greeting.version_id, version_id(1, 6, 7))
+        self.assertEqual(greeting.protocol, "Binary")
+        self.assertEqual(greeting.uuid,
+                         uuid.UUID('52dc2837-8001-48fe-bdce-c493c04599ce'))
+        self.assertIsNotNone(greeting.salt)