smecontribs/smeserver-mailstats
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix virus counts in sub table

Browse Source
This commit is contained in:
Brian Read 2025-01-10 09:18:33 +00:00
parent f57b0c6e43
commit 93b5eb22ab
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
root/usr/bin/mailstats.py
View File

@ -589,6 +589,7 @@ def parse_data(data):
'action1': fields[9].strip() if len(fields) > 9 else None, #5 'action1': fields[9].strip() if len(fields) > 9 else None, #5
'error-number' : fields[10].strip() if len(fields) > 10 else None, #6 'error-number' : fields[10].strip() if len(fields) > 10 else None, #6
'sender': fields[11].strip() if len(fields) > 11 else None, #7 'sender': fields[11].strip() if len(fields) > 11 else None, #7
'virus': fields[11].strip() if len(fields) > 11 else None, #7
'error-msg' :fields[12].strip() if len(fields) > 12 else None, #7 'error-msg' :fields[12].strip() if len(fields) > 12 else None, #7
'spam-status': fields[12].strip() if len(fields) > 12 else None, #8 'spam-status': fields[12].strip() if len(fields) > 12 else None, #8
'error-result': fields[13].strip() if len(fields) > 13 else None,#8 'error-result': fields[13].strip() if len(fields) > 13 else None,#8
@ -1194,7 +1195,7 @@ if __name__ == "__main__":
columnPlugin[Local] = [] columnPlugin[Local] = []
columnPlugin[MailMan] = [] columnPlugin[MailMan] = []
columnPlugin[DMARC] = ['dmarc'] columnPlugin[DMARC] = ['dmarc']
columnPlugin[Virus] = ['pattern_filter', 'virus::pattern_filter','virus::clamav'] columnPlugin[Virus] = ['pattern_filter', 'virus::pattern_filter','virus::clamav','virus::clamdscan']
columnPlugin[RBLDNS] = ['rhsbl', 'dnsbl','uribl'] columnPlugin[RBLDNS] = ['rhsbl', 'dnsbl','uribl']
columnPlugin[Geoip] = ['check_badcountries'] columnPlugin[Geoip] = ['check_badcountries']
columnPlugin[NonConf] = ['check_earlytalker','check_relay','check_norelay', 'require_resolvable_fromhost' columnPlugin[NonConf] = ['check_earlytalker','check_relay','check_norelay', 'require_resolvable_fromhost'
@ -1252,8 +1253,8 @@ if __name__ == "__main__":
hour = dt.hour hour = dt.hour
# parse the data # parse the data
parsed_data = parse_data(data) parsed_data = parse_data(data)
#if parsed_data['id'] == '7787' or "7787" in data: if parsed_data['id'] == '13062' or "13062" in data:
# print(f"{parsed_data}") print(f"{parsed_data}")
#else: #else:
# print(f"{parsed_data['id']}") # print(f"{parsed_data['id']}")
#Take out the mailstats email #Take out the mailstats email
@ -1439,7 +1440,7 @@ if __name__ == "__main__":
#Now increment the column which the plugin name indicates #Now increment the column which the plugin name indicates
if parsed_data['error-msg'] and "msg denied before queued" in parsed_data['error-msg'] and parsed_data['error-plugin']: if parsed_data['error-msg'] and "msg denied before queued" in parsed_data['error-msg'] and parsed_data['virus']:
if parsed_data['error-plugin']: if parsed_data['error-plugin']:
row = search_2d_list(parsed_data['error-plugin'],columnPlugin) row = search_2d_list(parsed_data['error-plugin'],columnPlugin)
if not row == -1: if not row == -1:
@ -1447,13 +1448,13 @@ if __name__ == "__main__":
columnCounts_2d[ColTotals][row] += 1 columnCounts_2d[ColTotals][row] += 1
# a few ad hoc extra extractons of data # a few ad hoc extra extractons of data
if row == Virus: if row == Virus:
match = virus_pattern.match(parsed_data['action1']) match = virus_pattern.match(parsed_data['virus'])
if match: if match:
found_viruses[match.group(1)] += 1 found_viruses[match.group(1)] += 1
else: else:
found_viruses[parsed_data['action1']] += 1 found_viruses[parsed_data['virus']] += 1
else: else:
found_qpcodes[parsed_data['action1']] += 1 found_qpcodes[parsed_data['error-plugin']] += 1
if isThonny: if isThonny:
print() #seperate the [progress bar] print() #seperate the [progress bar]