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

properly escape URL paths and querystrings for paths in logging settings

Browse Source
This commit is contained in:
Ryan Petrello
2020-04-09 15:21:02 -04:00
committed by Christian Adams
parent b0db2b7bec
commit bb5136cdae
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/utils/external_logging.py
View File

@@ -53,7 +53,10 @@ def construct_rsyslog_conf_template(settings=settings):
'healthchecktimeout="20000"', 'healthchecktimeout="20000"',
] ]
if parsed.path: if parsed.path:
params.append(f'restpath="{parsed.path[1:]}"') path = urlparse.quote(parsed.path[1:])
if parsed.query:
path = f'{path}?{urlparse.quote(parsed.query)}'
params.append(f'restpath="{path}"')
username = getattr(settings, 'LOG_AGGREGATOR_USERNAME', '') username = getattr(settings, 'LOG_AGGREGATOR_USERNAME', '')
password = getattr(settings, 'LOG_AGGREGATOR_PASSWORD', '') password = getattr(settings, 'LOG_AGGREGATOR_PASSWORD', '')
if username: if username: