diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt index 4d5cf5e74..9219ff2b0 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt @@ -410,67 +410,67 @@ y6.no # ——— Anti-phishing filters for tools that support wildcards, are below this line. ——— # ——— Don't be worried if you see entries that resemble major Nordic websites; those are wildcard entries for use with e.g. Samsung Knox, that attempts to stop phishing sites that have stolen the website brands in question. ——— -(.*|\.)?vg\.no\..*$ -(.*|\.)?elkjop\.no\..*$ -(.*|\.)?coop\.no\..*$ -(.*|\.)?shell\.no\..*$ -(.*|\.)?finn\.no\..*$ -(.*|\.)?dnb\.no\..*$ -(.*|\.)?sparebank1\.no\..*$ -(.*|\.)?nordea\.no\..*$ -(.*|\.)?sbanken\.no\..*$ -(.*|\.)?danskebank\.no\..*$ -(.*|\.)?komplett\.no\..*$ -(.*|\.)?nordnet\.no\..*$ -(.*|\.)?skatteetaten\.no\..*$ -(.*|\.)?norwegian\.com\..*$ -(.*|\.)?flysas-no\..*$ -(.*|\.)?tusenfryd-com\..*$ -(.*|\.)?*\.gratis-reisebilletter\..*$ -(.*|\.)?paypal\..*\.no$ -(.*|\.)?kiwi\.com-*$ -(.*|\.)?kongeparken\.com-*$ -(.*|\.)?vipps-sikkerhet\..*$ -(.*|\.)?getmail-no\..*$ -(.*|\.)?(.*|\.)?legoland\.com-.*\..*$ -(.*|\.)?(.*|\.)?faarup\.com-.*\..*$ -(.*|\.)?(.*|\.)?djurs\.com-.*\..*$ -(.*|\.)?appleid\..*\.no$ -(.*|\.)?itunesconnect-.*\.no$ -(.*|\.)?fintechnow.*\.buzz$ -(.*|\.)?wealthnews.*\.xyz$ -(.*|\.)?euronews.*\.buzz$ -(.*|\.)?softwaredaily.*\.monster$ -(.*|\.)?stalknews.*\.buzz$ -(.*|\.)?goldupdates.*\.xyz$ +(.*\.)?vg\.no\..*$ +(.*\.)?elkjop\.no\..*$ +(.*\.)?coop\.no\..*$ +(.*\.)?shell\.no\..*$ +(.*\.)?finn\.no\..*$ +(.*\.)?dnb\.no\..*$ +(.*\.)?sparebank1\.no\..*$ +(.*\.)?nordea\.no\..*$ +(.*\.)?sbanken\.no\..*$ +(.*\.)?danskebank\.no\..*$ +(.*\.)?komplett\.no\..*$ +(.*\.)?nordnet\.no\..*$ +(.*\.)?skatteetaten\.no\..*$ +(.*\.)?norwegian\.com\..*$ +(.*\.)?flysas-no\..*$ +(.*\.)?tusenfryd-com\..*$ +(.*\.)?*\.gratis-reisebilletter\..*$ +(.*\.)?paypal\..*\.no$ +(.*\.)?kiwi\.com-*$ +(.*\.)?kongeparken\.com-*$ +(.*\.)?vipps-sikkerhet\..*$ +(.*\.)?getmail-no\..*$ +(.*\.)?legoland\.com-.*\..*$ +(.*\.)?faarup\.com-.*\..*$ +(.*\.)?djurs\.com-.*\..*$ +(.*\.)?appleid\..*\.no$ +(.*\.)?itunesconnect-.*\.no$ +(.*\.)?fintechnow.*\.buzz$ +(.*\.)?wealthnews.*\.xyz$ +(.*\.)?euronews.*\.buzz$ +(.*\.)?softwaredaily.*\.monster$ +(.*\.)?stalknews.*\.buzz$ +(.*\.)?goldupdates.*\.xyz$ .*\.vidcopa\.me$ -(.*|\.)?sikre-vipps-konto\..*$ -(.*|\.)?dnb\.no-*$ -(.*|\.)?norge\..*\.icu$ -(.*|\.)?signup-.*vpns\.com -(.*|\.)?telenors\..*\.cx$ -(.*|\.)?-sparebank1\..*\.net +(.*\.)?sikre-vipps-konto\..*$ +(.*\.)?dnb\.no-*$ +(.*\.)?norge\..*\.icu$ +(.*\.)?signup-.*vpns\.com$ +(.*\.)?telenors\..*\.cx$ +(.*\.)?-sparebank1\..*\.net$ ^[a-z]{10,12}\.easy\.co$ -(.*|\.)?bankid-sperret\..*$ +(.*\.)?bankid-sperret\..*$ # ——— Anti-ad filters for tools that support wildcards, are below this line. ——— -(.*|\.)?annonse\..*\.no$ -(.*|\.)?ad\..*\.no$ -(.*|\.)?ad1\..*\.no$ -(.*|\.)?ad1\..*\.dk$ -(.*|\.)?ads\..*\.no$ -(.*|\.)?ads\..*\.dk$ -(.*|\.)?ads\..*\.is$ -(.*|\.)?adserver\..*\.dk$ -(.*|\.)?annonser\..*\.no$ -(.*|\.)?banner\..*\.no$ -(.*|\.)?helios\..*\.no$ -(.*|\.)?advert\..*\.no$ -(.*|\.)?advertisement\..*\.no$ -(.*|\.)?auglysingar\..*\.is$ -(.*|\.)?vefbordar\..*\.is$ -(.*|\.)?vevlysingar\.*\..*$ -(.*|\.)?mobilannonce\..*\.dk$ +(.*\.)?annonse\..*\.no$ +(.*\.)?ad\..*\.no$ +(.*\.)?ad1\..*\.no$ +(.*\.)?ad1\..*\.dk$ +(.*\.)?ads\..*\.no$ +(.*\.)?ads\..*\.dk$ +(.*\.)?ads\..*\.is$ +(.*\.)?adserver\..*\.dk$ +(.*\.)?annonser\..*\.no$ +(.*\.)?banner\..*\.no$ +(.*\.)?helios\..*\.no$ +(.*\.)?advert\..*\.no$ +(.*\.)?advertisement\..*\.no$ +(.*\.)?auglysingar\..*\.is$ +(.*\.)?vefbordar\..*\.is$ +(.*\.)?vevlysingar\.*\..*$ +(.*\.)?mobilannonce\..*\.dk$ # ——— Centralised whitelist section ——— # ——— By default, the entries below will only work without modification in 'personalDNSBlocker'. For a whitelist suitable for e.g. Pi-hole, Blokada and DNS66, check out https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersDomainsAllowlist.txt ——— diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 65d5ef6bd..6c99e362a 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -3318,43 +3318,43 @@ def prepare_pihole(lines) -> str: line = re.sub( r"^([a-z0-9].*)\.(.*)\.\*", - r"(.*|\.)?\1\\.\2\\..*$", + r"(.*\.)?\1\\.\2\\..*$", line ) line = re.sub( r"^([a-z0-9].*)\.\*$", - r"(.*|\.)?\1\\..*$", + r"(.*\.)?\1\\..*$", line ) line = re.sub( r"^(.*)\.(.*)-\*", - r"(.*|\.)?\1\\.\2-*$", + r"(.*\.)?\1\\.\2-*$", line ) line = re.sub( r"^([a-z0-9].*)\.\*\.(.*)", - r"(.*|\.)?\1\\..*\\.\2$", + r"(.*\.)?\1\\..*\\.\2$", line ) line = re.sub( r"^\*\.(.*)\.\*", - r"(.*|\.)?*\\.\1\\..*$", + r"(.*\.)?*\\.\1\\..*$", line ) line = re.sub( r"^([a-z0-9].*)\*\.(.*)", - r"(.*|\.)?\1.*\\.\2$", + r"(.*\.)?\1.*\\.\2$", line ) line = re.sub( r"(\(\.\*\\\.\)\?){2}", - r"(.*|\.)?", + r"(.*\.)?", line ) @@ -3372,13 +3372,13 @@ def prepare_pihole(lines) -> str: line = re.sub( r"^([a-z0-9-]{1,})\*([a-z0-9-]{1,})\.([a-z]{2,17})$", - r"(.*|\\.)?\1.*\2\\.\3", + r"(.*\\.)?\1.*\2\\.\3$", line ) line = re.sub( r"^\*(-[a-z0-9]{1,})\.\*\.([a-z]{2,17})$", - r"(.*|\\.)?\1\\..*\\.\2", + r"(.*\\.)?\1\\..*\\.\2$", line )