mirror of https://github.com/fail2ban/fail2ban
- Removed textToDns() which is not required anymore. Thanks to Yaroslav Halchenko
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@605 a942ae1a-1317-0410-a47c-b1dcaea8d605_tent/ipv6_via_aInfo
parent
711f936ed0
commit
7c33b443ac
|
@ -22,6 +22,8 @@ ver. 0.8.1 (2007/??/??) - stable
|
||||||
David Nutter
|
David Nutter
|
||||||
- Added webmin authentication filter. Thanks to Guillaume
|
- Added webmin authentication filter. Thanks to Guillaume
|
||||||
Delvit
|
Delvit
|
||||||
|
- Removed textToDns() which is not required anymore. Thanks
|
||||||
|
to Yaroslav Halchenko
|
||||||
|
|
||||||
ver. 0.8.0 (2007/05/03) - stable
|
ver. 0.8.0 (2007/05/03) - stable
|
||||||
----------
|
----------
|
||||||
|
|
|
@ -503,17 +503,6 @@ class DNSUtils:
|
||||||
% dns)
|
% dns)
|
||||||
return list()
|
return list()
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def textToDns(text):
|
|
||||||
""" Search for possible DNS in an arbitrary text.
|
|
||||||
Thanks to Tom Pike.
|
|
||||||
"""
|
|
||||||
match = DNSUtils.DNS_CRE.match(text)
|
|
||||||
if match:
|
|
||||||
return match
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def searchIP(text):
|
def searchIP(text):
|
||||||
""" Search if an IP address if directly available and return
|
""" Search if an IP address if directly available and return
|
||||||
|
@ -549,9 +538,7 @@ class DNSUtils:
|
||||||
ipList.append(plainIPStr)
|
ipList.append(plainIPStr)
|
||||||
if not ipList:
|
if not ipList:
|
||||||
# Try to get IP from possible DNS
|
# Try to get IP from possible DNS
|
||||||
dns = DNSUtils.textToDns(text)
|
ip = DNSUtils.dnsToIp(text)
|
||||||
if not dns == None:
|
|
||||||
ip = DNSUtils.dnsToIp(dns.group(0))
|
|
||||||
for e in ip:
|
for e in ip:
|
||||||
ipList.append(e)
|
ipList.append(e)
|
||||||
return ipList
|
return ipList
|
||||||
|
|
Loading…
Reference in New Issue