Skip to content

Commit

Permalink
Correct 2nd Iter: Hostnames to lowercase.
Browse files Browse the repository at this point in the history
As mentioned by @StevenBlack in StevenBlack#2400, hostnames should be
converted to lowercase.
  • Loading branch information
funilrys committed Sep 7, 2023
1 parent 422d6a5 commit 3b4709f
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
19 changes: 19 additions & 0 deletions testUpdateHostsFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,25 @@ def test_no_match(self):
expected = "==>" + rule + "<=="
self.assertIn(expected, output)

def test_mixed_cases(self):
for rule, expected_target in (
("tWiTTer.cOM", "twitter.com"),
("goOgLe.Com", "google.com"),
("FoO.bAR.edu", "foo.bar.edu"),
):
expected = (expected_target, "0.0.0.0 " + expected_target + "\n")

actual = normalize_rule(
rule, target_ip="0.0.0.0", keep_domain_comments=False
)
self.assertEqual(actual, expected)

# Nothing gets printed if there's a match.
output = sys.stdout.getvalue()
self.assertEqual(output, "")

sys.stdout = StringIO()

def test_no_comments(self):
for target_ip in ("0.0.0.0", "127.0.0.1", "8.8.8.8"):
rule = "127.0.0.1 1.google.com foo"
Expand Down
4 changes: 4 additions & 0 deletions updateHostsFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1123,6 +1123,8 @@ def belch_unwanted(unwanted: str) -> Tuple[None, None]:
# Example: 0.0.0.0 example.org
hostname, suffix = split_rule[-1], None

hostname = hostname.lower()

if (
is_ip(hostname)
or re.search(static_ip_regex, hostname)
Expand Down Expand Up @@ -1154,6 +1156,8 @@ def belch_unwanted(unwanted: str) -> Tuple[None, None]:
except ValueError:
hostname, suffix = split_rule[0], None

hostname = hostname.lower()

return normalize_response(hostname, suffix)

return belch_unwanted(rule)
Expand Down

0 comments on commit 3b4709f

Please sign in to comment.