External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4745 from wwitzel3/release_3.1.0

Browse Source 
remove extra censoring code from tower, not needed since Ansible 2.1+
This commit is contained in:
Wayne Witzel III
2017-01-16 20:29:44 -05:00
committed by GitHub
parent 67b9960d5a 9592c67c31
commit 8625d670ac
1 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
awx/lib/tower_display_callback/module.py
View File

@@ -19,8 +19,6 @@ from __future__ import (absolute_import, division, print_function)
# Python # Python
import contextlib import contextlib
import copy
import re
import sys import sys
import uuid import uuid
@@ -77,41 +75,11 @@ class BaseCallbackModule(CallbackBase):
super(BaseCallbackModule, self).__init__() super(BaseCallbackModule, self).__init__()
self.task_uuids = set() self.task_uuids = set()
def censor_result(self, res, no_log=False):
if not isinstance(res, dict):
if no_log:
return "the output has been hidden due to the fact that 'no_log: true' was specified for this result"
return res
if res.get('_ansible_no_log', no_log):
new_res = {}
for k in self.CENSOR_FIELD_WHITELIST:
if k in res:
new_res[k] = res[k]
if k == 'cmd' and k in res:
if isinstance(res['cmd'], list):
res['cmd'] = ' '.join(res['cmd'])
if re.search(r'\s', res['cmd']):
new_res['cmd'] = re.sub(r'^(([^\s\\]|\\\s)+).*$',
r'\1 <censored>',
res['cmd'])
new_res['censored'] = "the output has been hidden due to the fact that 'no_log: true' was specified for this result"
res = new_res
if 'results' in res:
if isinstance(res['results'], list):
for i in xrange(len(res['results'])):
res['results'][i] = self.censor_result(res['results'][i], res.get('_ansible_no_log', no_log))
elif res.get('_ansible_no_log', False):
res['results'] = "the output has been hidden due to the fact that 'no_log: true' was specified for this result"
return res
@contextlib.contextmanager @contextlib.contextmanager
def capture_event_data(self, event, **event_data): def capture_event_data(self, event, **event_data):
event_data.setdefault('uuid', str(uuid.uuid4())) event_data.setdefault('uuid', str(uuid.uuid4()))
if 'res' in event_data:
event_data['res'] = self.censor_result(copy.copy(event_data['res']))
if event not in self.EVENTS_WITHOUT_TASK: if event not in self.EVENTS_WITHOUT_TASK:
task = event_data.pop('task', None) task = event_data.pop('task', None)
else: else:
@@ -258,7 +226,7 @@ class BaseCallbackModule(CallbackBase):
if task_uuid in self.task_uuids: if task_uuid in self.task_uuids:
# FIXME: When this task UUID repeats, it means the play is using the # FIXME: When this task UUID repeats, it means the play is using the
# free strategy, so different hosts may be running different tasks # free strategy, so different hosts may be running different tasks
# within a play. # within a play.
return return
self.task_uuids.add(task_uuid) self.task_uuids.add(task_uuid)
self.set_task(task) self.set_task(task)