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 1CBF56EC40; Fri, 4 Jun 2021 13:49:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1CBF56EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1622803742; bh=nXJiOV0ZYlH45JhkQOu0hVdIvEdONJwcjy6/MQSAnqE=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=xc2TuMeQsUSUDNY1xLmw9k27HdUqcvMnW1+BgR3h29NmBifi6DCkYd8v7mybiTN4Z m7DP29PI9WcH/RMsq9qsL+tGW+wAQNcFMYjoOn2KJ22148Rjpuc0qe7dJodPJgGAwS 7YYxBKKF4ASnDPdsQ9vGoPS6aH4tGEonRCaNyURQ= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 1F0A86EC40 for ; Fri, 4 Jun 2021 13:49:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1F0A86EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lp7Ns-0006ZT-DU; Fri, 04 Jun 2021 13:49:00 +0300 To: tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 4 Jun 2021 13:49:00 +0300 Message-Id: <914c02c99c616bef3d5ff87306c79a7921dfeec7.1622803707.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C544BBC2A69B1B4100B389BF69B7A224D7C182A05F53808504059929CF313424A2353A401A37BC57B5459267B3F3F561E5011CB6EFB1328D87B X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70F1463317FA92A59C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE737AE489DBC023F2AEA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BD6CF32B5F8F9D404296EAC0680165520F556C34375BBD62ACC7F00164DA146DAFE8445B8C89999728AA50765F7900637F3E38EE449E3E2AE389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC80CABCCA60F52D7EBF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8BDC0F6C5B2EEF3D0C75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CC176FDF34A1E429F0D317173F94FF2BCBAEFA6314E8FA3D89C2B6934AE262D3EE7EAB7254005DCED0E6F8C16B49E17FC1E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0CCA28C6D779E2CD78E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34EB7BD66E9101C1007DC8C883B8B957D9FBDE8290107C6084E19215CBEF9FB46E684DE889EE61FD1A1D7E09C32AA3244C0E86D1E4A59CBF969B4C365969D5E629408A6A02710B7304729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojz99asgmzejonj+qRWEqshA== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822154E1AE3F944824110959459205C9DE383D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [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: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 --- 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..d92376650 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; 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; -- 2.25.1