|
|
|
@ -44,8 +44,8 @@ def configure_logging(debug=False):
|
|
|
|
|
|
|
|
|
|
# Console logging
|
|
|
|
|
ch = logging.StreamHandler()
|
|
|
|
|
cf = NoExceptionFormatter('%(asctime)-15s - %(name)-32s (%(thread)x) : %(levelname)s (%(module)s:%(lineno)d) '
|
|
|
|
|
'- %(message)s')
|
|
|
|
|
cf = (debug and logging.Formatter or NoExceptionFormatter)(
|
|
|
|
|
'%(asctime)-15s - %(name)-32s (%(thread)x) : %(levelname)s (%(module)s:%(lineno)d) - %(message)s')
|
|
|
|
|
ch.setFormatter(cf)
|
|
|
|
|
|
|
|
|
|
ch.setLevel(log_level)
|
|
|
|
@ -95,6 +95,7 @@ class BlacklistFilter(logging.Filter):
|
|
|
|
|
"""
|
|
|
|
|
Log filter for blacklisted tokens and passwords
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
|
super(BlacklistFilter, self).__init__()
|
|
|
|
|
|
|
|
|
@ -120,6 +121,7 @@ class PublicIPFilter(logging.Filter):
|
|
|
|
|
"""
|
|
|
|
|
Log filter for public IP addresses
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
|
super(PublicIPFilter, self).__init__()
|
|
|
|
|
|
|
|
|
@ -132,7 +134,8 @@ class PublicIPFilter(logging.Filter):
|
|
|
|
|
|
|
|
|
|
args = []
|
|
|
|
|
for arg in record.args:
|
|
|
|
|
ipv4 = re.findall(r'[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})', arg) if isinstance(arg, basestring) else []
|
|
|
|
|
ipv4 = re.findall(r'[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})', arg) if isinstance(arg,
|
|
|
|
|
basestring) else []
|
|
|
|
|
for ip in ipv4:
|
|
|
|
|
arg = arg.replace(ip, ip.partition('.')[0] + '.***.***.***')
|
|
|
|
|
args.append(arg)
|
|
|
|
|