CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Improve log entry shredding

Browse Source
This commit is contained in:
Raphael Michel
2023-12-07 15:04:21 +01:00
parent 9d546904e6
commit 4cb271868b
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/pretix/base/shredder.py
View File

@@ -153,19 +153,33 @@ class BaseDataShredder:
def shred_log_fields(logentry, banlist=None, whitelist=None):
def _shred(d, banlist, whitelist):
shredded = False
if whitelist:
for k, v in d.items():
if k not in whitelist:
if isinstance(d[k], list):
d[k] = ['█'] * len(d[k])
if isinstance(d[k], dict):
_shred(d[k], None, ['__'])
elif d[k]:
d[k] = '█'
shredded = True
elif banlist:
for k in banlist:
if k in d:
if isinstance(d[k], list):
d[k] = ['█'] * len(d[k])
if isinstance(d[k], dict):
_shred(d, None, ['__'])
elif d[k]:
d[k] = '█'
shredded = True
return shredded
d = logentry.parsed_data
initial_data = copy.copy(d)
shredded = False
if whitelist:
for k, v in d.items():
if k not in whitelist:
d[k] = '█'
shredded = True
elif banlist:
for f in banlist:
if f in d:
d[f] = '█'
shredded = True
shredded = _shred(d, banlist, whitelist)
if d != initial_data:
logentry.data = json.dumps(d)
logentry.shredded = logentry.shredded or shredded