starred/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2026-10-03 22:06:58 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #1709 from funilrys/issue-1687

Browse Source 
Fix whitelisting issue when RAW list are given
This commit is contained in:
Steven Black
2021-07-13 22:19:35 -04:00
committed by GitHub
parent 52d759a680 4f6ddfaab8
commit a6c7f1f838
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testUpdateHostsFile.py
+6 -2
View File
@@ -543,7 +543,9 @@ class TestGatherCustomExclusions(BaseStdout):
# Can only test in the invalid domain case
# because of the settings global variable.
@mock.patch("updateHostsFile.input", side_effect=["foo", "no"])
@mock.patch("updateHostsFile.is_valid_user_provided_domain_format", return_value=False)
@mock.patch(
"updateHostsFile.is_valid_user_provided_domain_format", return_value=False
)
def test_basic(self, *_):
gather_custom_exclusions("foo", [])
@@ -552,7 +554,9 @@ class TestGatherCustomExclusions(BaseStdout):
self.assertIn(expected, output)
@mock.patch("updateHostsFile.input", side_effect=["foo", "yes", "bar", "no"])
@mock.patch("updateHostsFile.is_valid_user_provided_domain_format", return_value=False)
@mock.patch(
"updateHostsFile.is_valid_user_provided_domain_format", return_value=False
)
def test_multiple(self, *_):
gather_custom_exclusions("foo", [])
updateHostsFile.py
+2 -2
View File
@@ -944,7 +944,7 @@ def remove_dups_and_excl(merge_file, exclusion_regexes, output_file=None):
continue
# Issue #1628
if ("@" in stripped_rule):
if "@" in stripped_rule:
continue
# Normalize rule
@@ -955,7 +955,7 @@ def remove_dups_and_excl(merge_file, exclusion_regexes, output_file=None):
)
for exclude in exclusions:
if re.search(r"[\s\.]" + re.escape(exclude) + r"\s", line):
if re.search(r"(^|[\s\.])" + re.escape(exclude) + r"\s", line):
write_line = False
break