From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [94.100.177.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id A5E2E46970E for ; Thu, 16 Jan 2020 11:41:27 +0300 (MSK) From: Chris Sosnin Date: Thu, 16 Jan 2020 11:41:25 +0300 Message-Id: <20200116084125.28506-1-k.sosnin@tarantool.org> In-Reply-To: <20200115165621.GB82780@tarantool.org> References: <20200115165621.GB82780@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [Tarantool-patches] [PATCH] sql: allow accessing list of collations via pragma List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: korablev@tarantool.org Cc: tarantool-patches@dev.tarantool.org Hi! Thank you for the review! > Content returned by 'pragma collation_list' is already verified in > sql-tap/collation.test.lua. So I guess it is enough to check that > box.execute("pragma collation_list") does not throw an error. I'm sorry, didn't notice such test exists. I changed the patch so it only checks for an error: +-- gh-4713 "PRAGMA collation_list" is not accessible to all users +_, err = box.execute('pragma collation_list') +assert(err == nil) See the whole patch below. 'pragma collation_list' uses _collation space, although user may have no access to it. Thus, we replace it with the corresponding view. Closes #4713 --- branch: https://github.com/tarantool/tarantool/tree/ksosnin/gh-4713-pragma-collation-list issue: https://github.com/tarantool/tarantool/issues/4713 src/box/sql/pragma.c | 2 +- test/sql/collation.result | 10 ++++++---- test/sql/collation.test.lua | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/box/sql/pragma.c b/src/box/sql/pragma.c index 28ba64500..636f519ef 100644 --- a/src/box/sql/pragma.c +++ b/src/box/sql/pragma.c @@ -241,7 +241,7 @@ sql_pragma_collation_list(struct Parse *parse_context) char key_buf[16]; char *key_end = mp_encode_array(key_buf, 0); box_tuple_t *tuple; - box_iterator_t *it = box_index_iterator(BOX_COLLATION_ID, 0, ITER_ALL, + box_iterator_t *it = box_index_iterator(BOX_VCOLLATION_ID, 0, ITER_ALL, key_buf, key_end); if (it == NULL) { parse_context->is_aborted = true; diff --git a/test/sql/collation.result b/test/sql/collation.result index 4e43a7cb7..4e4c27ef0 100644 --- a/test/sql/collation.result +++ b/test/sql/collation.result @@ -360,11 +360,13 @@ box.schema.user.create('tmp') box.session.su('tmp') --- ... --- Error: read access to space is denied. -box.execute("pragma collation_list") +-- gh-4713 "PRAGMA collation_list" is not accessible to all users +_, err = box.execute('pragma collation_list') --- -- null -- Read access to space '_collation' is denied for user 'tmp' +... +assert(err == nil) +--- +- true ... box.session.su('admin') --- diff --git a/test/sql/collation.test.lua b/test/sql/collation.test.lua index 9a2042c09..407fc19dc 100644 --- a/test/sql/collation.test.lua +++ b/test/sql/collation.test.lua @@ -103,8 +103,9 @@ box.schema.user.revoke('guest', 'read,write,execute', 'universe') -- gh-3857 "PRAGMA collation_list" invokes segmentation fault. box.schema.user.create('tmp') box.session.su('tmp') --- Error: read access to space is denied. -box.execute("pragma collation_list") +-- gh-4713 "PRAGMA collation_list" is not accessible to all users +_, err = box.execute('pragma collation_list') +assert(err == nil) box.session.su('admin') box.schema.user.drop('tmp') -- 2.21.0 (Apple Git-122.2)