From 5471e99ebe3065120ff148260bc55e202b7feeed Mon Sep 17 00:00:00 2001
From: leftyfb <leftyfb@left-click.org>
Date: Thu, 17 Jul 2014 22:54:30 -0400
Subject: [PATCH 1/5] Added cloudflare action

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

diff --git a/config/action.d/cloudflare.conf b/config/action.d/cloudflare.conf
new file mode 100644
index 000000000..ead0d23e8
--- /dev/null
+++ b/config/action.d/cloudflare.conf
@@ -0,0 +1,53 @@
+#
+# Author: Mike Rushton
+#
+# $Revision$
+#
+
+[Definition]
+
+# Option:  actionstart
+# Notes.:  command executed once at the start of Fail2Ban.
+# Values:  CMD
+#
+actionstart =
+
+# Option:  actionstop
+# Notes.:  command executed once 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:    &lt;ip&gt;  IP address
+#          &lt;failures&gt;  number of failures
+#          &lt;time&gt;  unix timestamp of the ban time
+# Values:  CMD
+#
+actionban = curl -s "https://www.cloudflare.com/api.html?a=ban&key=<ip>&u=<cfuser>&tkn=<cftoken>"
+# Option:  actionunban
+# Notes.:  command executed when unbanning an IP. Take care that the
+#          command is executed with Fail2Ban user rights.
+# Tags:    &lt;ip&gt;  IP address
+#          &lt;failures&gt;  number of failures
+#          &lt;time&gt;  unix timestamp of the ban time
+# Values:  CMD
+#
+actionunban = curl -s "https://www.cloudflare.com/api.html?a=nul&key=<ip>&u=<cfuser>&tkn=<cftoken>"
+
+
+[Init]
+
+# Default Cloudflare API token 
+cftoken = 
+
+# Default Cloudflare username
+cfuser = 

From cba570cabdb8cc04f18ab7c46a0044364590772a Mon Sep 17 00:00:00 2001
From: leftyfb <leftyfb@left-click.org>
Date: Thu, 17 Jul 2014 23:49:35 -0400
Subject: [PATCH 2/5] Updated comments

---
 config/action.d/cloudflare.conf | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/action.d/cloudflare.conf b/config/action.d/cloudflare.conf
index ead0d23e8..790a00a98 100644
--- a/config/action.d/cloudflare.conf
+++ b/config/action.d/cloudflare.conf
@@ -1,7 +1,9 @@
 #
 # Author: Mike Rushton
 #
-# $Revision$
+# Referenced from from http://www.normyee.net/blog/2012/02/02/adding-cloudflare-support-to-fail2ban by NORM YEE
+#
+# To get your Cloudflare API key: https://www.cloudflare.com/my-account
 #
 
 [Definition]
@@ -27,18 +29,18 @@ actioncheck =
 # Option:  actionban
 # Notes.:  command executed when banning an IP. Take care that the
 #          command is executed with Fail2Ban user rights.
-# Tags:    &lt;ip&gt;  IP address
-#          &lt;failures&gt;  number of failures
-#          &lt;time&gt;  unix timestamp of the ban time
+# Tags:    <ip>  IP address
+#          <failures>  number of failures
+#          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
 actionban = curl -s "https://www.cloudflare.com/api.html?a=ban&key=<ip>&u=<cfuser>&tkn=<cftoken>"
 # Option:  actionunban
 # Notes.:  command executed when unbanning an IP. Take care that the
 #          command is executed with Fail2Ban user rights.
-# Tags:    &lt;ip&gt;  IP address
-#          &lt;failures&gt;  number of failures
-#          &lt;time&gt;  unix timestamp of the ban time
+# Tags:    <ip>  IP address
+#          <failures>  number of failures
+#          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
 actionunban = curl -s "https://www.cloudflare.com/api.html?a=nul&key=<ip>&u=<cfuser>&tkn=<cftoken>"

From 6dbd449f777efe7edc9ff6c3d4229dc15cc23a0f Mon Sep 17 00:00:00 2001
From: leftyfb <leftyfb@left-click.org>
Date: Mon, 28 Jul 2014 11:10:50 -0400
Subject: [PATCH 3/5] Changed to Cloudflare JSON API

---
 config/action.d/cloudflare.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/action.d/cloudflare.conf b/config/action.d/cloudflare.conf
index 790a00a98..4d5e2dc85 100644
--- a/config/action.d/cloudflare.conf
+++ b/config/action.d/cloudflare.conf
@@ -34,7 +34,7 @@ actioncheck =
 #          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
-actionban = curl -s "https://www.cloudflare.com/api.html?a=ban&key=<ip>&u=<cfuser>&tkn=<cftoken>"
+actionban = curl https://www.cloudflare.com/api_json.html -d 'a=ban' -d 'tkn=<cftoken>' -d 'email=<cfuser>' -d 'key=<ip>'
 # Option:  actionunban
 # Notes.:  command executed when unbanning an IP. Take care that the
 #          command is executed with Fail2Ban user rights.
@@ -43,7 +43,7 @@ actionban = curl -s "https://www.cloudflare.com/api.html?a=ban&key=<ip>&u=<cfuse
 #          <time>  unix timestamp of the ban time
 # Values:  CMD
 #
-actionunban = curl -s "https://www.cloudflare.com/api.html?a=nul&key=<ip>&u=<cfuser>&tkn=<cftoken>"
+actionunban = curl https://www.cloudflare.com/api_json.html -d 'a=nul' -d 'tkn=<cftoken>' -d 'email=<cfuser>' -d 'key=<ip>'
 
 
 [Init]

From 2179c8293ca0e7ff640eeec1b9f183ca588c8a0e Mon Sep 17 00:00:00 2001
From: leftyfb <leftyfb@left-click.org>
Date: Mon, 28 Jul 2014 11:24:38 -0400
Subject: [PATCH 4/5] ChangeLog Added and entry about Cloudflare action

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index d453e67b9..10302bfca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@ ver. 0.9.1 (2014/xx/xx) - better, faster, stronger
 - New features:
    - Added monit filter thanks Jason H Martin.
    - fail2ban-client can fetch the running server version
+   - Added Cloudflare API action
 
 - Enhancements
    * Fail2ban-regex - add print-all-matched option. Closes gh-652

From 11010218960dcc8aee20f05ca6271af1015ef9f1 Mon Sep 17 00:00:00 2001
From: leftyfb <leftyfb@left-click.org>
Date: Mon, 28 Jul 2014 11:26:08 -0400
Subject: [PATCH 5/5] Added entry for Cloudflare action

---
 THANKS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/THANKS b/THANKS
index 656a4ad46..df8dbb3fc 100644
--- a/THANKS
+++ b/THANKS
@@ -62,6 +62,7 @@ kjohnsonecl
 kojiro
 Lars Kneschke
 Lee Clemens
+leftyfb (Mike Rushton)
 Manuel Arostegui Ramirez
 Marcel Dopita
 Mark Edgington