Remove WHITELISTED, making file parsing satisfy:
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:
parent
f1789effdc
commit
c8db9e1c76
@ -94,14 +94,8 @@ class HostBlocker:
|
|||||||
_done_count: How many files have been read successfully.
|
_done_count: How many files have been read successfully.
|
||||||
_local_hosts_file: The path to the blocked-hosts file.
|
_local_hosts_file: The path to the blocked-hosts file.
|
||||||
_config_hosts_file: The path to a blocked-hosts in ~/.config
|
_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):
|
def __init__(self):
|
||||||
self._blocked_hosts = set()
|
self._blocked_hosts = set()
|
||||||
self._config_blocked_hosts = set()
|
self._config_blocked_hosts = set()
|
||||||
@ -242,7 +236,7 @@ class HostBlocker:
|
|||||||
log.misc.error("Failed to parse: {!r}".format(line))
|
log.misc.error("Failed to parse: {!r}".format(line))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if host not in self.WHITELISTED:
|
if '.' not in host and not host.endswith('.localdomain'):
|
||||||
self._blocked_hosts.add(host)
|
self._blocked_hosts.add(host)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
Loading…
Reference in New Issue
Block a user