Fix manila logging rabbitmq password in debug mode

Manila will display the rabbitmq password if debugging is enabled.
This patch will ensure that the rabbitmq password is no longer
displayed in the connection log for Manila when debugging is
enabled by looking for the rabbitmq key and not printing it.

There should likely be an effort to utilize Oslo's secret flag for
options to truly fix this issue for this and other sensitive options.

Change-Id: I97cc88354d9b54057350c70c4742055197540d1a
Closes-Bug: 1750074
(cherry picked from commit 05e4f14ea1)
(cherry picked from commit be8580b350)
This commit is contained in:
Dustin Schoenbrun 2018-02-21 10:53:41 -05:00 committed by Tom Barron
parent dc13b22ec2
commit c0f1af11b1
2 changed files with 5 additions and 0 deletions

View File

@ -393,6 +393,7 @@ def wait():
# hide flag contents from log if contains a password
# should use secret flag when switch over to openstack-common
if ("_password" in flag or "_key" in flag or
(flag == "transport_url" and "rabbit:" in flag_get) or
(flag == "sql_connection" and "mysql:" in flag_get)):
LOG.debug('%(flag)s : FLAG SET ', {"flag": flag})
else:

View File

@ -0,0 +1,4 @@
---
fixes:
- rabbitmq password is no longer exposed in the logs when debugging is
enabled.