From a1a106a27ee789377471ac1621cfb18dfe66f17f Mon Sep 17 00:00:00 2001
From: Arturo 'Buanzo' Busleiman <buanzo@buanzo.com.ar>
Date: Sun, 30 Aug 2009 18:26:15 +0000
Subject: [PATCH] added "Ban IP" command to fail2ban branch 0.8

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@745 a942ae1a-1317-0410-a47c-b1dcaea8d605
---
 common/protocol.py    |  1 +
 server/filter.py      | 11 +++++++++++
 server/server.py      |  3 +++
 server/transmitter.py |  3 +++
 4 files changed, 18 insertions(+)

diff --git a/common/protocol.py b/common/protocol.py
index d0fbae73..71c916ce 100644
--- a/common/protocol.py
+++ b/common/protocol.py
@@ -59,6 +59,7 @@ protocol = [
 ["set <JAIL> delignoreregex <INDEX>", "removes the regular expression at <INDEX> for ignoreregex"], 
 ["set <JAIL> findtime <TIME>", "sets the number of seconds <TIME> for which the filter will look back for <JAIL>"], 
 ["set <JAIL> bantime <TIME>", "sets the number of seconds <TIME> a host will be banned for <JAIL>"], 
+["set <JAIL> banip <IP>", "manually Ban <IP> for <JAIL>"], 
 ["set <JAIL> maxretry <RETRY>", "sets the number of failures <RETRY> before banning the host for <JAIL>"], 
 ["set <JAIL> addaction <ACT>", "adds a new action named <NAME> for <JAIL>"], 
 ["set <JAIL> delaction <ACT>", "removes the action <NAME> from <JAIL>"], 
diff --git a/server/filter.py b/server/filter.py
index 16c82af4..c749b30b 100644
--- a/server/filter.py
+++ b/server/filter.py
@@ -183,6 +183,17 @@ class Filter(JailThread):
 	def run(self):
 		raise Exception("run() is abstract")
 	
+	##
+	# Ban an IP - http://blogs.buanzo.com.ar/2009/04/fail2ban-patch-ban-ip-address-manually.html
+	# Arturo 'Buanzo' Busleiman <buanzo@buanzo.com.ar>
+	#
+	# to enable banip fail2ban-client BAN command
+	
+	def addBannedIP(self, ip):
+		unixTime = time.time()
+		self.failManager.addFailure(FailTicket(ip, unixTime))
+		return ip
+	
 	##
 	# Add an IP/DNS to the ignore list.
 	#
diff --git a/server/server.py b/server/server.py
index 53058bbf..7f58199e 100644
--- a/server/server.py
+++ b/server/server.py
@@ -221,6 +221,9 @@ class Server:
 	def setBanTime(self, name, value):
 		self.__jails.getAction(name).setBanTime(value)
 	
+	def setBanIP(self, name, value):
+		return self.__jails.getFilter(name).addBannedIP(value)
+		
 	def getBanTime(self, name):
 		return self.__jails.getAction(name).getBanTime()
 	
diff --git a/server/transmitter.py b/server/transmitter.py
index 40a79137..cb9d668d 100644
--- a/server/transmitter.py
+++ b/server/transmitter.py
@@ -164,6 +164,9 @@ class Transmitter:
 			value = command[2]
 			self.__server.setBanTime(name, int(value))
 			return self.__server.getBanTime(name)
+		elif command[1] == "banip":
+			value = command[2]
+			return self.__server.setBanIP(name,value)
 		elif command[1] == "addaction":
 			value = command[2]
 			self.__server.addAction(name, value)