From 139be5f70d474788dde9d82aafb73c98251bb5e9 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 15 Sep 2019 18:38:39 +0200 Subject: [PATCH] Add files via upload --- .../AdawayHosts | 4 +- .../DandelionSproutsNorskeFiltre.tpl | 5 +- .../NordicFiltersABP.txt | 7 +- .../NordicFiltersAdGuard.txt | 5 +- .../NordicFiltersHostsDeny.deny | 2 +- .../NordicFiltersPiHole.txt | 221 ++++++++++++++++++ .../NordicFiltersPrivacy.txt | 5 +- .../NordicFiltersPrivoxy.action | 5 +- .../XYZPrepareFilters.py | 72 +++++- 9 files changed, 314 insertions(+), 12 deletions(-) create mode 100644 NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt diff --git a/NorwegianExperimentalList alternate versions/AdawayHosts b/NorwegianExperimentalList alternate versions/AdawayHosts index fd6cd67a2..1970af0dd 100644 --- a/NorwegianExperimentalList alternate versions/AdawayHosts +++ b/NorwegianExperimentalList alternate versions/AdawayHosts @@ -1,8 +1,8 @@ # Title: Dandelion Sprouts nordiske filtre («hosts»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The «hosts» file version) -# Version: 13September2019v1 +# Version: 15September2019v1 # Description: This is a slimmer version of "Dandelion Sprout's Nordic Filters", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers. -# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including Blokada, DNS66, Gas Mask, Diversion, and many others; as well as those who edit their OS' «hosts» system file. +# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file. # For mere informasjon og detaljer om denne listen og om andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk # For more information and details about this list and other lists of mine, go to https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english 127.0.0.1 101mesh.com diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index cffcf6438..e1ff120f8 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,6 +1,6 @@ msFilterList -# Version: 13September2019v1-Beta -# Version: 130920191 (for Adblock Plus' issue report system) +# Version: 14September2019v1-Beta +# Version: 140920191 (for Adblock Plus' issue report system) # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -65,6 +65,7 @@ msFilterList -d vevlysingar.fo -d boligkanalen-maestro-new.azurewebsites.net -d tracking-genesisaffiliates.com +-d medialaben.no * a11y* - *-annonse-* - -bazaar- - bazaar * diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index a68435682..4521d4db8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,6 +1,6 @@ [Adblock Plus 3.4] -! Version: 13September2019v1 -! Version: 130920191 (for Adblock Plus' issue report system) +! Version: 14September2019v1 +! Version: 140920191 (for Adblock Plus' issue report system) ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -272,6 +272,7 @@ xstra.no##.td-fix-index ||vevlysingar.fo$subdocument,third-party ||boligkanalen-maestro-new.azurewebsites.net$image ||tracking-genesisaffiliates.com$image,third-party +||medialaben.no/*/a11y*^ /*-annonse-*$image,domain=resett.no -bazaar-$script,domain=nettavisen.no /bazaar/*$script,domain=nettavisen.no @@ -497,6 +498,8 @@ woman.dk##.gutter-bottom.article-content > div.wg-banner ||gaysir.no/rek/bb_inline$subdocument dmi.dk##.add-container dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad) +jubii.dk##.mobiletakeover-background +pulze.dk###topads ! — — — — — ! https://sol.no/ ##.advertisement diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 259f27846..f417612bf 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,5 +1,5 @@ [AdGuard ≥6] -! Version: 13September2019v1 +! Version: 14September2019v1 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) @@ -308,6 +308,7 @@ xstra.no##.td-fix-index ||vevlysingar.fo$subdocument,third-party ||boligkanalen-maestro-new.azurewebsites.net$image ||tracking-genesisaffiliates.com$image,third-party +||medialaben.no/*/a11y*^ /*-annonse-*$image,domain=resett.no -bazaar-$script,domain=nettavisen.no /bazaar/*$script,domain=nettavisen.no @@ -534,6 +535,8 @@ woman.dk##.gutter-bottom.article-content > div.wg-banner ||gaysir.no/rek/bb_inline$subdocument dmi.dk##.add-container dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad) +jubii.dk##.mobiletakeover-background +pulze.dk###topads ! — — — — — ! https://sol.no/ ##.advertisement diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny index ae701f5f7..7443a506a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny +++ b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre («hosts.deny»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The «hosts.deny» version) -# Version: 13September2019v1-Beta +# Version: 15September2019v1-Beta # Description: This is a slimmer version of "Dandelion Sprout's Nordic Filters", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers. # Platform notes: This list version is intended for those who still use a Linux system function called «hosts.deny». # For mere informasjon og detaljer om denne listen og om andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt new file mode 100644 index 000000000..3adf01d45 --- /dev/null +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt @@ -0,0 +1,221 @@ +# Title: 📔 Dandelion Sprouts nordiske filtre (for Pi-hole) +# Translated title: Dandelion Sprout's Nordic Filters (for Pi-hole) +# Version: 15September2019v1-Alpha +# Description: This is a slimmer version of "Dandelion Sprout's Nordic Filters", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers. +# Platform notes: This list version is intended for those who make use of the Regex functionality in Pi-Hole. +# For mere informasjon og detaljer om denne listen og om andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk +# For more information and details about this list and other lists of mine, go to https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#english +101mesh.com +102.112.2o7.net +abafort.us +abafort.us +ad.no.doubleclick.net +ad1.emediate.dk +adamaruiz.org +adext.inkclub.com +adidasko.com +adidassuperstarnorge.com +ads.no +ads.xion.dk +adserver.digitoday.com +adserver.fbg.dk +adserver.karamco.dk +adserver.wagawaga.dk +adservicemedia.dk +airmaxskobillige.com +allergyfl.com +apcleverstore.com +apvoc-ga.com +arvetellefsen.no +ashskonorge.com +assassinfitness.com +bannere.oslonett.no +beblessedbehappy.org +benshermanoslo.com +billigesalg.com +billigskos.com +bilstokken.com +bloggannonser.no +bncentertainment.com +boligkanalen-maestro-new.azurewebsites.net +bostongrnhsflowers.com +breakoutstory24.com +breakoutstory24.com +brightertrade.com +caperforaciones.com +charpente-ramel.com +cluster.chart.dk +cmt.no +com-fryd.com +com-norwegian.com +coralls.com +cost2buy.net +crossfiterada.com +crownedwithlaurels.com +daradis.com +delivered-by-madington.com +denningwelldrilling.com +digitoday.com +dk-ekstrabladet.vp.videoplaza.tv +dk.panel.gemius.dk +dotbanner.dk +drakternorge.com +drcarolyngroff.com +dunjakke-no.com +earnmoneyglobal.com +easy-ad.no +easyliving4you.com +elderlyscissors.com +emediate.eu +emerio.no +euroads.dk +euroads.no +eurosko.net +fatalfailblog.com +festmusikk.com +forum1.no +fotballsko-salg.com +fotballskotilbud.com +gantoslo.com +godeskonettbutikk.com +godsfillingstation.org +gokkw.com +gsport.com +helseprodukt.co +hernoclothing.com +hollisternorge.com +holmedalblikk.no +horizonbagel.com +i1media.no +imprimtacom.com +isweb.no +itsthetrendydealstore.com +jagerjack.com +jakker.co +jakkesalgs.com +jakkesnorge.com +jessicaivory.com +joseph-holland.com +kjolenorge.com +klmyu.com +kundklubb-se.com +legarralazcoz.com +lillevinkelsko.net +lindseysopticians.com +linkshe.com +locchalet2alpes.com +lrgst.com +lymaq.com +manasporthorse.com +mayor4london.com +mbtnorge.com +meadtalkofthetown.com +media.sonymusic.no +meladermfacts.com +mncprobuild.com +moebel-thiems.com +moslt.com +moteshoes.com +mrarmstrongsclass.com +mudancaslvc.com +museuw.com +myad.no +mycraftypad.com +nasajones.com +nettklikk.no +nikebutikks.com +no.moncleritalien.com +no.zxxyw.com +nordartisan.com +norfotball.com +norge.parkaoutdoor.com +norgefotball.com +norgejakke.com +norgejakkerbutikk.com +norgeshoes.com +norwayexpress24.com +nyeskonorge2015.com +nywlm.com +oflike.com +omgrm.com +ontariokitcarbuilders.com +openadex.dk +parajumperjakke.net +parajumpers-longbear.com +parajumpers-norge.site +parajumpers-salg.com +parajumpersit.com +parajumpersitoutlet.com +parajumpersnettbutikk.com +parajumpersnorway.com +parajumpersoutletnorge.com +parajumperssalg.com +pilmedia.ads.visionweb.no +piwik.onlinemagasinet.no +pjs.outlet.com +pmnft.com +popeurope.com +posten.club +postnord-norge.com +primetime.ad.primetime.net +prisjakt.org +quiltstudiolaren.com +reeconindustries.com +retoaudi.com +rig.idg.no +rnbinance.com +rsket.com +ruter.top +sannsyn.com +scottfamilyministries.org +server-no.imrworldwide.com +server-us.imrworldwide.com +skoeccosandaler.com +skonmdnorge.com +ssrodeolivestock.com +static.itrack.it +swellsup.com +sykkeltrøye.com +testgruppens.com +thefivereport.online +thefivereport.online +tiranaaquapark-eg.com +tns-gallup.dk +tobiascelebritymusicevents.com +track.adform.net +tracking-genesisaffiliates.com +trackvoluum.com +tromselementbygg.no +um-bs.com +userneeds.dk +vansnorge.com +vevlysingar.fo +wausauorthopedics.com +webclick.no +webhotell.enivest.no +widget.tippebannere.no +wo.tc +zaskal.com + +# ——— 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-*$ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 06b1d0bdf..28fd314ca 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,5 +1,5 @@ -! Version: 13September2019v1 +! Version: 14September2019v1 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) @@ -308,6 +308,7 @@ xstra.no##.td-fix-index ||vevlysingar.fo$subdocument,3p ||boligkanalen-maestro-new.azurewebsites.net$image ||tracking-genesisaffiliates.com$image,3p +||medialaben.no/*/a11y*^ /*-annonse-*$image,domain=resett.no -bazaar-$script,domain=nettavisen.no /bazaar/*$script,domain=nettavisen.no @@ -534,6 +535,8 @@ woman.dk##.gutter-bottom.article-content > div.wg-banner ||gaysir.no/rek/bb_inline$subdocument dmi.dk##.add-container dmi.dk#?#.large-6:-abp-has(:scope > .section-1-ad) +jubii.dk##.mobiletakeover-background +pulze.dk###topads ! — — — — — ! https://sol.no/ ##.advertisement diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index cd36b1425..da7dc29da 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,6 +1,6 @@ {+block} -# Version: 13September2019v1-Alpha -# Version: 130920191 (for Adblock Plus' issue report system) +# Version: 14September2019v1-Alpha +# Version: 140920191 (for Adblock Plus' issue report system) # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -81,6 +81,7 @@ .vevlysingar.fo .boligkanalen-maestro-new.azurewebsites.net .tracking-genesisaffiliates.com +.medialaben.no/*/a11y* /*-annonse-* -bazaar- /bazaar/* diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 4e84dfa09..f685c11ed 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -811,6 +811,7 @@ OUTPUT_HOSTS = 'AdawayHosts' OUTPUT_LS = 'LittleSnitchNorwegianList.lsrules' OUTPUT_DNSMASQ = 'NordicFiltersDnsmasq.conf' OUTPUT_HOSTSDENY = 'NordicFiltersHostsDeny.deny' +OUTPUT_PIHOLE = 'NordicFiltersPiHole.txt' # function that downloads the filter list def download_filters() -> str: @@ -861,7 +862,7 @@ def prepare_hosts(lines) -> str: line = re.sub( r"# Platform notes:.*", - "# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including Blokada, DNS66, Gas Mask, Diversion, and many others; as well as those who edit their OS' «hosts» system file.", + "# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file.", line ) @@ -1019,6 +1020,71 @@ def prepare_hostsdeny(lines) -> str: return text +# ————— Pi-hole version ————— + +def prepare_pihole(lines) -> str: + text = '' + + for line in lines: + + line = re.sub( + r" Dandelion Sprouts nordiske filtre.*", + " Dandelion Sprouts nordiske filtre (for Pi-hole)", + line + ) + + line = re.sub( + r" Dandelion Sprout's Nordic Filters.*", + " Dandelion Sprout's Nordic Filters (for Pi-hole)", + line + ) + + line = re.sub( + r"# Platform notes:.*", + "# Platform notes: This list version is intended for those who make use of the Regex functionality in Pi-Hole.", + line + ) + + line = re.sub( + r"(# Version: .*)", + r"\1-Alpha", + line + ) + + line = re.sub( + r"^([a-z0-9].*)\.(.*)\.\*", + r"(^|\.)\1\\.\2\\..*$", + line + ) + + line = re.sub( + r"^([a-z0-9].*)\.\*$", + r"(^|\.)\1\\..*$", + line + ) + + line = re.sub( + r"^(.*)\.(.*)-\*", + r"(^|\.)\1\\.\2-*$", + line + ) + + line = re.sub( + r"^([a-z0-9].*)\.\*\.(.*)", + r"(^|\.)\1\\..*\\.\2$", + line + ) + + line = re.sub( + r"^\*\.(.*)\.\*", + r"(^|\.)*\\.\1\\..*$", + line + ) + + text += line + '\r\n' + + return text + if __name__ == "__main__": print('Starting the script') text = download_filters() @@ -1029,6 +1095,7 @@ if __name__ == "__main__": ls_filter = prepare_ls(lines) dnsmasq_filter = prepare_dnsmasq(lines) hostsdeny_filter = prepare_hostsdeny(lines) + pihole_filter = prepare_pihole(lines) with open(OUTPUT, "w") as text_file: text_file.write(text) @@ -1045,6 +1112,9 @@ if __name__ == "__main__": with open(OUTPUT_HOSTSDENY, "w") as text_file: text_file.write(hostsdeny_filter) + with open(OUTPUT_PIHOLE, "w") as text_file: + text_file.write(pihole_filter) + print('The domains-based list versions have been generated.')