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

Merge pull request #5111 from AlanCoding/no_stdout_censor

Browse Source 
Disable standard out censoring
This commit is contained in:
Alan Rominger
2017-02-01 13:26:41 -05:00
committed by GitHub
parent 3b578b732a 0588fa9f16
commit ceef65b63a
2 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx/main/models/jobs.py
View File

@@ -31,7 +31,6 @@ from awx.main.utils import (
ignore_inventory_computed_fields, ignore_inventory_computed_fields,
parse_yaml_or_json, parse_yaml_or_json,
) )
from awx.main.redact import PlainTextCleaner
from awx.main.fields import ImplicitRoleField from awx.main.fields import ImplicitRoleField
from awx.main.models.mixins import ResourceMixin, SurveyJobTemplateMixin, SurveyJobMixin from awx.main.models.mixins import ResourceMixin, SurveyJobTemplateMixin, SurveyJobMixin
from awx.main.models.base import PERM_INVENTORY_SCAN from awx.main.models.base import PERM_INVENTORY_SCAN
@@ -601,28 +600,6 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin):
return "$hidden due to Ansible no_log flag$" return "$hidden due to Ansible no_log flag$"
return artifacts return artifacts
def _survey_search_and_replace(self, content):
# Use job template survey spec to identify password fields.
# Then lookup password fields in extra_vars and save the values
job_extra_vars = self.extra_vars_dict
password_list = [job_extra_vars[k] for k in self.survey_passwords.keys()
if k in job_extra_vars]
return_content = content
for val in password_list:
if len(val) == 0:
continue # avoids memory errors
return_content = PlainTextCleaner.remove_sensitive(return_content, val)
return return_content
def _result_stdout_raw_limited(self, *args, **kwargs):
buff, start, end, abs_end = super(Job, self)._result_stdout_raw_limited(*args, **kwargs)
return self._survey_search_and_replace(buff), start, end, abs_end
def _result_stdout_raw(self, *args, **kwargs):
content = super(Job, self)._result_stdout_raw(*args, **kwargs)
return self._survey_search_and_replace(content)
# Job Credential required # Job Credential required
@property @property
def can_start(self): def can_start(self):

27
awx/main/tests/unit/models/test_survey_models.py
View File

@@ -59,33 +59,6 @@ def test_survey_passwords_not_in_extra_vars():
} }
@pytest.mark.survey
def test_survey_passwords_not_in_stdout(job_with_survey):
job_with_survey.survey_passwords['has_blank_value'] = '$encrypted$'
job_with_survey.extra_vars = json.dumps({
'has_blank_value': '',
'secret_key': '6kQngg3h8lgiSTvIEb21',
'SSN': '123-45-6789'})
example_stdout = '''
PLAY [all] *********************************************************************
TASK [debug] *******************************************************************
ok: [webserver45] => {
"msg": "Helpful echo of your secret_key: secret_key=6kQngg3h8lgiSTvIEb21 "
}
TASK [debug] *******************************************************************
ok: [webserver46] => {
"msg": "Helpful echo of your secret_key: secret_key=123-45-6789 "
}
'''
display_stdout = job_with_survey._survey_search_and_replace(example_stdout)
assert display_stdout == example_stdout.replace(
'6kQngg3h8lgiSTvIEb21', '$encrypted$').replace('123-45-6789', '$encrypted$')
assert type(display_stdout) == type(example_stdout)
def test_job_safe_args_redacted_passwords(job): def test_job_safe_args_redacted_passwords(job):
"""Verify that safe_args hides passwords in the job extra_vars""" """Verify that safe_args hides passwords in the job extra_vars"""
kwargs = {'ansible_version': '2.1'} kwargs = {'ansible_version': '2.1'}