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/1374/head
Alexander Koeppe 2016-02-29 20:54:58 +01:00
parent 7e689d20e7
commit 674e15c851
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fail2ban/server/filter.py
View File

@ -861,22 +861,24 @@ class DNSUtils:
""" Convert a DNS into an IP address using the Python socket module. """ Convert a DNS into an IP address using the Python socket module.
Thanks to Kevin Drapel. Thanks to Kevin Drapel.
""" """
# retrieve ip (todo: use AF_INET6 for IPv6)
try: try:
return 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)
return ips
except socket.error, e: except socket.error, e:
logSys.warning("Unable to find a corresponding IP address for %s: %s" logSys.warning("Unable to find a corresponding IP address for %s: %s"
% (dns, e)) % (dns, e))
return list() return list()
except socket.error, e:
logSys.warning("Socket error raised trying to resolve hostname %s: %s"
% (dns, e))
return list()
@staticmethod @staticmethod
def ipToName(ip): def ipToName(ip):
try: try:
return socket.gethostbyaddr(ip)[0] return 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))
return None return None
@ -909,11 +911,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: