sergey/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2026-07-01 02:36:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1628: fix — parse out @ characters from lists.

Browse Source
This commit is contained in:
Steven Black
2021-04-26 17:55:39 -04:00
parent 2b167dcce8
commit 023eb7faa7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
testUpdateHostsFile.py
View File

@@ -634,7 +634,7 @@ class TestMatchesExclusions(Base):
self.assertTrue(matches_exclusions(domain, exclusion_regexes)) self.assertTrue(matches_exclusions(domain, exclusion_regexes))
def test_match_raw_list(self): def test_match_raw_list(self):
exclusion_regexes = [r".*\.com", r".*\.org", r".*\.edu"] exclusion_regexes = [r".*\.com", r".*\.org", r".*\.edu", r".*@.*"]
exclusion_regexes = [re.compile(regex) for regex in exclusion_regexes] exclusion_regexes = [re.compile(regex) for regex in exclusion_regexes]
for domain in [ for domain in [
@@ -642,6 +642,7 @@ class TestMatchesExclusions(Base):
"yahoo.com", "yahoo.com",
"adaway.org", "adaway.org",
"education.edu", "education.edu",
"a.stro.lo.gy@45.144.225.135",
]: ]:
self.assertTrue(matches_exclusions(domain, exclusion_regexes)) self.assertTrue(matches_exclusions(domain, exclusion_regexes))

4
updateHostsFile.py
View File

@@ -943,6 +943,10 @@ def remove_dups_and_excl(merge_file, exclusion_regexes, output_file=None):
if not stripped_rule or matches_exclusions(stripped_rule, exclusion_regexes): if not stripped_rule or matches_exclusions(stripped_rule, exclusion_regexes):
continue continue
# Issue #1628
if ("@" in stripped_rule):
continue
# Normalize rule # Normalize rule
hostname, normalized_rule = normalize_rule( hostname, normalized_rule = normalize_rule(
stripped_rule, stripped_rule,