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

Fixing NUL characters in event data

Browse Source
This commit is contained in:
John Westcott IV
2023-05-02 14:37:35 -04:00
parent 8ab3514428
commit af59abbbc4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/main/dispatch/worker/callback.py
View File

@@ -192,10 +192,16 @@ class CallbackBrokerWorker(BaseWorker):
e._retry_count = retry_count e._retry_count = retry_count
# special sanitization logic for postgres treatment of NUL 0x00 char # special sanitization logic for postgres treatment of NUL 0x00 char
if (retry_count == 1) and isinstance(exc_indv, DataError) and ("\x00" in e.stdout): if (retry_count == 1) and isinstance(exc_indv, DataError):
e.stdout = e.stdout.replace("\x00", "") # The easiest place is in stdout. This raises as an error stating that it can't save a NUL character
if "\x00" in e.stdout:
if retry_count >= self.INDIVIDUAL_EVENT_RETRIES: e.stdout = e.stdout.replace("\x00", "")
# There is also a chance that NUL char is embedded in event data which is part of a JSON blob. In that case we, thankfully, get a different exception
if 'unsupported Unicode escape sequence' in str(exc_indv):
e.event_data = json.loads(
json.dumps(e.event_data).replace("\x00", "").replace("\\x00", "").replace("\u0000", "").replace("\\u0000", "")
)
elif retry_count >= self.INDIVIDUAL_EVENT_RETRIES:
logger.error(f'Hit max retries ({retry_count}) saving individual Event error: {str(exc_indv)}\ndata:\n{e.__dict__}') logger.error(f'Hit max retries ({retry_count}) saving individual Event error: {str(exc_indv)}\ndata:\n{e.__dict__}')
events.remove(e) events.remove(e)
else: else: