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

rsyslog hardening (fixing a few weird things we noticed)

Browse Source
This commit is contained in:
Ryan Petrello
2020-04-08 13:38:35 -04:00
committed by Christian Adams
parent 70391f96ae
commit ce82b87d9f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,9 +26,11 @@ def construct_rsyslog_conf_template(settings=settings):
port = parsed.port port = parsed.port
except ValueError: except ValueError:
port = settings.LOG_AGGREGATOR_PORT port = settings.LOG_AGGREGATOR_PORT
max_bytes = settings.MAX_EVENT_RES_DATA
parts.extend([ parts.extend([
'$WorkDirectory /var/lib/awx/rsyslog', '$WorkDirectory /var/lib/awx/rsyslog',
'$IncludeConfig /etc/rsyslog.d/*.conf', '$IncludeConfig /etc/rsyslog.d/*.conf',
f'$MaxMessageSize {max_bytes}b',
'$ModLoad imuxsock', '$ModLoad imuxsock',
'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger']['address'] + '" unlink="on")', 'input(type="imuxsock" Socket="' + settings.LOGGING['handlers']['external_logger']['address'] + '" unlink="on")',
'template(name="awx" type="string" string="%msg%")', 'template(name="awx" type="string" string="%msg%")',

2
awx/main/utils/formatters.py
View File

@@ -97,7 +97,7 @@ class LogstashFormatterBase(logging.Formatter):
@classmethod @classmethod
def serialize(cls, message): def serialize(cls, message):
return bytes(json.dumps(message, cls=DjangoJSONEncoder), 'utf-8') return ' ' + json.dumps(message, cls=DjangoJSONEncoder) + '\000'
class LogstashFormatter(LogstashFormatterBase): class LogstashFormatter(LogstashFormatterBase):

2
awx/main/utils/handlers.py
View File

@@ -11,6 +11,8 @@ from django.conf import settings
class RSysLogHandler(logging.handlers.SysLogHandler): class RSysLogHandler(logging.handlers.SysLogHandler):
append_nul = False
def emit(self, msg): def emit(self, msg):
if not os.path.exists(settings.LOGGING['handlers']['external_logger']['address']): if not os.path.exists(settings.LOGGING['handlers']['external_logger']['address']):
return return