From df0907c055a6ffed226d5e5355bac3ebae9a72e4 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Wed, 26 Jun 2019 15:34:14 +0200 Subject: [PATCH] ADD OVER-RIDE BLOCKER / SUPER WHITELIST function into blockbots.conf --- .dev-tools/generate-files.sh | 1 - bots.d/blockbots.conf | 41 +++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/.dev-tools/generate-files.sh b/.dev-tools/generate-files.sh index 9feadf917..e664ff03a 100755 --- a/.dev-tools/generate-files.sh +++ b/.dev-tools/generate-files.sh @@ -59,7 +59,6 @@ sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker-quick.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker-badwords.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker-whitelist-domains.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker-whitelist-ips.sh -sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker-blacklist-domains.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker-rate-limiting.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/test-blocker-whitelist.sh sudo chmod +x ${TRAVIS_BUILD_DIR}/.dev-tools/prepare-robots-input.sh diff --git a/bots.d/blockbots.conf b/bots.d/blockbots.conf index 837b4fbe7..5f5c9842d 100644 --- a/bots.d/blockbots.conf +++ b/bots.d/blockbots.conf @@ -7,7 +7,6 @@ ################################################### ### VERSION INFORMATION ## - ############################################################################## # _ __ _ # # / |/ /__ _(_)__ __ __ # @@ -31,31 +30,53 @@ ####################################################################### -# BOTS -# **** +# ----------------------------------- +# OVER-RIDE BLOCKER / SUPER WHITELIST +# ----------------------------------- +# In this block you can allow any IP address specified here to over-ride any bad bot or IP blocking of the blocker. +# This is useful for testing or allowing only specific IP's (ie. Internal ranges) to never be blocked. +# More IP's can be added example > "(127.0.0.1)|(192.168.0.1)|(192.168.1.1)" +# If you even blacklisted 127.0.0.1 or your own IP by giving it a value of 1 in any of the includes, this will over-ride that block. + +if ($remote_addr ~ "(127.0.0.1)|(192.168.0.1)" ) { + #set $bad_bot '0'; #Uncommenting this line will disable bad_bots functionality for specified IP(s) + #set $validate_client '0'; #Uncommenting this line will disable validate_client ip blocking functionality for specified IP(s) +} + +# -------------- +# BLOCK BAD BOTS +# -------------- + +# Section bot_1 Unused #limit_conn bot1_connlimit 100; -limit_conn bot2_connlimit 10; #limit_req zone=bot1_reqlimitip burst=50; + +limit_conn bot2_connlimit 10; limit_req zone=bot2_reqlimitip burst=10; if ($bad_bot = '3') { return 444; } -# BAD REFER WORDS -# *************** +# --------------------- +# BLOCK BAD REFER WORDS +# --------------------- + if ($bad_words) { return 444; } +# ------------------ +# BLOCK BAD REFERERS +# ------------------ -# REFERERS -# ******** if ($bad_referer) { return 444; } -# IP BLOCKS -# ********* +# ----------------------------- +# BLOCK IP ADDRESSES and RANGES +# ----------------------------- + if ($validate_client) { return 444; }