X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c21f3cc58a79d0daae092b17ffe313cf393cb4c0..ad1d429de64ac037470f92e0492211a41bd2c613:/utils/cron_banip.py?ds=sidebyside diff --git a/utils/cron_banip.py b/utils/cron_banip.py index 714df283..17268bc1 100755 --- a/utils/cron_banip.py +++ b/utils/cron_banip.py @@ -52,6 +52,9 @@ LOGFILE= BASEDIR + '/log/restricted_ip.log' WHITELIST = '' # space-separated list of IPs manually blocked BLACKLIST = '' +# user-agents that should be blocked from bulk mode +# (matched with startswith) +UA_BLOCKLIST = () # time before a automatically blocked IP is allowed back BLOCKCOOLOFF_PERIOD='1 hour' @@ -133,7 +136,13 @@ 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.') + # check for user agents that receive an immediate block + missing_agent = not c[2] + if not missing_agent: + for ua in UA_BLOCKLIST: + if c[2].startswith(ua): + missing_agent = True + break if (missing_agent or c[1] > BLOCK_UPPER) and c[0] not in prevblocks: newblocks.add(c[0]) if missing_agent: