From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 30 Nov 2020 11:50:27 +0000 (+0000)
Subject: [Minor] Allow to ask password from terminal
X-Git-Tag: 2.7~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a712a329f217418b5393764d644362164ef0ca5;p=thirdparty%2Frspamd.git

[Minor] Allow to ask password from terminal
---

diff --git a/lualib/rspamadm/clickhouse.lua b/lualib/rspamadm/clickhouse.lua
index f8f3396546..d1bbbef1ab 100644
--- a/lualib/rspamadm/clickhouse.lua
+++ b/lualib/rspamadm/clickhouse.lua
@@ -38,9 +38,14 @@ parser:option '-d --database'
 parser:flag '--no-ssl-verify'
       :description 'Disable SSL verification'
       :argname('no_ssl_verify')
-parser:option '-p --password'
-      :description 'Password to use for Clickhouse'
-      :argname('password')
+parser:mutex(
+    parser:option '-p --password'
+          :description 'Password to use for Clickhouse'
+          :argname('password'),
+    parser:flag '-a --ask-password'
+          :description 'Ask password from the terminal'
+          :argname('ask_password')
+)
 parser:option '-s --server'
       :description 'Address[:port] to connect to Clickhouse with'
       :argname('server')
@@ -228,6 +233,13 @@ local function handler(args)
   load_config(cmd_opts.config_file)
   local cfg_opts = rspamd_config:get_all_opt('clickhouse')
 
+  if cmd_opts.ask_password then
+    local rspamd_util = require "rspamd_util"
+
+    io.write('Password: ')
+    cmd_opts.password = rspamd_util.readpassphrase()
+  end
+
   local function override_settings(params)
     for _, which in ipairs(params) do
       if cmd_opts[which] == nil then