Merge pull request #5584 from mailcow/feat/nftables

[Netfilter] do not ignore RETRY_WINDOW
mailcow · Dec 11, 2023 · 4387ce8 · 4387ce8
2 parents d11e485 + 86fa863
commit 4387ce8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/data/Dockerfiles/netfilter/main.py b/data/Dockerfiles/netfilter/main.py
@@ -167,8 +167,12 @@ def ban(address):
   if not net in bans:
     bans[net] = {'attempts': 0, 'last_attempt': 0, 'ban_counter': 0}
 
+  current_attempt = time.time()
+  if current_attempt - bans[net]['last_attempt'] > RETRY_WINDOW:
+    bans[net]['attempts'] = 0
+
   bans[net]['attempts'] += 1
-  bans[net]['last_attempt'] = time.time()
+  bans[net]['last_attempt'] = current_attempt
 
   if bans[net]['attempts'] >= MAX_ATTEMPTS:
     cur_time = int(round(time.time()))