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

Add in rejected flag in Badcountry table

Browse Source
This commit is contained in:
Brian Read 2024-06-25 14:20:11 +01:00
parent 1ef07f3acc
commit 68928375d8
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
root/opt/mailstats/templates/mailstats-sub-table.html.pt
View File

@ -5,12 +5,11 @@
<th tal:repeat="header column_headers">${header}</th> <th tal:repeat="header column_headers">${header}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr tal:repeat="item array_2d"> <tr tal:repeat="item array_2d">
<td>${item[0]}</td> <td tal:repeat="cell item">${cell}<span tal:condition="repeat.cell.index == 2">%</span></td>
<td>${item[1]}</td> </tr>
<td>${item[2]}%</td>
</tr>
</tbody> </tbody>
</table> </table>

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

@ -432,12 +432,21 @@ def split_timestamp_and_data(log_entry: str) -> list:
rest_of_data = parts[2] rest_of_data = parts[2]
return [timestamp, rest_of_data] return [timestamp, rest_of_data]
def render_sub_table(table_title,table_headers,found_values): def render_sub_table(table_title,table_headers,found_values,get_character=None):
# Get the total # Get the total
total_sum = sum(found_values.values()) total_sum = sum(found_values.values())
# and add in list with second element the percentage # and add in list with second element the percentage
# Create a list of tuples with each tuple containing (key, value, percentage) # Create a list of tuples with each tuple containing (key, value, percentage)
sub_result = [(key, value, f"{round(value / total_sum * 100, 2)}") for key, value in found_values.items()] if get_character:
sub_result = [(key, value,
f"{round(value / total_sum * 100, 2)}",
f"{get_character(key)}") for key, value in found_values.items()
]
else:
sub_result = [(key, value,
f"{round(value / total_sum * 100, 2)}") for key, value in found_values.items()
]
sub_result.sort(key=lambda x: float(x[2]), reverse=True) # Sort by percentage in descending order sub_result.sort(key=lambda x: float(x[2]), reverse=True) # Sort by percentage in descending order
sub_template_path = template_dir+'mailstats-sub-table.html.pt' sub_template_path = template_dir+'mailstats-sub-table.html.pt'
# Load the template # Load the template
@ -455,6 +464,11 @@ def render_sub_table(table_title,table_headers,found_values):
raise ValueError(f"{table_title}: A chameleon controller template error occurred: {e}") raise ValueError(f"{table_title}: A chameleon controller template error occurred: {e}")
return rendered_html return rendered_html
def get_character_in_reject_list(code):
if code in BadCountries:
return "*"
else:
return ""
def read_html_from_file(filepath): def read_html_from_file(filepath):
@ -672,6 +686,22 @@ if __name__ == "__main__":
EMailSMTPUser = get_value(ConfigDB,"mailstats","EmailUser") #None = default => no authenticatioon needed EMailSMTPUser = get_value(ConfigDB,"mailstats","EmailUser") #None = default => no authenticatioon needed
EMailSMTPPassword = get_value(ConfigDB,"mailstats","EmailPassword") EMailSMTPPassword = get_value(ConfigDB,"mailstats","EmailPassword")
BadCountries = get_value(ConfigDB,"qpsmtpd","BadCountries")
# Not sure we need these...
# if (ConfigDB,"qpsmtpd","RHSBL").lower() == 'enabled':
# RBLList = get_value(ConfigDB,"qpsmtpd","RBLList")
# else:
# RBLList = ""
# if (ConfigDB,"qpsmtpd","RBLList").lower() == 'enabled':
# SBLLIst = get_value(ConfigDB,"qpsmtpd","SBLLIst")
# else:
# RBLList = ""
# if (ConfigDB,"qpsmtpd","RBLList").lower() == 'enabled':
# UBLList = get_value(ConfigDB,"qpsmtpd","UBLLIst")
# else:
# RBLList = ""
FetchmailIP = '127.0.0.200'; #Apparent Ip address of fetchmail deliveries FetchmailIP = '127.0.0.200'; #Apparent Ip address of fetchmail deliveries
WebmailIP = '127.0.0.1'; #Apparent Ip of Webmail sender WebmailIP = '127.0.0.1'; #Apparent Ip of Webmail sender
localhost = 'localhost'; #Apparent sender for webmail localhost = 'localhost'; #Apparent sender for webmail
@ -1007,9 +1037,11 @@ if __name__ == "__main__":
# Add in the header information # Add in the header information
rendered_html = get_heading() rendered_html = get_heading()
total_html = insert_string_after(total_html,rendered_html, "<!---Add in header information here -->") total_html = insert_string_after(total_html,rendered_html, "<!---Add in header information here -->")
#add in the subservient tables.. #add in the subservient tables..
#qpsmtd codes #qpsmtd codes
qpsmtpd_headers = ["Code",'Count','Percent','Reason'] qpsmtpd_headers = ["Reason",'Count','Percent']
qpsmtpd_title = 'Qpsmtpd codes league table:' qpsmtpd_title = 'Qpsmtpd codes league table:'
rendered_html = render_sub_table(qpsmtpd_title,qpsmtpd_headers,found_qpcodes) rendered_html = render_sub_table(qpsmtpd_title,qpsmtpd_headers,found_qpcodes)
# Add it to the total # Add it to the total
@ -1018,7 +1050,7 @@ if __name__ == "__main__":
#Geoip Country codes #Geoip Country codes
geoip_headers = ['Country','Count','Percent','Rejected?'] geoip_headers = ['Country','Count','Percent','Rejected?']
geoip_title = 'Geoip results:' geoip_title = 'Geoip results:'
rendered_html = render_sub_table(geoip_title,geoip_headers,found_countries) rendered_html = render_sub_table(geoip_title,geoip_headers,found_countries,get_character_in_reject_list)
# Add it to the total # Add it to the total
total_html = insert_string_after(total_html,rendered_html, "<!---Add in sub tables here -->") total_html = insert_string_after(total_html,rendered_html, "<!---Add in sub tables here -->")