mirror of
https://github.com/DandelionSprout/adfilt.git
synced 2026-09-30 06:54:52 +01:00
Syntax improvement for AdGuard Home
This commit is contained in:
Imre Kristoffer Eilertsen
@@ -1,6 +1,6 @@
|
||||
# Title: Dandelion Sprouts nordiske filtre («hosts»-versjonen)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (The «hosts» file version)
|
||||
# Version: 24July2020v1
|
||||
# Version: 24July2020v2
|
||||
# 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including pfBlockerNG, Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file.
|
||||
# If you use a tool that edits the system's own hosts file, such as Hosts File Editor, Gas Mask, or Magisk Manager, make sure to also use the IPv6 version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsIPv6.txt
|
||||
@@ -53,6 +53,7 @@
|
||||
127.0.0.1 adstream.no www.adstream.no
|
||||
127.0.0.1 advert.file.no www.advert.file.no
|
||||
127.0.0.1 advert.single.no www.advert.single.no
|
||||
127.0.0.1 advert.vg.no www.advert.vg.no
|
||||
127.0.0.1 advertisement.crontab.no www.advertisement.crontab.no
|
||||
127.0.0.1 advertisement.file.no www.advertisement.file.no
|
||||
127.0.0.1 advertisement.vg.no www.advertisement.vg.no
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
{ "action": "deny", "process": "any", "remote-hosts": "adstream.no" },
|
||||
{ "action": "deny", "process": "any", "remote-hosts": "advert.file.no" },
|
||||
{ "action": "deny", "process": "any", "remote-hosts": "advert.single.no" },
|
||||
{ "action": "deny", "process": "any", "remote-hosts": "advert.vg.no" },
|
||||
{ "action": "deny", "process": "any", "remote-hosts": "advertisement.crontab.no" },
|
||||
{ "action": "deny", "process": "any", "remote-hosts": "advertisement.file.no" },
|
||||
{ "action": "deny", "process": "any", "remote-hosts": "advertisement.vg.no" },
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Title: 📔 Dandelion Sprouts nordiske filtre (for AdGuard Home)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (for AdGuard Home)
|
||||
# Version: 24July2020v1
|
||||
# Version: 24July2020v2
|
||||
# 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# Platform notes: This list version is intended for those who use AdGuard Home and its oddly specific subset of adblocker syntaxes.
|
||||
# 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
|
||||
@@ -52,6 +52,7 @@
|
||||
||adstream.no^
|
||||
||advert.file.no^
|
||||
||advert.single.no^
|
||||
||advert.vg.no^
|
||||
||advertisement.crontab.no^
|
||||
||advertisement.file.no^
|
||||
||advertisement.vg.no^
|
||||
@@ -288,34 +289,34 @@
|
||||
|
||||
# ——— 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.*^
|
||||
||vg.no.
|
||||
||elkjop.no.
|
||||
@@||elkjop.no.edgekey.net^
|
||||
||coop.no.*^
|
||||
||shell.no.*^
|
||||
||finn.no.*^
|
||||
||dnb.no.*^
|
||||
||coop.no.
|
||||
||shell.no.
|
||||
||finn.no.
|
||||
||dnb.no.
|
||||
@@||dnb.no.edgekey.net^
|
||||
||sparebank1.no.*^
|
||||
||nordea.no.*^
|
||||
||sbanken.no.*^
|
||||
||danskebank.no.*^
|
||||
||komplett.no.*^
|
||||
||nordnet.no.*^
|
||||
||skatteetaten.no.*^
|
||||
||sparebank1.no.
|
||||
||nordea.no.
|
||||
||sbanken.no.
|
||||
||danskebank.no.
|
||||
||komplett.no.
|
||||
||nordnet.no.
|
||||
||skatteetaten.no.
|
||||
@@||skatteetaten.no.cdn.cloudflare.net^
|
||||
||norwegian.com.*^
|
||||
||flysas-no.*^
|
||||
||tusenfryd-com.*^
|
||||
||*.gratis-reisebilletter.*^
|
||||
||norwegian.com.
|
||||
||flysas-no.
|
||||
||tusenfryd-com.
|
||||
||*.gratis-reisebilletter.
|
||||
||paypal.*.no^
|
||||
||kiwi.com-*^
|
||||
||kongeparken.com-*^
|
||||
||vipps-sikkerhet.*^
|
||||
||getmail-no.*^
|
||||
||legoland.com-*.*^
|
||||
||faarup.com-*.*^
|
||||
||djurs.com-*.*^
|
||||
||kiwi.com-*
|
||||
||kongeparken.com-*
|
||||
||vipps-sikkerhet.
|
||||
||getmail-no.
|
||||
||legoland.com-*.
|
||||
||faarup.com-*.
|
||||
||djurs.com-*.
|
||||
||appleid.*.no^
|
||||
||itunesconnect-*.no^
|
||||
||fintechnow*.buzz^
|
||||
@@ -340,4 +341,4 @@
|
||||
||helios.*.no^
|
||||
||auglysingar.*.is^
|
||||
||vefbordar.*.is^
|
||||
||vevlysingar.*.*^
|
||||
||vevlysingar.*.
|
||||
|
||||
@@ -45,6 +45,7 @@ server=/adservicemedia.dk/127.0.0.1
|
||||
server=/adstream.no/127.0.0.1
|
||||
server=/advert.file.no/127.0.0.1
|
||||
server=/advert.single.no/127.0.0.1
|
||||
server=/advert.vg.no/127.0.0.1
|
||||
server=/advertisement.crontab.no/127.0.0.1
|
||||
server=/advertisement.file.no/127.0.0.1
|
||||
server=/advertisement.vg.no/127.0.0.1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Title: 📔 Dandelion Sprouts nordiske filtre (for MinerBlock)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (for MinerBlock)
|
||||
# Version: 24July2020v1-Alpha
|
||||
# Version: 24July2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# Platform notes: So, let's say your company boss is not letting you install any adblocker on your awful work laptop, but (s)he lets you install MinerBlock for some indeterminable reason? In this very unlikely case, I've saved your day.
|
||||
# Note: This list does not actually block any mining-related stuff.
|
||||
@@ -54,6 +54,7 @@
|
||||
*://*.adstream.no/*
|
||||
*://*.advert.file.no/*
|
||||
*://*.advert.single.no/*
|
||||
*://*.advert.vg.no/*
|
||||
*://*.advertisement.crontab.no/*
|
||||
*://*.advertisement.file.no/*
|
||||
*://*.advertisement.vg.no/*
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Title: 📔 Dandelion Sprouts nordiske filtre («hosts.deny»-versjonen)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (The «hosts.deny» version)
|
||||
# Version: 24July2020v1-Beta
|
||||
# Version: 24July2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# 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
|
||||
@@ -52,6 +52,7 @@ ALL: adservicemedia.dk
|
||||
ALL: adstream.no
|
||||
ALL: advert.file.no
|
||||
ALL: advert.single.no
|
||||
ALL: advert.vg.no
|
||||
ALL: advertisement.crontab.no
|
||||
ALL: advertisement.file.no
|
||||
ALL: advertisement.vg.no
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Title: Dandelion Sprouts nordiske filtre (IPv6-«hosts»-versjonen)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (The IPv6 «hosts» file version)
|
||||
# Version: 24July2020v1
|
||||
# Version: 24July2020v2
|
||||
# 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# Platform notes: This list version is meant to be used simultaneously of the regular «Hosts» version when using computer/Android system hosts file editors like Hosts File Editor, Gas Mask, Magisk Manager, etc. It is not needed for tools that strip away the entries' IP address, such as Blokada and pfBlockerNG.
|
||||
# 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
|
||||
@@ -52,6 +52,7 @@
|
||||
:: adstream.no www.adstream.no
|
||||
:: advert.file.no www.advert.file.no
|
||||
:: advert.single.no www.advert.single.no
|
||||
:: advert.vg.no www.advert.vg.no
|
||||
:: advertisement.crontab.no www.advertisement.crontab.no
|
||||
:: advertisement.file.no www.advertisement.file.no
|
||||
:: advertisement.vg.no www.advertisement.vg.no
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Title: 📔 Dandelion Sprouts nordiske filtre (for Pi-hole)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (for Pi-hole)
|
||||
# Version: 24July2020v1-Alpha
|
||||
# Version: 24July2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# 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
|
||||
@@ -52,6 +52,7 @@ adservicemedia.dk
|
||||
adstream.no
|
||||
advert.file.no
|
||||
advert.single.no
|
||||
advert.vg.no
|
||||
advertisement.crontab.no
|
||||
advertisement.file.no
|
||||
advertisement.vg.no
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
; Title: 📔 Dandelion Sprouts nordiske filtre (for BIND/RPZ)
|
||||
; Translated title: Dandelion Sprout's Nordic Filters (for BIND/RPZ)
|
||||
; Version: 24July2020v1-Alpha
|
||||
; Version: 24July2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
; Platform notes: This list version is intended for tools that deal with raw domains, including Google Hit Hider by Domain, uMatrix, Samsung Knox, and many more. If you're using Pi-Hole, a different version specific to that extension is now also maintained.
|
||||
; 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
|
||||
@@ -52,6 +52,7 @@ adservicemedia.dk CNAME .
|
||||
adstream.no CNAME .
|
||||
advert.file.no CNAME .
|
||||
advert.single.no CNAME .
|
||||
advert.vg.no CNAME .
|
||||
advertisement.crontab.no CNAME .
|
||||
advertisement.file.no CNAME .
|
||||
advertisement.vg.no CNAME .
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Title: 📔 Dandelion Sprouts nordiske filtre (for Shadowsocks)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (for Shadowsocks)
|
||||
# Version: 24July2020v1-Alpha
|
||||
# Version: 24July2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# Platform notes: This list version is intended for those who use Shadowsocks, Shadowrocket, Surge, and other Socks5-based tools that have become popular in PR-China for several reasons.
|
||||
# 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
|
||||
@@ -52,6 +52,7 @@ DOMAIN-SUFFIX,adservicemedia.dk
|
||||
DOMAIN-SUFFIX,adstream.no
|
||||
DOMAIN,advert.file.no
|
||||
DOMAIN,advert.single.no
|
||||
DOMAIN,advert.vg.no
|
||||
DOMAIN,advertisement.crontab.no
|
||||
DOMAIN,advertisement.file.no
|
||||
DOMAIN,advertisement.vg.no
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Title: 📔 Dandelion Sprouts nordiske filtre (for Unbound)
|
||||
# Translated title: Dandelion Sprout's Nordic Filters (for Unbound)
|
||||
# Version: 24July2020v1-Alpha
|
||||
# Version: 24July2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites.
|
||||
# Platform notes: This list version is intended for those who use the DNS server tool Unbound.
|
||||
# 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
|
||||
@@ -52,6 +52,7 @@ local-zone: "adservicemedia.dk" static
|
||||
local-zone: "adstream.no" static
|
||||
local-zone: "advert.file.no" static
|
||||
local-zone: "advert.single.no" static
|
||||
local-zone: "advert.vg.no" static
|
||||
local-zone: "advertisement.crontab.no" static
|
||||
local-zone: "advertisement.file.no" static
|
||||
local-zone: "advertisement.vg.no" static
|
||||
|
||||
@@ -2240,19 +2240,31 @@ def prepare_agh(lines) -> str:
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^(\|\|elkjop\.no\.\*\^)$",
|
||||
r"\.\*\^$",
|
||||
r".",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"\*\^$",
|
||||
r"*",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^(\|\|elkjop\.no\.)$",
|
||||
r"\1\n@@||elkjop.no.edgekey.net^",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^(\|\|dnb\.no\.\*\^)$",
|
||||
r"^(\|\|dnb\.no\.)$",
|
||||
r"\1\n@@||dnb.no.edgekey.net^",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^(\|\|skatteetaten\.no\.\*\^)$",
|
||||
r"^(\|\|skatteetaten\.no\.)$",
|
||||
r"\1\n@@||skatteetaten.no.cdn.cloudflare.net^",
|
||||
line
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user