External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3785 from AlanCoding/no_output_replacements

Browse Source 
Remove unused output_replacements logic

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-05-06 16:11:51 +00:00 committed by GitHub
commit 4dc7178f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
awx/main/tasks.py
View File

@ -694,8 +694,6 @@ class BaseTask(object):
"""Reload the model instance from the database and update the
given fields.
"""
output_replacements = updates.pop('output_replacements', None) or []
try:
with transaction.atomic():
# Retrieve the model instance.
@ -706,9 +704,6 @@ class BaseTask(object):
if updates:
update_fields = ['modified']
for field, value in updates.items():
if field in ('result_traceback'):
for srch, repl in output_replacements:
value = value.replace(srch, repl)
setattr(instance, field, value)
update_fields.append(field)
if field == 'status':
@ -728,7 +723,6 @@ class BaseTask(object):
return self.update_model(
pk,
_attempt=_attempt + 1,
output_replacements=output_replacements,
**updates
)
else:
@ -978,9 +972,6 @@ class BaseTask(object):
def build_cwd(self, instance, private_data_dir):
raise NotImplementedError
def build_output_replacements(self, instance, passwords={}):
return []
def build_credentials_list(self, instance):
return []
@ -1121,7 +1112,6 @@ class BaseTask(object):
self.instance.websocket_emit_status("running")
status, rc = 'error', None
output_replacements = []
extra_update_fields = {}
fact_modification_times = {}
self.event_ct = 0
@ -1167,9 +1157,6 @@ class BaseTask(object):
passwords = self.build_passwords(self.instance, kwargs)
self.build_extra_vars_file(self.instance, private_data_dir, passwords)
args = self.build_args(self.instance, private_data_dir, passwords)
# TODO: output_replacements hurts my head right now
#output_replacements = self.build_output_replacements(self.instance, **kwargs)
output_replacements = []
cwd = self.build_cwd(self.instance, private_data_dir)
process_isolation_params = self.build_params_process_isolation(self.instance,
private_data_dir,
@ -1193,8 +1180,6 @@ class BaseTask(object):
password_prompts = self.get_password_prompts(passwords)
expect_passwords = self.create_expect_passwords_data_struct(password_prompts, passwords)
self.instance = self.update_model(self.instance.pk, output_replacements=output_replacements)
params = {
'ident': self.instance.id,
'private_data_dir': private_data_dir,
@ -1288,7 +1273,6 @@ class BaseTask(object):
self.instance = self.update_model(pk)
self.instance = self.update_model(pk, status=status,
output_replacements=output_replacements,
emitted_events=self.event_ct,
**extra_update_fields)
@ -1781,33 +1765,6 @@ class RunProjectUpdate(BaseTask):
self.build_cwd(project_update, private_data_dir)
return os.path.join('project_update.yml')
def build_output_replacements(self, project_update, passwords={}):
'''
Return search/replace strings to prevent output URLs from showing
sensitive passwords.
'''
output_replacements = []
before_url, before_passwords = self._build_scm_url_extra_vars(project_update, passwords)
scm_username = before_passwords.get('scm_username', '')
scm_password = before_passwords.get('scm_password', '')
after_url = self._build_scm_url_extra_vars(project_update, passwords)[0]
if after_url != before_url:
output_replacements.append((before_url, after_url))
if project_update.scm_type == 'svn' and scm_username and scm_password:
d_before = {
'username': scm_username,
'password': scm_password,
}
d_after = {
'username': scm_username,
'password': HIDDEN_PASSWORD,
}
pattern1 = "username=\"%(username)s\" password=\"%(password)s\""
pattern2 = "--username '%(username)s' --password '%(password)s'"
output_replacements.append((pattern1 % d_before, pattern1 % d_after))
output_replacements.append((pattern2 % d_before, pattern2 % d_after))
return output_replacements
def get_password_prompts(self, passwords={}):
d = super(RunProjectUpdate, self).get_password_prompts(passwords)
d[r'Username for.*:\s*?$'] = 'scm_username'