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

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

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: