Add check for greetings. Closes gh-85

Author: bigbes

src/tarantool.c

@@ -287,10 +287,15 @@ int __tarantool_connect(tarantool_object *t_obj) {
 				       GREETING_SIZE) == -1) {
 			continue;
 		}
+		if (php_tp_verify_greetings(obj->greeting) == 0) {
+			spprintf(&err, 0, "Bad greetings");
+			goto ioexception;
+		}
 		++count;
 		break;
 	}
 	if (count == 0) {
+ioexception:
 		tarantool_throw_ioexception("%s", err);
 		efree(err);
 		return FAILURE;

src/tarantool_network.c

@@ -73,7 +73,8 @@ int tntll_stream_open(const char *host, int port, zend_string *pid,
 	if (pid) options |= STREAM_OPEN_PERSISTENT;
 	flags = STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT;
 	double_to_tv(TARANTOOL_G(timeout), &tv);
-	// printf("'tm - %lu, %lu' ", tv.tv_sec, tv.tv_usec);
+	// printf("timeout: 'sec(%d), usec(%d)'\n",
+	//        (int )tv.tv_sec, (int )tv.tv_usec);
 
 	const char *pid_str = pid == NULL ? NULL : pid->val;
 	stream = php_stream_xport_create(addr, addr_len, options, flags,
@@ -89,9 +90,10 @@ int tntll_stream_open(const char *host, int port, zend_string *pid,
 
 	/* Set READ_TIMEOUT */
 	double_to_tv(TARANTOOL_G(request_timeout), &tv);
-	// printf("'rtv - %lu, %lu' ", tv.tv_sec, tv.tv_usec);
+	// printf("request_timeout:  'sec(%d), usec(%d)'\n",
+	//        (int )tv.tv_sec, (int )tv.tv_usec);
 
-	if (tv.tv_sec != 0 || tv.tv_usec != 0) {
+	if (tv.tv_sec != 0 && tv.tv_usec != 0) {
 		php_stream_set_option(stream, PHP_STREAM_OPTION_READ_TIMEOUT,
 				      0, &tv);
 	}

src/tarantool_proto.c

@@ -15,7 +15,7 @@ static size_t php_tp_sizeof_header(uint32_t request, uint32_t sync) {
 }
 
 static char *php_tp_pack_header(smart_string *str, size_t size,
-				      uint32_t request, uint32_t sync) {
+				uint32_t request, uint32_t sync) {
 	char *sz = SSTR_POS(str);
 	php_mp_pack_package_size(str, size);
 	php_mp_pack_hash(str, 2);
@@ -433,3 +433,31 @@ int convert_iter_str(const char *i, size_t i_len) {
 	};
 	return -1;
 }
+
+uint32_t php_tp_verify_greetings(char *greetingbuf) {
+	/* Check basic structure - magic string and \n delimiters */
+	if (memcmp(greetingbuf, "Tarantool ", strlen("Tarantool ")) != 0 ||
+		   greetingbuf[GREETING_SIZE / 2 - 1] != '\n' ||
+		   greetingbuf[GREETING_SIZE     - 1] != '\n')
+		return 0;
+
+	int h = GREETING_SIZE / 2;
+	const char *pos = greetingbuf + strlen("Tarantool ");
+	const char *end = greetingbuf + h;
+
+	/* Extract a version string - a string until ' ' */
+	char version[20];
+	const char *vend = (const char *) memchr(pos, ' ', end - pos);
+	if (vend == NULL || (size_t)(vend - pos) >= sizeof(version))
+		return 0;
+	memcpy(version, pos, vend - pos);
+	version[vend - pos] = '\0';
+	pos = vend + 1;
+	for (; pos < end && *pos == ' '; ++pos); /* skip spaces */
+
+	/* Parse a version string - 1.6.6-83-gc6b2129 or 1.6.7 */
+	unsigned major, minor, patch;
+	if (sscanf(version, "%u.%u.%u", &major, &minor, &patch) != 3)
+		return 0;
+	return version_id(major, minor, patch);
+}

src/tarantool_proto.h

@@ -7,6 +7,8 @@
 #define GREETING_SIZE    128
 #define SALT_PREFIX_SIZE 64
 
+#define GREETING_PROTOCOL_LEN_MAX 32
+
 #define SPACE_SPACE 281
 #define SPACE_INDEX 289
 
@@ -17,6 +19,36 @@
 
 #include <php_tarantool.h>
 
+/**
+ * Pack version into uint32_t.
+ * The highest byte or result means major version, next - minor,
+ * middle - patch, last - revision.
+ */
+static inline uint32_t
+version_id(unsigned major, unsigned minor, unsigned patch)
+{
+	return (((major << 8) | minor) << 8) | patch;
+}
+
+static inline unsigned
+version_id_major(uint32_t version_id)
+{
+	return (version_id >> 16) & 0xff;
+}
+
+static inline unsigned
+version_id_minor(uint32_t version_id)
+{
+	return (version_id >> 8) & 0xff;
+}
+
+static inline unsigned
+version_id_patch(uint32_t version_id)
+{
+	return version_id & 0xff;
+}
+
+
 /* header */
 enum tnt_header_key_t {
 	TNT_CODE      = 0x00,
@@ -122,4 +154,6 @@ void php_tp_reencode_length(smart_string *str, char *sz);
 
 int convert_iter_str(const char *i, size_t i_len);
 
+uint32_t php_tp_verify_greetings(char *greetingbuf);
+
 #endif /* PHP_TNT_PROTO_H */