From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 203ED6EC40; Fri, 4 Jun 2021 12:57:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 203ED6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1622800656; bh=zeE9aoBf3W10BT3z81ecADW//i2mKkIGbHtG2oeawWQ=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=KXyQhGcp0WsfEtUvrYvaqTFWkwMrd3FbkjmO441K1NTV217gPTmsA8zlCqxflUXkI XemMhqus83/F/x2vSS4I7QcAP0mTm0CJwsQg0eh1TueUGZwT97x1WgmOtUcND6NUPT jihXrr/A+AfGrGqLeC6CBX5rMVdHpdUynA9rcyr4= Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) (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 386E96EC40 for ; Fri, 4 Jun 2021 12:57:35 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 386E96EC40 Received: by smtp53.i.mail.ru with esmtpa (envelope-from ) id 1lp6a6-0000tc-EN; Fri, 04 Jun 2021 12:57:34 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <4fef21459158c16b993e0f72db337674129834df.1622735576.git.imeevma@gmail.com> Message-ID: <3e5643e5-1b53-e012-5f66-9e0e152a14f5@tarantool.org> Date: Fri, 4 Jun 2021 12:57:34 +0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <4fef21459158c16b993e0f72db337674129834df.1622735576.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C54907A7AE9C1BA82BC67C1327DFB87C6A6182A05F538085040560B48C6E64EDF539734929C3E40776B02C863834711A36F211CFB81389B0F55 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72C932D6B54DFB189EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637BBCE7257090F96C9EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BD6CF32B5F8F9D404A011DC44B16CE4955AD73F76BD150E19CC7F00164DA146DAFE8445B8C89999728AA50765F7900637D0FEED2715E18529389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8989FD0BDF65E50FBF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C68E4D7E803FA7AD5302FCEF25BFAB3454AD6D5ED66289B52698AB9A7B718F8C46E0066C2D8992A16725E5C173C3A84C3DA7CC99C9BF7BEABBA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7D699F3A2029486C7731C566533BA786AA5CC5B56E945C8DA X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24209795067102C07E8F7B195E1C978313BD5BB58E9AF32594EBAF99501702FC7 X-C1DE0DAB: 0D63561A33F958A5D776F22D821926D609B89BACFB3D91EDBC34BAFF3CD3A474D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75FBC5FED0552DA851410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346AD04FDA812EEFF139400EB30E04F3BD655FA20493D0F45E10D131D8105F1216440E68A01FFB50371D7E09C32AA3244C02047E8FD5C6A04E9DD5E820FAE777C469B6CAE0477E908D729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojz99asgmzejr1HJtjQv0Iag== X-Mailru-Sender: 583F1D7ACE8F49BD9DF7A8DAE6E2B08A32FD6F8874775BE4BB405A20885B65F28D66320A830F5C9A424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 1/1] box: check STRING length when it is cast to UUID X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Serge Petrenko via Tarantool-patches Reply-To: Serge Petrenko Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 03.06.2021 18:54, imeevma@tarantool.org пишет: > After this patch, the tt_uuid_from_strl() function will check the length > of the given string before converting it to a UUID. > > Follow up #5886 Hi! Thanks for the patch! Please, find one comment below. > --- > https://github.com/tarantool/tarantool/issues/5886 > https://github.com/tarantool/tarantool/tree/imeevma/gh-5886-follow-up > > src/lib/uuid/tt_uuid.c | 2 ++ > test/sql-tap/uuid.test.lua | 19 ++++++++++++++++++- > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/src/lib/uuid/tt_uuid.c b/src/lib/uuid/tt_uuid.c > index 8bc9bc7af..6bdf2014a 100644 > --- a/src/lib/uuid/tt_uuid.c > +++ b/src/lib/uuid/tt_uuid.c > @@ -98,6 +98,8 @@ tt_uuid_str(const struct tt_uuid *uu) > int > tt_uuid_from_strl(const char *in, size_t len, struct tt_uuid *uu) > { > + if (len != UUID_STR_LEN) > + return -1; tt_uuid_from_string() returns '1' in case of an error, so let's stay consistent here. > char buf[UUID_STR_LEN + 1]; > snprintf(buf, sizeof(buf), "%.*s", (int) len, in); > return tt_uuid_from_string(buf, uu); > diff --git a/test/sql-tap/uuid.test.lua b/test/sql-tap/uuid.test.lua > index 83fcc3d0e..77ba06c2d 100755 > --- a/test/sql-tap/uuid.test.lua > +++ b/test/sql-tap/uuid.test.lua > @@ -3,7 +3,7 @@ local build_path = os.getenv("BUILDDIR") > package.cpath = build_path..'/test/sql-tap/?.so;'..build_path..'/test/sql-tap/?.dylib;'..package.cpath > > local test = require("sqltester") > -test:plan(145) > +test:plan(147) > > local uuid = require("uuid") > local uuid1 = uuid.fromstr("11111111-1111-1111-1111-111111111111") > @@ -1316,6 +1316,23 @@ test:do_execsql_test( > true > }) > > +-- Make sure STRING of wrong length cannot be cast to UUID. > +test:do_catchsql_test( > + "uuid-17.1", > + [[ > + SELECT CAST('11111111-1111-1111-1111-111111111111111222222222' AS UUID); > + ]], { > + 1, "Type mismatch: can not convert 11111111-1111-1111-1111-111111111111111222222222 to uuid" > + }) > + > +test:do_catchsql_test( > + "uuid-17.2", > + [[ > + SELECT CAST('11111111-1111-1111-1111-11111' AS UUID); > + ]], { > + 1, "Type mismatch: can not convert 11111111-1111-1111-1111-11111 to uuid" > + }) > + > test:execsql([[ > DROP TRIGGER t; > DROP VIEW v; -- Serge Petrenko