From 2d8c278d744186253a9ecc53ac3b41814cdac291 Mon Sep 17 00:00:00 2001
From: Robert Vojcik <robert@vojcik.net>
Date: Thu, 13 Nov 2025 14:35:14 +0100
Subject: [PATCH 1/2] Implement cloudflare IP list as action

---
 config/action.d/cloudflare-list.conf | 84 ++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 config/action.d/cloudflare-list.conf

diff --git a/config/action.d/cloudflare-list.conf b/config/action.d/cloudflare-list.conf
new file mode 100644
index 00000000..e143c720
--- /dev/null
+++ b/config/action.d/cloudflare-list.conf
@@ -0,0 +1,84 @@
+#
+# Author: Robert Vojcik
+# Based on: cloudflare.conf by Mike Rushton
+#
+# This action using global cloudflare IP Lists.
+# Add and remove IP addresses to IP lists instead of editing Access Rules.
+# You could define rules according your needs and use IP List in it.
+# This action only manage content of the IP list
+#
+# IMPORTANT
+#
+# Please set jail.local's permission to 640 because it contains your CF API token.
+#
+# This action depends on curl.
+#
+# To get your Cloudflare API token: https://developers.cloudflare.com/api/tokens/create/
+
+[Definition]
+
+# 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
+#
+actionstart =
+
+# Option:  actionstop
+# Notes.:  command executed at the stop of jail (or at the end of Fail2Ban)
+# Values:  CMD
+#
+actionstop =
+
+# Option:  actioncheck
+# Notes.:  command executed once before each actionban command
+# Values:  CMD
+#
+actioncheck =
+
+# Option:  actionban
+# Notes.:  command executed when banning an IP. Take care that the
+#          command is executed with Fail2Ban user rights.
+# Tags:    <ip>  IP address
+#          <failures>  number of failures
+#          <time>  unix timestamp of the ban time
+# Values:  CMD
+actionban = curl -s -X PUT "<_cf_api_url>" \
+              <_cf_api_prms> \
+              --data '[{"ip":"<ip>", "comment":"<notes>"}]'
+
+# Option:  actionunban
+# Notes.:  command executed when unbanning an IP. Take care that the
+#          command is executed with Fail2Ban user rights.
+# Tags:    <ip>  IP address
+#          <failures>  number of failures
+#          <time>  unix timestamp of the ban time
+# Values:  CMD
+#
+actionunban = id=$(curl -s -X GET "<_cf_api_url>?ip=<ip>" \
+                       <_cf_api_prms> \
+                       | awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'id'\042/){print $(i+1)}}}' \
+                       | tr -d ' "' \
+                       | head -n 1)
+              if [ -z "$id" ]; then echo "<name>: id for <ip> cannot be found using list <cflist>"; exit 0; fi; \
+              curl -s -X DELETE "<_cf_api_url>" \
+                  <_cf_api_prms> \
+                  --data "{\"items\": [{\"id\":\"$id\"}]}"
+
+_cf_api_url = https://api.cloudflare.com/client/v4/accounts/<cfaccount>/rules/lists/<cflist>/items
+_cf_api_prms = -H "Authorization: Bearer <cftoken>" -H "Content-Type: application/json"
+
+[Init]
+# The Cloudflare <ACCOUNT_ID> of your account
+#
+# cfaccount =
+
+# Token must be created with at least Account.Account Filter Lists edit rights
+# cftoken =
+
+# After you create new IP List, get its id to cflist variable
+# cflist =
+
+# The message to include in IP comment in the IP List.
+#
+notes = Fail2Ban <name>
+

From 997cc0b28e17e2d442288055a6bb914e7bdd50af Mon Sep 17 00:00:00 2001
From: Robert Vojcik <robert@vojcik.net>
Date: Wed, 10 Dec 2025 18:01:10 +0100
Subject: [PATCH 2/2] fix lost jq variant

---
 config/action.d/cloudflare-list.conf | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/config/action.d/cloudflare-list.conf b/config/action.d/cloudflare-list.conf
index e143c720..608b2bcb 100644
--- a/config/action.d/cloudflare-list.conf
+++ b/config/action.d/cloudflare-list.conf
@@ -54,15 +54,11 @@ actionban = curl -s -X PUT "<_cf_api_url>" \
 #          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
-actionunban = id=$(curl -s -X GET "<_cf_api_url>?ip=<ip>" \
-                       <_cf_api_prms> \
-                       | awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'id'\042/){print $(i+1)}}}' \
-                       | tr -d ' "' \
-                       | head -n 1)
-              if [ -z "$id" ]; then echo "<name>: id for <ip> cannot be found using list <cflist>"; exit 0; fi; \
-              curl -s -X DELETE "<_cf_api_url>" \
-                  <_cf_api_prms> \
-                  --data "{\"items\": [{\"id\":\"$id\"}]}"
+actionunban = id=$(curl -s -X GET <_cf_api_prms> \
+                      "<_cf_api_url>?ip=<ip>" \
+                       | { jq -r '.result[0].id' 2>/dev/null || awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'id'\042/){print $(i+1)}}}' | tr -d ' "' | head -n 1; })
+              if [ -z "$id" ]; then echo "<name>: id for <ip> cannot be found using list <cflist>"; exit 0; fi;
+              curl -s -o /dev/null -X DELETE <_cf_api_prms> "<_cf_api_url>" --data "{\"items\": [{\"id\":\"$id\"}]}"
 
 _cf_api_url = https://api.cloudflare.com/client/v4/accounts/<cfaccount>/rules/lists/<cflist>/items
 _cf_api_prms = -H "Authorization: Bearer <cftoken>" -H "Content-Type: application/json"