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

Merge pull request #2936 from ryanpetrello/fix-1775

Browse Source 
properly sanitize long event keys
This commit is contained in:
Ryan Petrello
2018-08-27 13:44:19 -04:00
committed by GitHub
parent d0598e720d 2acc488adf
commit 6afb47789a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/events.py
View File

@@ -35,9 +35,9 @@ def sanitize_event_keys(kwargs, valid_keys):
for key in [ for key in [
'play', 'role', 'task', 'playbook' 'play', 'role', 'task', 'playbook'
]: ]:
if isinstance(kwargs.get(key), six.string_types): if isinstance(kwargs.get('event_data', {}).get(key), six.string_types):
if len(kwargs[key]) > 1024: if len(kwargs['event_data'][key]) > 1024:
kwargs[key] = Truncator(kwargs[key]).chars(1024) kwargs['event_data'][key] = Truncator(kwargs['event_data'][key]).chars(1024)
def create_host_status_counts(event_data): def create_host_status_counts(event_data):

4
awx/main/tests/unit/models/test_events.py
View File

@@ -53,9 +53,9 @@ def test_really_long_event_fields(field):
with mock.patch.object(JobEvent, 'objects') as manager: with mock.patch.object(JobEvent, 'objects') as manager:
JobEvent.create_from_data(**{ JobEvent.create_from_data(**{
'job_id': 123, 'job_id': 123,
field: 'X' * 4096 'event_data': {field: 'X' * 4096}
}) })
manager.create.assert_called_with(**{ manager.create.assert_called_with(**{
'job_id': 123, 'job_id': 123,
field: 'X' * 1021 + '...' 'event_data': {field: 'X' * 1021 + '...'}
}) })