diff options
| author | Alvaro Lopez Garcia <aloga@ifca.unican.es> | 2016-06-20 12:37:22 +0200 |
|---|---|---|
| committer | Alvaro Lopez Garcia <aloga@ifca.unican.es> | 2016-06-21 06:56:23 +0000 |
| commit | 1de4c66009485b6e42791ac84684da7b5a1f0736 (patch) | |
| tree | 24a7baaa14e5c9399bbf16ff5ed09ab5a0dc6b43 /openstackclient/common | |
| parent | 7cda2b2a066cd45c7aeb9a6d92c1a83e49d48128 (diff) | |
| download | python-openstackclient-1de4c66009485b6e42791ac84684da7b5a1f0736.tar.gz | |
Improve masking of secrets in configuration show
The command "configuration show" tries to redact some of the secrets
that are shown on the screen. However, this failed redacting options
that were marked as secrete by the auth plugins (if any) and it redacted
other options that were not redacted at all. For example, when using
the OpenID Connect plugins, it redacted the "access_token_endpoint" as
the word "token" appears there, but it failed to redact "client_secret"
even when this option is marked as secret in the corresponding plugin.
Change-Id: Idfad4fbbe5ddcff5e729e1dcd756d0379ad31dee
Diffstat (limited to 'openstackclient/common')
| -rw-r--r-- | openstackclient/common/configuration.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/openstackclient/common/configuration.py b/openstackclient/common/configuration.py index d6e2ab45..016e9191 100644 --- a/openstackclient/common/configuration.py +++ b/openstackclient/common/configuration.py @@ -13,6 +13,7 @@ """Configuration action implementations""" +from keystoneauth1.loading import base from osc_lib.command import command import six @@ -44,12 +45,13 @@ class ShowConfiguration(command.ShowOne): def take_action(self, parsed_args): + auth_plg_name = self.app.client_manager.auth_plugin_name + secret_opts = [o.dest for o in base.get_plugin_options(auth_plg_name) + if o.secret] + info = self.app.client_manager.get_configuration() for key, value in six.iteritems(info.pop('auth', {})): - if parsed_args.mask: - if 'password' in key.lower(): - value = REDACTED - if 'token' in key.lower(): + if parsed_args.mask and key.lower() in secret_opts: value = REDACTED info['auth.' + key] = value return zip(*sorted(six.iteritems(info))) |