From b720ea21625df805ea8f4f1c25fdd38cc29ce9fc Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Fri, 26 Jul 2019 10:45:11 +0200 Subject: [PATCH] [MASTER] Adjust Rate Limiting Values and Tests REF: #281 --- .dev-tools/globalblacklist.template | 2 +- .dev-tools/test-blocker-rate-limiting.sh | 65 ++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template index 8643f4428..ed3c2d636 100755 --- a/.dev-tools/globalblacklist.template +++ b/.dev-tools/globalblacklist.template @@ -17994,7 +17994,7 @@ geo $ratelimited { # Rate limiting will only take effect if on any User-Agents with a value of 2 limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m; - limit_req_zone $bot_iplimit zone=bot2_reqlimitip:16m rate=30r/m; + limit_req_zone $bot_iplimit zone=bot2_reqlimitip:16m rate=2r/s; # ========================================== # END SECTION 4 - ACTIVATE BLOCKER FUNCTIONS diff --git a/.dev-tools/test-blocker-rate-limiting.sh b/.dev-tools/test-blocker-rate-limiting.sh index 6db42e4c1..7260900de 100755 --- a/.dev-tools/test-blocker-rate-limiting.sh +++ b/.dev-tools/test-blocker-rate-limiting.sh @@ -100,6 +100,71 @@ curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & +curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} & curl -A "GoogleBot" http://localhost:9000 2>&1 >> ${ratelimittestfile} if grep -i 'Unavailable' < ${ratelimittestfile}; then