erik/fail2ban-digest
erik/fail2ban-digest
1
0
Fork 0
mirror of https://github.com/ethauvin/fail2ban-digest.git synced 2025-04-26 02:57:12 -07:00
Code Releases Activity

Added banned IPs count to digest.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-03-06 08:11:52 -08:00
parent ace1a94834
commit 6dd8a04a40
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bin/fail2ban_digest
View file

@ -37,7 +37,7 @@ db_location = '/var/lib/fail2ban/digest'
db_creation_date_key = 'db_creation_date' db_creation_date_key = 'db_creation_date'
db_date_format = '%Y-%m-%d %H:%M:%S' db_date_format = '%Y-%m-%d %H:%M:%S'
default_mail_template = Template('''Hi,\n default_mail_template = Template('''Hi,\n
This is a digest email of banned IPs since ${creation_date} and ${date_now}: This is a digest email of the ${count} banned IPs between ${creation_date} and ${date_now}:
${digest} ${digest}
@ -79,7 +79,7 @@ default_html_template = Template('''<!DOCTYPE html>
</head> </head>
<body> <body>
<p>Hi,</p> <p>Hi,</p>
<p>This is a digest email of banned IPs since <b>${creation_date}</b> and <b>${date_now}</b>:</p> <p>This is a digest email of the <b>${count}</b> banned IPs between <b>${creation_date}</b> and <b>${date_now}</b>:</p>
<table> <table>
<tr> <tr>
<th style="text-align: center">#</th> <th style="text-align: center">#</th>
@ -219,12 +219,12 @@ def digest(db, delete, sort):
for ban in events_list: for ban in events_list:
msg_html += html_tr_template.substitute(count = len(ban.events), ip = ban.ip, events = '<br>'.join(ban.events)) msg_html += html_tr_template.substitute(count = len(ban.events), ip = ban.ip, events = '<br>'.join(ban.events))
msg += '%3d event(s) for IP %-42s: %s\n' %(len(ban.events), ban.ip, ', '.join(ban.events)) msg += '%3d event(s) for IP %-42s: %s\n' %(len(ban.events), ban.ip, ', '.join(ban.events))
return (db_creation_date, msg, msg_html) return (len(events_list), db_creation_date, msg, msg_html)
def mail_digest(db, mail_to, mail_from, delete, html, quiet, sort): def mail_digest(db, mail_to, mail_from, delete, html, quiet, sort):
msg = EmailMessage() msg = EmailMessage()
date_now = datetime.now().strftime(db_date_format) date_now = datetime.now().strftime(db_date_format)
creation_date, dgst, dgst_html = digest(db, delete, sort) count, creation_date, dgst, dgst_html = digest(db, delete, sort)
if dgst == '': if dgst == '':
if quiet: if quiet:
return return
@ -232,12 +232,14 @@ def mail_digest(db, mail_to, mail_from, delete, html, quiet, sort):
dgst = ' No ban event recorded for the named time frame.' dgst = ' No ban event recorded for the named time frame.'
dgst_html = html_error_template.substitute(error_msg = dgst) dgst_html = html_error_template.substitute(error_msg = dgst)
msg.set_content(default_mail_template.substitute( msg.set_content(default_mail_template.substitute(
count = count,
creation_date = creation_date, creation_date = creation_date,
date_now = date_now, date_now = date_now,
digest = dgst digest = dgst
)) ))
if html: if html:
msg.add_alternative(default_html_template.substitute( msg.add_alternative(default_html_template.substitute(
count = count,
creation_date = creation_date, creation_date = creation_date,
date_now = date_now, date_now = date_now,
digest = dgst_html digest = dgst_html
@ -254,7 +256,7 @@ def main(args):
if args.cmd == 'add': if args.cmd == 'add':
add(args.database, args.ip) add(args.database, args.ip)
elif args.cmd == 'digest': elif args.cmd == 'digest':
print(digest(args.database, args.delete, args.sort)[1]) print(digest(args.database, args.delete, args.sort)[2])
elif args.cmd == 'maildigest': elif args.cmd == 'maildigest':
mail_digest(args.database, args.to, args.mail_from, args.delete, args.html, args.quiet, args.sort) mail_digest(args.database, args.to, args.mail_from, args.delete, args.html, args.quiet, args.sort)
elif args.cmd is None: elif args.cmd is None: