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

Ensure that hostnames without dots are excluded.

Browse Source 
This patch fixes #2347.
This commit is contained in:
funilrys
2023-07-26 15:06:21 +02:00
parent 93f0d86d46
commit 7e25ed039a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testUpdateHostsFile.py
View File

@@ -842,6 +842,7 @@ class TestNormalizeRule(BaseStdout):
"128.0.0.1", "128.0.0.1",
"0.0.0 google", "0.0.0 google",
"0.1.2.3.4 foo/bar", "0.1.2.3.4 foo/bar",
"0.0.0.0 https"
]: ]:
self.assertEqual(normalize_rule(rule, **kwargs), (None, None)) self.assertEqual(normalize_rule(rule, **kwargs), (None, None))

4
updateHostsFile.py
View File

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