From 676c9391b1de98fc2ddf50d190000e0f997aa307 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 27 Apr 2024 00:20:08 +0300 Subject: [PATCH] Revert "make WPD perma-under-attack" This reverts commit 1d278cebe0f0ca5fcb6a570b9c534dfde74893bb. --- files/routes/admin.py | 2 +- files/routes/wrappers.py | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index 14ca07b5e..1978817cd 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -389,7 +389,7 @@ def reported_comments(v): @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @admin_level_required(PERMS['ADMIN_HOME_VISIBLE']) def admin_home(v): - if SITE == 'rdrama.net': + if CLOUDFLARE_AVAILABLE: try: under_attack = (requests.get(f"{CLOUDFLARE_API_URL}/zones/{CF_ZONE}/settings/security_level", headers=CF_HEADERS, timeout=CLOUDFLARE_REQUEST_TIMEOUT_SECS).json()['result']['value'] == "under_attack") except: return render_template("admin/admin_home.html", v=v) set_setting('under_attack', under_attack) diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py index d7e92b917..071e05c4d 100644 --- a/files/routes/wrappers.py +++ b/files/routes/wrappers.py @@ -56,16 +56,19 @@ def calc_users(): g.loggedin_counter = len(loggedin) g.loggedout_counter = len(loggedout) - if SITE == 'rdrama.net': + if SITE == 'watchpeopledie.tv': + ddos_threshold = 3500 + else: ddos_threshold = 1000 - if g.loggedin_counter + g.loggedout_counter > ddos_threshold: - if not get_setting('under_attack'): - set_setting('under_attack', True) - set_security_level('under_attack') - else: - if get_setting('under_attack'): - set_setting('under_attack', False) - set_security_level('high') + + if g.loggedin_counter + g.loggedout_counter > ddos_threshold: + if not get_setting('under_attack'): + set_setting('under_attack', True) + set_security_level('under_attack') + else: + if get_setting('under_attack'): + set_setting('under_attack', False) + set_security_level('high') return '' def get_logged_in_user():