github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Make DNS resolution IP address family idependent

pull/1414/head
Alexander Koeppe 2016-02-29 20:54:58 +01:00 committed by sebres
parent 3893a6b780
commit a757037671
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fail2ban/server/filter.py
View File

@ -1012,18 +1012,22 @@ class DNSUtils:
Thanks to Kevin Drapel. Thanks to Kevin Drapel.
""" """
# cache, also prevent long wait during retrieving of ip for wrong dns or lazy dns-system: # cache, also prevent long wait during retrieving of ip for wrong dns or lazy dns-system:
v = DNSUtils.CACHE_nameToIp.get(dns) ips = DNSUtils.CACHE_nameToIp.get(dns)
if v is not None: if ips is not None:
return v return ips
# retrieve ip (todo: use AF_INET6 for IPv6) # retrieve ips
try: try:
v = set([i[4][0] for i in socket.getaddrinfo(dns, None, socket.AF_INET, 0, socket.IPPROTO_TCP)]) ips = list()
for result in socket.getaddrinfo(dns, None, 0, 0, socket.IPPROTO_TCP):
ip = IPAddr(result[4][0])
if ip.isValidIP():
ips.append(ip)
except socket.error, e: except socket.error, e:
# todo: make configurable the expired time of cache entry: # todo: make configurable the expired time of cache entry:
logSys.warning("Unable to find a corresponding IP address for %s: %s", dns, e) logSys.warning("Unable to find a corresponding IP address for %s: %s", dns, e)
v = list() ips = list()
DNSUtils.CACHE_nameToIp.set(dns, v) DNSUtils.CACHE_nameToIp.set(dns, ips)
return v return ips
@staticmethod @staticmethod
def ipToName(ip): def ipToName(ip):
@ -1033,7 +1037,7 @@ class DNSUtils:
return v return v
# retrieve name # retrieve name
try: try:
v = socket.gethostbyaddr(ip)[0] v = socket.gethostbyaddr(ip.ntoa())[0]
except socket.error, e: except socket.error, e:
logSys.debug("Unable to find a name for the IP %s: %s", ip, e) logSys.debug("Unable to find a name for the IP %s: %s", ip, e)
v = None v = None
@ -1068,11 +1072,11 @@ class DNSUtils:
""" """
ipList = list() ipList = list()
# Search for plain IP # Search for plain IP
plainIP = DNSUtils.searchIP(text) plainIP = IPAddr.searchIP(text)
if not plainIP is None: if not plainIP is None:
plainIPStr = plainIP.group(0) ip = IPAddr(plainIP.group(0))
if DNSUtils.isValidIP(plainIPStr): if ip.isValidIP():
ipList.append(plainIPStr) ipList.append(ip)
# If we are allowed to resolve -- give it a try if nothing was found # If we are allowed to resolve -- give it a try if nothing was found
if useDns in ("yes", "warn") and not ipList: if useDns in ("yes", "warn") and not ipList: