[stable-2.7] Redact sensitive values by default in ansible-test.

(cherry picked from commit 0631e057e9)

Co-authored-by: Matt Clay <matt@mystile.com>.
pull/62459/head
Matt Clay 6 years ago committed by Toshio Kuratomi
parent 9f2acf2f2a
commit dec03d06c8

@ -0,0 +1,2 @@
minor_changes:
- ansible-test defaults to redacting sensitive values (disable with the ``--no-redact`` option)

@ -177,8 +177,15 @@ def parse_args():
common.add_argument('--redact',
dest='redact',
action='store_true',
default=True,
help='redact sensitive values in output')
common.add_argument('--no-redact',
dest='redact',
action='store_false',
default=False,
help='show sensitive values in output')
test = argparse.ArgumentParser(add_help=False, parents=[common])
test.add_argument('include',

@ -461,6 +461,7 @@ def filter_options(args, argv, options, exclude, require):
options['--requirements'] = 0
options['--truncate'] = 1
options['--redact'] = 0
options['--no-redact'] = 0
if isinstance(args, TestConfig):
options.update({
@ -520,3 +521,5 @@ def filter_options(args, argv, options, exclude, require):
if args.redact:
yield '--redact'
else:
yield '--no-redact'

@ -604,7 +604,7 @@ class Display(object):
self.rows = 0
self.columns = 0
self.truncate = 0
self.redact = False
self.redact = True
self.sensitive = set()
if os.isatty(0):
@ -671,6 +671,9 @@ class Display(object):
"""
if self.redact and self.sensitive:
for item in self.sensitive:
if not item:
continue
message = message.replace(item, '*' * len(item))
if truncate:
@ -757,9 +760,6 @@ class CommonConfig(object):
self.truncate = args.truncate # type: int
self.redact = args.redact # type: bool
if is_shippable():
self.redact = True
def docker_qualify_image(name):
"""

Loading…
Cancel
Save