mirror of
https://github.com/StevenBlack/hosts.git
synced 2026-07-01 02:36:52 +00:00
Issue #2785: fix — ignore domains ending with a dot.
This commit is contained in:
@@ -846,6 +846,7 @@ class TestNormalizeRule(BaseStdout):
|
|||||||
"0.3.4.5 example.org/hello/world",
|
"0.3.4.5 example.org/hello/world",
|
||||||
"0.0.0.0 https",
|
"0.0.0.0 https",
|
||||||
"0.0.0.0 https..",
|
"0.0.0.0 https..",
|
||||||
|
"0.0.0.0 foo.",
|
||||||
]:
|
]:
|
||||||
self.assertEqual(normalize_rule(rule, **kwargs), (None, None))
|
self.assertEqual(normalize_rule(rule, **kwargs), (None, None))
|
||||||
|
|
||||||
|
|||||||
@@ -1129,8 +1129,9 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
|
|||||||
is_ip(hostname)
|
is_ip(hostname)
|
||||||
or re.search(static_ip_regex, hostname)
|
or re.search(static_ip_regex, hostname)
|
||||||
or "." not in hostname
|
or "." not in hostname
|
||||||
or "/" in hostname
|
|
||||||
or ".." in hostname
|
or ".." in hostname
|
||||||
|
or "." in hostname[-1]
|
||||||
|
or "/" in hostname
|
||||||
or ":" in hostname
|
or ":" in hostname
|
||||||
):
|
):
|
||||||
# Example: 0.0.0.0 127.0.0.1
|
# Example: 0.0.0.0 127.0.0.1
|
||||||
@@ -1138,6 +1139,9 @@ def normalize_rule(rule, target_ip, keep_domain_comments):
|
|||||||
# If the hostname is:
|
# If the hostname is:
|
||||||
# - an IP - or looks like it,
|
# - an IP - or looks like it,
|
||||||
# - doesn't contain dots, or
|
# - doesn't contain dots, or
|
||||||
|
# - contains repeated dots,
|
||||||
|
# - ends in a dot, or
|
||||||
|
# - contains a slash, or
|
||||||
# - contains a colon,
|
# - contains a colon,
|
||||||
# we don't want to normalize it.
|
# we don't want to normalize it.
|
||||||
return belch_unwanted(rule)
|
return belch_unwanted(rule)
|
||||||
|
|||||||
Reference in New Issue
Block a user