From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 14 Aug 2018 12:25:40 +0000 (+0300)
Subject: doveconf: Improve secret hiding
X-Git-Tag: 2.3.9~1561
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd91ae59afbfcf1fb8b7ffec6fe71f5e7178bee7;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: Improve secret hiding

Hide with more wide filtering.
---

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index 13eb492592..709a53188f 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -255,8 +255,8 @@ hide_secrets_from_value(struct ostream *output, const char *key,
 	const char *ptr, *optr, *secret;
 	if (*value != '\0' &&
 	    (key_ends_with(key, value, "_password") ||
-	     key_ends_with(key, value, "_api_key") ||
-	     str_begins(key, "ssl_key") ||
+	     key_ends_with(key, value, "_key") ||
+	     key_ends_with(key, value, "_nonce") ||
 	     str_begins(key, "ssl_dh"))) {
 		o_stream_nsend_str(output, "# hidden, use -P to show it");
 		return TRUE;