From 7f8a803702ce92c286dab2bad596e0dc468b0429 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Wed, 16 Mar 2016 11:40:40 +1000
Subject: [PATCH] * incremental bans

---
 docs/f2b.conf.sample |  1 +
 src/ipaddr.h         |  4 +++-
 src/jail.c           | 28 +++++++++++++++++-----------
 src/jail.h           |  1 +
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/docs/f2b.conf.sample b/docs/f2b.conf.sample
index 266e0f2..48cadfb 100644
--- a/docs/f2b.conf.sample
+++ b/docs/f2b.conf.sample
@@ -10,6 +10,7 @@ daemon = yes
 
 [defaults]
 enabled  = no
+incr_ban = no
 bantime  = 3600
 findtime = 300
 maxretry = 5
diff --git a/src/ipaddr.h b/src/ipaddr.h
index 159dd95..cc654b7 100644
--- a/src/ipaddr.h
+++ b/src/ipaddr.h
@@ -18,8 +18,10 @@ typedef struct f2b_ipaddr_t {
   int type;
   char text[IPADDR_MAX];
   bool banned;
+  size_t bancount;
   time_t lastseen;
-  time_t bantime;
+  time_t banned_at;
+  time_t release_at;
   union {
     struct in_addr  v4;
     struct in6_addr v6;
diff --git a/src/jail.c b/src/jail.c
index ee4fd54..2807ccd 100644
--- a/src/jail.c
+++ b/src/jail.c
@@ -56,6 +56,11 @@ f2b_jail_apply_config(f2b_jail_t *jail, f2b_config_section_t *section) {
         jail->enabled = true;
       continue;
     }
+    if (strcmp(param->name, "incr_ban") == 0) {
+      if (strcmp(param->value, "yes") == 0)
+        jail->incr_ban = true;
+      continue;
+    }
     if (strcmp(param->name, "bantime") == 0) {
       jail->bantime = atoi(param->value);
       if (jail->bantime <= 0)
@@ -103,12 +108,16 @@ f2b_jail_set_defaults(f2b_config_section_t *section) {
 
 bool
 f2b_jail_ban(f2b_jail_t *jail, f2b_ipaddr_t *addr) {
+  time_t bantime = 0;
   assert(jail != NULL);
   assert(addr != NULL);
 
   addr->matches.used = 0;
   addr->banned  = true;
-  addr->bantime = addr->lastseen;
+  addr->banned_at = addr->lastseen;
+  addr->bancount++;
+  bantime = jail->bantime * ((jail->incr_ban) ? addr->bancount : 1);
+  addr->release_at = addr->banned_at + bantime;
 
   if (f2b_backend_check(jail->backend, addr->text)) {
     f2b_log_msg(log_warn, "jail '%s': ip %s was already banned", jail->name, addr->text);
@@ -116,7 +125,8 @@ f2b_jail_ban(f2b_jail_t *jail, f2b_ipaddr_t *addr) {
   }
 
   if (f2b_backend_ban(jail->backend, addr->text)) {
-    f2b_log_msg(log_note, "jail '%s': banned ip %s", jail->name, addr->text);
+    f2b_log_msg(log_note, "jail '%s': banned ip %s for %.1fhrs",
+      jail->name, addr->text, bantime / 3600);
     return true;
   }
 
@@ -131,7 +141,8 @@ f2b_jail_unban(f2b_jail_t *jail, f2b_ipaddr_t *addr) {
   assert(addr != NULL);
 
   addr->banned  = false;
-  addr->bantime = 0;
+  addr->banned_at = 0;
+  addr->release_at = 0;
 
   if (f2b_backend_unban(jail->backend, addr->text)) {
     f2b_log_msg(log_note, "jail '%s': released ip %s", jail->name, addr->text);
@@ -170,7 +181,6 @@ f2b_jail_process(f2b_jail_t *jail) {
   char logline[LOGLINE_MAX] = "";
   char matchbuf[IPADDR_MAX] = "";
   time_t now  = time(NULL);
-  time_t release_time = 0;
 
   assert(jail != NULL);
 
@@ -196,7 +206,7 @@ f2b_jail_process(f2b_jail_t *jail) {
       /* this ip was seen before */
       addr->lastseen = now;
       if (addr->banned) {
-        if (addr->bantime != now)
+        if (addr->banned_at != now)
           f2b_log_msg(log_warn, "jail '%s': ip %s was already banned", jail->name, matchbuf);
         continue;
       }
@@ -214,12 +224,8 @@ f2b_jail_process(f2b_jail_t *jail) {
   for (addr = jail->ipaddrs; addr != NULL; addr = addr->next) {
     if (!addr->banned)
       continue;
-    release_time = addr->bantime + jail->bantime;
-    if (now < release_time) {
-      f2b_log_msg(log_debug, "jail '%s': skipping banned ip %s (%.1fh remains)", jail->name, addr->text, (now - release_time) / 3600);
-      continue;
-    }
-    f2b_jail_unban(jail, addr);
+    if (now > addr->release_at)
+      f2b_jail_unban(jail, addr);
   }
 
   return processed;
diff --git a/src/jail.h b/src/jail.h
index 29df6c3..2c866c8 100644
--- a/src/jail.h
+++ b/src/jail.h
@@ -18,6 +18,7 @@
 typedef struct f2b_jail_t {
   struct f2b_jail_t *next;
   bool enabled;
+  bool incr_ban;
   time_t bantime;
   time_t findtime;
   size_t maxretry;