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

2nd Iter: Ensure that hostnames without dots are excluded.

Browse Source 
This patch fixes #2347.

Indeed, my previous patch was missing domains with dashes (-).
This commit is contained in:
funilrys
2023-08-05 20:39:41 +02:00
parent 8f208abb74
commit 1f3f3236ed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testUpdateHostsFile.py
View File

@@ -842,7 +842,7 @@ class TestNormalizeRule(BaseStdout):
"128.0.0.1",
"0.0.0 google",
"0.1.2.3.4 foo/bar",
"0.0.0.0 https"
"0.0.0.0 https",
]:
self.assertEqual(normalize_rule(rule, **kwargs), (None, None))
@@ -905,7 +905,7 @@ class TestNormalizeRule(BaseStdout):
sys.stdout = StringIO()
def test_no_comment_raw(self):
for rule in ("twitter.com", "google.com", "foo.bar.edu"):
for rule in ("twitter.com", "google.com", "foo.bar.edu", "www.example-foo.bar.edu"):
expected = (rule, "0.0.0.0 " + rule + "\n")
actual = normalize_rule(

4
updateHostsFile.py
View File

@@ -1061,7 +1061,7 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
"""
first try: IP followed by domain
"""
regex = r"^\s*(\d{1,3}\.){3}\d{1,3}\s+([\w\.-]+[a-zA-Z])(.*)"
regex = r"^\s*(\d{1,3}\.){3}\d{1,3}\s+((?:\w+\.)+[a-zA-Z\.-]+)(.*)"
result = re.search(regex, rule)
if result:
@@ -1090,7 +1090,7 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
"""
# deny any potential IPv6 address here.
if ":" not in rule:
regex = r"^\s*([\w\.-]+[a-zA-Z])(.*)"
regex = r"^\s*((?:\w+\.)+[a-zA-Z\.-]+)(.*)"
result = re.search(regex, rule)
if result: