From ff7d8f86667758c62ca44d3411619db63db80690 Mon Sep 17 00:00:00 2001
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Date: Sat, 7 Sep 2019 15:18:29 +0200
Subject: [PATCH] box: raise an error on nil replicaset and instance uuid
Before the patch the nil UUID was ignored and a new random one
was generated. This was because internally box treats nil UUID
as its absence.
Now a user will see an explicit message that nil UUID is a
reserved value.
Closes #4282
(cherry picked from commit a8ebd334ee80a2ded9341fadf2d160ce52164308)
---
src/box/box.cc | 25 +++++++++++++++++--------
test/app-tap/cfg.test.lua | 12 +++++++++++-
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/box/box.cc b/src/box/box.cc
index 7041d647e1..be23903350 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -471,22 +471,31 @@ box_check_replication_sync_timeout(void)
return timeout;
}
+static inline void
+box_check_uuid(struct tt_uuid *uuid, const char *name)
+{
+ *uuid = uuid_nil;
+ const char *uuid_str = cfg_gets(name);
+ if (uuid_str == NULL)
+ return;
+ if (tt_uuid_from_string(uuid_str, uuid) != 0)
+ tnt_raise(ClientError, ER_CFG, name, uuid_str);
+ if (tt_uuid_is_nil(uuid)) {
+ tnt_raise(ClientError, ER_CFG, name,
+ tt_sprintf("nil UUID is reserved"));
+ }
+}
+
static void
box_check_instance_uuid(struct tt_uuid *uuid)
{
- *uuid = uuid_nil;
- const char *uuid_str = cfg_gets("instance_uuid");
- if (uuid_str != NULL && tt_uuid_from_string(uuid_str, uuid) != 0)
- tnt_raise(ClientError, ER_CFG, "instance_uuid", uuid_str);
+ box_check_uuid(uuid, "instance_uuid");
}
static void
box_check_replicaset_uuid(struct tt_uuid *uuid)
{
- *uuid = uuid_nil;
- const char *uuid_str = cfg_gets("replicaset_uuid");
- if (uuid_str != NULL && tt_uuid_from_string(uuid_str, uuid) != 0)
- tnt_raise(ClientError, ER_CFG, "replicaset_uuid", uuid_str);
+ box_check_uuid(uuid, "replicaset_uuid");
}
static enum wal_mode
diff --git a/test/app-tap/cfg.test.lua b/test/app-tap/cfg.test.lua
index a2cbed8dde..ba6b735abb 100755
--- a/test/app-tap/cfg.test.lua
+++ b/test/app-tap/cfg.test.lua
@@ -3,7 +3,17 @@ local fiber = require('fiber')
local tap = require('tap')
local test = tap.test("cfg")
-test:plan(9)
+test:plan(11)
+
+--
+-- gh-4282: box.cfg should not allow nor just ignore nil UUID.
+-- It is a special reserved value.
+--
+local nil_uuid = '00000000-0000-0000-0000-000000000000'
+local ok = pcall(box.cfg, {instance_uuid = nil_uuid})
+test:ok(not ok, 'nil instance UUID is not allowed')
+ok, err = pcall(box.cfg, {replicaset_uuid = nil_uuid})
+test:ok(not ok, 'nil replicaset UUID is not allowed')
test:is(type(box.ctl), "table", "box.ctl is available before box.cfg")
test:is(type(box.ctl.wait_ro), "function", "box.ctl.wait_ro is available")
--
GitLab