From 91bb2fc9381b39e5b86d1243eff54ec51c8fb17e Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Thu, 5 Feb 2009 11:16:15 -0500
Subject: [PATCH] BF: anchoring regex for IP with "$" at the end + adjust
 regexp for <HOST> (closes: #514163)

manually done patching similar to the one in up/fix_searchIP_v2 branch
---
 server/filter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/filter.py b/server/filter.py
index 86cf1d03..79bbdeda 100644
--- a/server/filter.py
+++ b/server/filter.py
@@ -171,7 +171,7 @@ class Filter(JailThread):
 				self.__failRegexObj = None
 			else:
 				# Replace "<HOST>" with default regular expression for host.
-				regex = value.replace("<HOST>", "(?:::f{4,6}:)?(?P<host>\S+)")
+				regex = value.replace("<HOST>", "(?:::f{4,6}:)?(?P<host>[\w\-.^_]+)")
 				self.__failRegex = regex
 				self.__failRegexObj = re.compile(regex)
 			logSys.info("Set failregex = %s" % self.__failRegex)
@@ -469,7 +469,7 @@ import socket, struct
 class DNSUtils:
 	
 	DNS_CRE = re.compile("(?:(?:\w|-)+\.){2,}\w+")
-	IP_CRE = re.compile("(?:\d{1,3}\.){3}\d{1,3}")
+	IP_CRE = re.compile("(?:\d{1,3}\.){3}\d{1,3}$")
 	
 	@staticmethod
 	def dnsToIp(dns):