Issue #1628: fix — parse out @ characters from lists.

diff --git a/testUpdateHostsFile.py b/testUpdateHostsFile.py
index d93028d6dbfbe9c59a9f193b3d2ceb1e08f4e8e7..95a2756457a06d72e2df08743ab14eccebf2e063 100644 (file)
--- a/testUpdateHostsFile.py
+++ b/testUpdateHostsFile.py
@@ -634,7 +634,7 @@ class TestMatchesExclusions(Base):
             self.assertTrue(matches_exclusions(domain, exclusion_regexes))
 
     def test_match_raw_list(self):
-        exclusion_regexes = [r".*\.com", r".*\.org", r".*\.edu"]
+        exclusion_regexes = [r".*\.com", r".*\.org", r".*\.edu", r".*@.*"]
         exclusion_regexes = [re.compile(regex) for regex in exclusion_regexes]
 
         for domain in [
@@ -642,6 +642,7 @@ class TestMatchesExclusions(Base):
             "yahoo.com",
             "adaway.org",
             "education.edu",
+            "a.stro.lo.gy@45.144.225.135",
         ]:
             self.assertTrue(matches_exclusions(domain, exclusion_regexes))
 

diff --git a/updateHostsFile.py b/updateHostsFile.py
index 3656c5f719e30e72e27bb87724b86b5749fcf263..1bb937c1bb005a0bbcc83ee3d96210170db38e16 100644 (file)
--- a/updateHostsFile.py
+++ b/updateHostsFile.py
@@ -943,6 +943,10 @@ def remove_dups_and_excl(merge_file, exclusion_regexes, output_file=None):
         if not stripped_rule or matches_exclusions(stripped_rule, exclusion_regexes):
             continue
 
+        # Issue #1628
+        if ("@" in stripped_rule):
+            continue
+
         # Normalize rule
         hostname, normalized_rule = normalize_rule(
             stripped_rule,