Fixes bug with schemaid in header + closes gh-44

Author: bigbes

src/tarantool.c

@@ -812,11 +812,11 @@ PHP_METHOD(tarantool_class, authenticate) {
 	char *login; int login_len;
 	char *passwd; int passwd_len;
 
-	TARANTOOL_PARSE_PARAMS(id, "ss", &login, &login_len,
+	TARANTOOL_PARSE_PARAMS(id, "s|s", &login, &login_len,
 			&passwd, &passwd_len);
 	TARANTOOL_FETCH_OBJECT(obj, id);
 	obj->login = pestrdup(login, 1);
-	obj->passwd = estrdup(passwd);
+	obj->passwd = (passwd ? estrdup(passwd) : NULL);
 	TARANTOOL_CONNECT_ON_DEMAND(obj, id);
 
 	__tarantool_authenticate(obj);
@@ -974,7 +974,7 @@ PHP_METHOD(tarantool_class, delete) {
 	key_new = pack_key(key, 0);
 
 	long sync = TARANTOOL_G(sync_counter)++;
-	php_tp_encode_delete(obj->value, sync, space_no, index_no, key);
+	php_tp_encode_delete(obj->value, sync, space_no, index_no, key_new);
 	if (key != key_new) {
 		zval_ptr_dtor(&key_new);
 	}

src/tarantool_proto.c

@@ -21,14 +21,14 @@ static void php_tp_pack_header(smart_str *str, size_t size,
 	php_mp_pack_long(str, sync);
 }
 
-size_t php_tp_sizeof_auth(uint32_t sync, size_t ulen, zend_bool guest) {
+size_t php_tp_sizeof_auth(uint32_t sync, size_t ulen, zend_bool nopass) {
 	size_t val = php_tp_sizeof_header(TNT_AUTH, sync) +
 		     php_mp_sizeof_hash(2)               +
 		     php_mp_sizeof_long(TNT_USERNAME)    +
 		     php_mp_sizeof_string(ulen)          +
 		     php_mp_sizeof_long(TNT_TUPLE)       +
-		     php_mp_sizeof_array((guest ? 0 : 2));
-	if (!guest) {
+		     php_mp_sizeof_array((nopass ? 0 : 2));
+	if (!nopass) {
 		val += php_mp_sizeof_string(9)      +
 		php_mp_sizeof_string(PHP_SCRAMBLE_SIZE) ;
 	}
@@ -41,17 +41,17 @@ void php_tp_encode_auth(
 		char * const username,
 		size_t username_len,
 		char * const scramble) {
-	zend_bool guest = (strncmp(username, "guest", 6) == 0);
-	size_t packet_size = php_tp_sizeof_auth(sync, username_len, guest);
+	zend_bool nopass = (zend_bool )(scramble != NULL);
+	size_t packet_size = php_tp_sizeof_auth(sync, username_len, nopass);
 	smart_str_ensure(str, packet_size + 5);
 	php_tp_pack_header(str, packet_size, TNT_AUTH, sync);
 
 	php_mp_pack_hash(str, 2);
 	php_mp_pack_long(str, TNT_USERNAME);
 	php_mp_pack_string(str, username, username_len);
 	php_mp_pack_long(str, TNT_TUPLE);
-	php_mp_pack_array(str, (guest ? 0 : 2));
-	if (!guest) {
+	php_mp_pack_array(str, (nopass ? 0 : 2));
+	if (!nopass) {
 		php_mp_pack_string(str, "chap-sha1", 9);
 		php_mp_pack_string(str, scramble, PHP_SCRAMBLE_SIZE);
 	}

src/third_party/tp.h

@@ -1273,7 +1273,8 @@ tp_scramble_prepare(void *out, const void *salt, const void *password,
 static inline char *
 tp_auth(struct tp *p, const char *salt_base64, const char *user, int ulen, const char *pass, int plen)
 {
-	char guest = (strncmp(user, "guest", 6) == 0);
+	//char guest = (strncmp(user, "guest", 6) == 0);
+	char nopass = (plen == 0);
 	int sz = 5 +
 		mp_sizeof_map(2) +
 		mp_sizeof_uint(TP_CODE) +
@@ -1284,7 +1285,7 @@ tp_auth(struct tp *p, const char *salt_base64, const char *user, int ulen, const
 		mp_sizeof_uint(TP_USERNAME) +
 		mp_sizeof_str(ulen) +
 		mp_sizeof_uint(TP_TUPLE);
-	if (!guest)
+	if (!nopass)
 		sz += mp_sizeof_array(2) +
 		      mp_sizeof_str(0) +
 		      mp_sizeof_str(SCRAMBLE_SIZE);
@@ -1305,7 +1306,7 @@ tp_auth(struct tp *p, const char *salt_base64, const char *user, int ulen, const
 	h = mp_encode_uint(h, TP_USERNAME);
 	h = mp_encode_str(h, user, ulen);
 	h = mp_encode_uint(h, TP_TUPLE);
-	if (!guest) {
+	if (!nopass) {
 		h = mp_encode_array(h, 2);
 		h = mp_encode_str(h, 0, 0);
 
@@ -1698,8 +1699,6 @@ tp_reply(struct tpresponse *r, const char * const buf, size_t size)
 				return -1;
 			r->code = mp_decode_uint(&p);
 			break;
-		default:
-			return -1;
 		}
 		r->bitmap |= (1ULL << key);
 	}
@@ -1716,23 +1715,21 @@ tp_reply(struct tpresponse *r, const char * const buf, size_t size)
 	while (n-- > 0) {
 		uint32_t key = mp_decode_uint(&p);
 		switch (key) {
-		case TP_ERROR: {
+		case TP_ERROR:
 			if (mp_typeof(*p) != MP_STR)
 				return -1;
 			uint32_t elen = 0;
 			r->error = mp_decode_str(&p, &elen);
 			r->error_end = r->error + elen;
 			break;
-		}
-		case TP_DATA: {
+		case TP_DATA:
 			if (mp_typeof(*p) != MP_ARRAY)
 				return -1;
 			r->data = p;
 			mp_next(&p);
 			r->data_end = p;
 			break;
 		}
-		}
 		r->bitmap |= (1ULL << key);
 	}
 	if (r->data) {

test/CreateTest.php

@@ -96,4 +96,25 @@ public function test_06_bad_cridentials()
         $this->assertTrue($c->ping());
         $c->authenticate('test', 'bad_password');
     }
+
+    /**
+     * @expectedException Exception
+     * @expectedExceptionMessage Query error
+     */
+    public function test_07_bad_guest_cridentials()
+    {
+        $c = new Tarantool('localhost', self::$port);
+        $c->connect();
+        $this->assertTrue($c->ping());
+        $c->authenticate('guest', 'guest');
+    }
+
+    public function test_08_good_cridentials()
+    {
+        $c = new Tarantool('localhost', self::$port);
+        $c->connect();
+        $this->assertTrue($c->ping());
+        $c->authenticate('guest');
+        $this->assertTrue($c->ping());
+    }
 }