From 93272188430d0d856ed29a5e040748e4d41c8b99 Mon Sep 17 00:00:00 2001
From: Noel Kuntze <noel@familie-kuntze.de>
Date: Sat, 29 Jun 2019 01:39:38 +0200
Subject: [PATCH 1/3] Improved blocklist_de action to not resend bans that were
 already reported

---
 config/action.d/blocklist_de.conf | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/config/action.d/blocklist_de.conf b/config/action.d/blocklist_de.conf
index ba6d427b..d8a4b3e5 100644
--- a/config/action.d/blocklist_de.conf
+++ b/config/action.d/blocklist_de.conf
@@ -54,7 +54,21 @@ actioncheck =
 # Tags:    See jail.conf(5) man page
 # Values:  CMD
 #
-actionban = curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
+
+tmpfile = "/var/run/fail2ban/last-log-<name>.time"
+
+actionban = if [ ! -e "<tmpfile>" ]
+            then
+                # if the file doesn't exist yet, create it
+                touch -d @<time> "<tmpfile>"
+                curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
+            fi
+            if [ $(stat -c %%X "<tmpfile>") -lt <time> ]
+            then
+                # If the time of the offense is later than the last ban, actually report it to blocklist.de
+                touch -d @<time> "<tmpfile>"
+                curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
+            fi
 
 # Option:  actionunban
 # Notes.:  command executed when unbanning an IP. Take care that the

From 4ae00485b0cf585685e5bed6d2f3dbfb3933d939 Mon Sep 17 00:00:00 2001
From: "Sergey G. Brester" <github@sebres.de>
Date: Sat, 29 Jun 2019 12:03:01 +0200
Subject: [PATCH 2/3] revert acktionban back, use norestored option

---
 config/action.d/blocklist_de.conf | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/config/action.d/blocklist_de.conf b/config/action.d/blocklist_de.conf
index d8a4b3e5..c7831fe5 100644
--- a/config/action.d/blocklist_de.conf
+++ b/config/action.d/blocklist_de.conf
@@ -30,6 +30,9 @@
 
 [Definition]
 
+# bypass reporting of restored (already reported) tickets:
+norestored = 1
+
 # Option:  actionstart
 # Notes.:  command executed on demand at the first ban (or at the start of Fail2Ban if actionstart_on_demand is set to false).
 # Values:  CMD
@@ -55,20 +58,7 @@ actioncheck =
 # Values:  CMD
 #
 
-tmpfile = "/var/run/fail2ban/last-log-<name>.time"
-
-actionban = if [ ! -e "<tmpfile>" ]
-            then
-                # if the file doesn't exist yet, create it
-                touch -d @<time> "<tmpfile>"
-                curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
-            fi
-            if [ $(stat -c %%X "<tmpfile>") -lt <time> ]
-            then
-                # If the time of the offense is later than the last ban, actually report it to blocklist.de
-                touch -d @<time> "<tmpfile>"
-                curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
-            fi
+actionban = curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
 
 # Option:  actionunban
 # Notes.:  command executed when unbanning an IP. Take care that the

From 846b3316db32d22626ac061ee100504047f2fa85 Mon Sep 17 00:00:00 2001
From: "Sergey G. Brester" <github@sebres.de>
Date: Sat, 29 Jun 2019 12:04:02 +0200
Subject: [PATCH 3/3] amend, remove NL

---
 config/action.d/blocklist_de.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/action.d/blocklist_de.conf b/config/action.d/blocklist_de.conf
index c7831fe5..41c35497 100644
--- a/config/action.d/blocklist_de.conf
+++ b/config/action.d/blocklist_de.conf
@@ -57,7 +57,6 @@ actioncheck =
 # Tags:    See jail.conf(5) man page
 # Values:  CMD
 #
-
 actionban = curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
 
 # Option:  actionunban