From 549809dfa46f99fa90e8f605e082b926b9a777c1 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 25 Aug 2015 16:05:03 -0400 Subject: [PATCH] Fix chunked stdout display issue * We removed stdout redaction from jobs and job templates but only for the full stdout dump, this extends it to the limited display also --- awx/main/models/projects.py | 6 ++++++ awx/main/models/unified_jobs.py | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 3bbbe55fa9..289c40cf79 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -357,6 +357,12 @@ class ProjectUpdate(UnifiedJob, ProjectOptions): def result_stdout(self): return self._result_stdout_raw(redact_sensitive=True, escape_ascii=True) + def result_stdout_raw_limited(self, start_line=0, redact_sensitive=True, end_line=None): + return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive) + + def result_stdout_limited(self, start_line=0, end_line=None, redact_sensitive=True): + return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive, escape_ascii=True) + def get_absolute_url(self): return reverse('api:project_update_detail', args=(self.pk,)) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 90f22afdc0..0471079656 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -670,11 +670,11 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique return return_buffer, start_actual, end_actual, absolute_end - def result_stdout_raw_limited(self, start_line=0, end_line=None): - return self._result_stdout_raw_limited(start_line, end_line) + def result_stdout_raw_limited(self, start_line=0, redact_sensitive=False, end_line=None): + return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive) - def result_stdout_limited(self, start_line=0, end_line=None): - return self._result_stdout_raw_limited(start_line, end_line, escape_ascii=True) + def result_stdout_limited(self, start_line=0, end_line=None, redact_sensitive=False): + return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive, escape_ascii=True) @property def celery_task(self):