Merge pull request #341 from indrajitr/hostmatch-fix
authorSteven Black <redacted>
Sun, 9 Jul 2017 17:13:57 +0000 (13:13 -0400)
committerGitHub <redacted>
Sun, 9 Jul 2017 17:13:57 +0000 (13:13 -0400)
Honor whitelist exclusion only for domain or subdomain match

1  2 
updateHostsFile.py

index 289191ee18ed4e5187de6558977c4edb73b46ccd,27d5b09622363dd742c0259455107fc42dfd24a2..4d795e7ec99207618a0f2b842449fa0483cc2aa0
@@@ -480,12 -469,9 +480,12 @@@ def remove_dups_and_excl(merge_file)
              continue
  
          # Normalize rule
 -        hostname, normalized_rule = normalize_rule(stripped_rule)
 +        hostname, normalized_rule = normalize_rule(
 +            stripped_rule, target_ip=settings["targetip"],
 +            keep_domain_comments=settings["keepdomaincomments"])
 +
          for exclude in exclusions:
-             if exclude in line:
+             if re.search('[\s\.]' + re.escape(exclude) + '\s', line):
                  write_line = False
                  break
  
git clone https://git.99rst.org/PROJECT