rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove WHITELISTED, making file parsing satisfy:

Browse Source 
1) 'dotless' hosts, e.g. localhost, cannot be blocked by a file
2) hosts ending in '.localdomain' cannot be blocked by a file
This commit is contained in:
George Edward Bulmer 2018-03-24 19:42:34 +00:00
parent f1789effdc
commit c8db9e1c76
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/browser/adblock.py
View File

@ -94,14 +94,8 @@ class HostBlocker:
_done_count: How many files have been read successfully.
_local_hosts_file: The path to the blocked-hosts file.
_config_hosts_file: The path to a blocked-hosts in ~/.config
Class attributes:
WHITELISTED: Hosts which never should be blocked.
"""
WHITELISTED = ('localhost', 'localhost.localdomain', 'broadcasthost',
'local')
def __init__(self):
self._blocked_hosts = set()
self._config_blocked_hosts = set()
@ -242,7 +236,7 @@ class HostBlocker:
log.misc.error("Failed to parse: {!r}".format(line))
return False
if host not in self.WHITELISTED:
if '.' not in host and not host.endswith('.localdomain'):
self._blocked_hosts.add(host)
return True