Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

'is_localhost()' -> 'host_permitted()'

Browse source
This commit is contained in:
jesopo 2019-09-30 15:15:20 +01:00
parent b9c64b7cf1
commit f306213cb8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/title.py
View file

@ -21,8 +21,8 @@ class Module(ModuleManager.BaseModule):
url = "http://%s" % url
hostname = urllib.parse.urlparse(url).hostname
if utils.http.is_localhost(hostname):
self.log.warn("tried to get title of localhost: %s", [url])
if not utils.http.host_permitted(hostname):
self.log.warn("Attempted to get forbidden host: %s", [url])
return -1, None
try:

8
src/utils/http.py
View file

@ -287,7 +287,7 @@ def is_ip(addr: str) -> bool:
return False
return True
def is_localhost(hostname: str) -> bool:
def host_permitted(hostname: str) -> bool:
if is_ip(hostname):
ips = [ipaddress.ip_address(hostname)]
else:
@ -300,7 +300,7 @@ def is_localhost(hostname: str) -> bool:
)+links.get(netifaces.AF_INET6, []):
address = ipaddress.ip_address(link["addr"].split("%", 1)[0])
if address in ips:
return True
return False
for ip in ips:
if ip.version == 6 and ip.ipv4_mapped:
ip = ip.ipv4_mapped
@ -309,6 +309,6 @@ def is_localhost(hostname: str) -> bool:
ip.is_link_local or
ip.is_multicast or
ip.is_private):
return True
return False
return False
return True