From c21f3cc58a79d0daae092b17ffe313cf393cb4c0 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 29 Jun 2013 10:39:42 +0200 Subject: [PATCH 1/1] log UA blocks properly --- utils/cron_banip.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/cron_banip.py b/utils/cron_banip.py index 36d0be4e..714df283 100755 --- a/utils/cron_banip.py +++ b/utils/cron_banip.py @@ -129,13 +129,16 @@ cur.execute(""" bulkips = {} emergencyblocks = [] +useragentblocks = [] for c in cur: if c[0] not in WHITELIST and c[0] not in BLACKLIST: missing_agent = not c[2] or c[2].startswith('Java/1.') if (missing_agent or c[1] > BLOCK_UPPER) and c[0] not in prevblocks: newblocks.add(c[0]) - if c[0] not in prevbulks: + if missing_agent: + useragentblocks.append(c[0]) + else: emergencyblocks.append(c[0]) else: bulkips[c[0]] = c[1] @@ -218,6 +221,8 @@ if bulkips: fd.write(logstr % ('new bulks:', ', '.join(bulkips.keys()))) if emergencyblocks: fd.write(logstr % ('dir.block:', ', '.join(emergencyblocks))) +if useragentblocks: + fd.write(logstr % (' ua block:', ', '.join(useragentblocks))) if newlyblocked: fd.write(logstr % ('new block:', ', '.join(newlyblocked))) fd.close() -- 2.39.5