Tarantool development patches archive
 help / color / mirror / Atom feed
* [Tarantool-patches] [PATCH] box: replication shouldn't leak user password
@ 2019-12-12 21:25 Maria
  2019-12-17 21:56 ` Vladislav Shpilevoy
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Maria @ 2019-12-12 21:25 UTC (permalink / raw)
  To: tarantool-patches, georgy, alexander.turenko, v.shpilevoy

It was possible to leak user password through setting 'replication'
configuration option in first box.cfg invocation. This happened due
to unconditional logging in load_cfg function. The patch introduces
conditional logging.

Closes #4493
---
Issue:
https://github.com/tarantool/tarantool/issues/4493
Branch:
https://github.com/tarantool/tarantool/tree/eljashm/gh-4493-box.cfg-log-may-leak-passwords

 src/box/lua/load_cfg.lua   |  3 +++
 test/box/load_cfg.result   | 37 +++++++++++++++++++++++++++++++++++++
 test/box/load_cfg.test.lua | 14 ++++++++++++++
 test/box/lua/cfg_test6.lua | 10 ++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 test/box/load_cfg.result
 create mode 100644 test/box/load_cfg.test.lua
 create mode 100644 test/box/lua/cfg_test6.lua

diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index 85617c8f0..5aa6ce703 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -548,6 +548,9 @@ local function load_cfg(cfg)
                 fun()
             end
             if not compare_cfg(val, default_cfg[key]) then
+                if log_cfg_option[key] ~= nil then
+                    val = log_cfg_option[key](val)
+                end
                 log.info("set '%s' configuration option to %s", key, json.encode(val))
             end
         end
diff --git a/test/box/load_cfg.result b/test/box/load_cfg.result
new file mode 100644
index 000000000..0abffd409
--- /dev/null
+++ b/test/box/load_cfg.result
@@ -0,0 +1,37 @@
+-- test-run result file version 2
+env = require('test_run')
+ | ---
+ | ...
+test_run = env.new()
+ | ---
+ | ...
+
+--
+-- gh-4493: Replication user password may leak to logs
+--
+test_run:cmd('create server cfg_tester7 with script = "box/lua/cfg_test6.lua"')
+ | ---
+ | - true
+ | ...
+test_run:cmd("start server cfg_tester7")
+ | ---
+ | - true
+ | ...
+-- test there is replication log in log
+test_run:grep_log('cfg_tester7', 'set \'replication\' configuration option to', 1000)
+ | ---
+ | - set 'replication' configuration option to
+ | ...
+-- test there is no password in log
+test_run:grep_log('cfg_tester7', 'test-cluster-cookie', 1000)
+ | ---
+ | - null
+ | ...
+test_run:cmd("stop server cfg_tester7")
+ | ---
+ | - true
+ | ...
+test_run:cmd("cleanup server cfg_tester7")
+ | ---
+ | - true
+ | ...
diff --git a/test/box/load_cfg.test.lua b/test/box/load_cfg.test.lua
new file mode 100644
index 000000000..e0c3b361b
--- /dev/null
+++ b/test/box/load_cfg.test.lua
@@ -0,0 +1,14 @@
+env = require('test_run')
+test_run = env.new()
+
+--
+-- gh-4493: Replication user password may leak to logs
+--
+test_run:cmd('create server cfg_tester7 with script = "box/lua/cfg_test6.lua"')
+test_run:cmd("start server cfg_tester7")
+-- test there is replication log in log
+test_run:grep_log('cfg_tester7', 'set \'replication\' configuration option to', 1000)
+-- test there is no password in log
+test_run:grep_log('cfg_tester7', 'test-cluster-cookie', 1000)
+test_run:cmd("stop server cfg_tester7")
+test_run:cmd("cleanup server cfg_tester7")
diff --git a/test/box/lua/cfg_test6.lua b/test/box/lua/cfg_test6.lua
new file mode 100644
index 000000000..efcfc6f3e
--- /dev/null
+++ b/test/box/lua/cfg_test6.lua
@@ -0,0 +1,10 @@
+#!/usr/bin/env tarantool
+os = require('os')
+
+box.cfg{
+    listen = os.getenv("LISTEN"),
+    replication         = "admin:test-cluster-cookie@" .. os.getenv("LISTEN"),
+    replication_connect_timeout = 0.1,
+}
+
+require('console').listen(os.getenv('ADMIN'))
-- 
2.20.1 (Apple Git-117)

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-03-05  4:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-12 21:25 [Tarantool-patches] [PATCH] box: replication shouldn't leak user password Maria
2019-12-17 21:56 ` Vladislav Shpilevoy
2019-12-24 11:12   ` Maria Khaydich
2019-12-24 16:46     ` Vladislav Shpilevoy
2020-02-26 16:14 ` Igor Munkin
2020-03-03 17:26   ` Maria Khaydich
2020-03-05  4:49 ` Kirill Yukhin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox