starred/adfilt
1
0
Fork 0
mirror of https://github.com/DandelionSprout/adfilt.git synced 2026-10-05 22:04:30 +01:00
Code Issues Packages Projects Releases 4 Wiki Activity

November main update

Browse Source
This commit is contained in:
Imre Kristoffer Eilertsen
2020-11-12 19:33:43 +01:00
committed by GitHub
parent 7203334b12
commit cfd9b869ab
4 changed files with 4672 additions and 2824 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AdGuard Home Compilation List/AGHtest.py
+25 -37
View File
@@ -3,7 +3,7 @@ import re
SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AdGuard%20Home%20Compilation%20List/TopDescription.notlist', 'https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt', 'https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt', 'https://filters.adtidy.org/extension/ublock/filters/16.txt', 'https://www.i-dont-care-about-cookies.eu/abp/', 'https://easylist-downloads.adblockplus.org/easylistgermany.txt', 'https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt', 'https://easylist-downloads.adblockplus.org/antiadblockfilters.txt', 'https://easylist-downloads.adblockplus.org/advblock.txt', 'https://easylist-downloads.adblockplus.org/Liste_AR.txt', 'https://easylist-downloads.adblockplus.org/easylistspanish.txt']
UNSUPPORTED_AGH = ['##', '@#', '#?#', '#%#', '!+', 'domain=', 'generichide', '$ghide', ',ghide', '$csp', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '$domain', ',domain', '[Adblock Plus 2.0]', 'CV-']
UNSUPPORTED_AGH = ['##', '@#', '#?#', '#%#', '!+', 'domain=', 'generichide', '$ghide', ',ghide', '$csp', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '$domain', ',domain', '[Adblock Plus 2.0]', 'CV-', '$csp']
UNSUPPORTED_IP = ['##', '@#', '#?#', '#%#', 'domain=', 'generichide', '$csp', 'badfilter', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '!+']
OUTPUT = 'xyzzyx.txt'
@@ -348,24 +348,6 @@ def prepare_agh(lines) -> str:
line
)
line = re.sub(
r"^/([a-z0-9.-]{1,60}\.$)",
r"://\1",
line
)
line = re.sub(
r"^/.*[a-zA-Z0-9_=.,*?!|^@&~+;-]$",
r"",
line
)
line = re.sub(
r"^/.*[\]]$",
r"",
line
)
line = re.sub(
r"^://.*/.*",
r"",
@@ -540,6 +522,24 @@ def prepare_agh(lines) -> str:
line
)
line = re.sub(
r"^/.*[_?=/;~@%#+].*",
r"",
line
)
line = re.sub(
r"^[|:/.-].*[%:].*",
r"",
line
)
line = re.sub(
r"^/[a-zA-Z0-9-]{1,100}[|^]$",
r"",
line
)
if is_supported_agh(line) and not line == '':
text += line + '\r\n'
@@ -1282,24 +1282,6 @@ def prepare_agh(lines) -> str:
line
)
line = re.sub(
r"^/([a-z0-9.-]{1,60}\.$)",
r"://\1",
line
)
line = re.sub(
r"^/.*[a-zA-Z0-9_=.,*?!|^@&~+;-]$",
r"",
line
)
line = re.sub(
r"^/.*[\]]$",
r"",
line
)
line = re.sub(
r"^://.*/.*",
r"",
@@ -1420,6 +1402,12 @@ def prepare_agh(lines) -> str:
line
)
line = re.sub(
r"^/.*[_?=/;~@%#+].*",
r"",
line
)
if is_supported_agh(line) and not line == '':
text += line + '\r\n'
AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt
+56 -27
View File
@@ -1,14 +1,14 @@
[Adblock Plus 3.4]
! Title: Dandelion Sprout's AdGuard Home Compilation List - Web Push Notifications
! Contains modified entries from: Fanboy's Notifications Blocking List, and AdGuard Annoyances Web Push
! Version: 19October2020v1-Beta
! Version: 12November2020v1-Beta
! Expires: 14 days
! Licence: In accordance with the Dandelicence, AdGuard Annoyances Web Push's contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), while Fanboy's Notifications Blocking List whose loose CC BY 3.0 seems to me to enable me to relicence them under the Dandelicence. Known credits in accordance with attribution requirements, are Ryan Brown (Fanboy's Notifications Blocking List) and AdGuard Software Limited (AdGuard Annoyances Web Push).
! Description: AdGuard Home is one of the tools for the future, or at least it is for those who know how to set up and use a Raspberry Pi. However, its current internal structure discards virtually every $-using block rule, which makes various major lists virtually useless in AdGuard Home, despite how many of the entries would be ≥90% as functional without them. So until the AdGuard Home team implements a better way to deal with $ values, here's my intermissional list to work around it.
! ——————————————————————————————————————————————
! Version: 202010190011
! Version: 202011121821
! Title: Fanboy's Notifications Blocking List
! Last modified: 19 Oct 2020 00:11 UTC
! Last modified: 12 Nov 2020 18:21 UTC
! License: http://creativecommons.org/licenses/by/3.0/
! Please report any unblocked content or problems by email or in our forums
! Email: easylist@protonmail.com
@@ -17,31 +17,46 @@
!--------------------------General blocking rules-----------------------------!
! *** easylist:fanboy-addon/fanboy_notifications_general_block.txt ***
-push-notification.
://ilabspush.
://inpl.webpush.
://mp-web-notification.
://multi-desktop-notification.
://nadz-sdk.
://notification-ext.
://one-signal.
://onesignal-modal.
://onesignal.min.
://onesignalfix.
://push-notification.
://push-sw.
://pushly-sdk.
://pushly-sw.
://pushmessageworker.
://pushnews.min.
://pushnotification.
://site-notification-desk.
://sna-pushwoosh.
://t2push.
://web-push-worker.
://web-push.
://webpush.
://wonderpush.
/amp-user-notification-
/ilabspush.
/inpl.webpush.
/mp-web-notification.
/multi-desktop-notification.
/myPushDc.
/nadz-sdk.
/notification-ext.
/one-signal.
/onesignal-free-
/onesignal-modal.
/onesignal.min.
/onesignalfix.
/OneSignalSDKWorker.
/push-notification.
/push-sw.
/push-worker-
/PushexSDK.
/pushly-sdk.
/pushly-sw.
/pushmessageworker.
/pushnews.min.
/pushnote-
/pushnotification.
/pushtoast-
/pushwoosh-
/site-notification-desk.
/sna-pushwoosh.
/t2push.
/web-push-worker.
/web-push.
/webalert-notification
/webpush.
/webPushIframe.
/webPushNotifications.
/wonderpush,
/wonderpush.
! Mobile notifications
/jquery.smartbanner.js|
/jquery.smartbanner.min.js|
!------------------------General element hiding rules-------------------------!
! *** easylist:fanboy-addon/fanboy_notifications_general_hide.txt ***
! Mobile Notifications
@@ -56,6 +71,7 @@
||d2r1yp2w7bby2u.cloudfront.net^
||easyfeeed.com^
||farteniuson.com^
||getnotification.me^
||ichecknotifyfriends.info^
||iopushtech.com^
||irpush.com^
@@ -128,6 +144,7 @@
||actirinius.com^
||aimtell.com^
||alertme.news^
||aswpsdkeu.com^
||aswpsdkus.com^
||bildirt.com^
||bmfeed.ru^
@@ -190,6 +207,7 @@
||urbanairship.com^
||viapush.com^
||webpu.sh^
||whiteclick.biz^
||wnpbdan.bid^
||wonderpush.com^
||wwclicknews.club^
@@ -223,6 +241,9 @@
! uCoz
||leechiza.net^
! `window.wpnConfig`
||pathlinex.com^
||rocket-push.com^
||push.asahiinteractive.com^
||cdn.onepush.app^
||dryum.ru^
||spattepush.com^
@@ -348,6 +369,14 @@
||serumawus.com^
||webpush.hackers.com^
||gogool.ru^
||push.akket.com^
||wwopenclick.vip^
.vafrike.ru^
||maylohack.ru^
||bildirimci.net^
||patrospermit.com^
||crimitating.com^
||push.all-stor.ru^
||pp.teksty-pesenok.ru^
||gu7socdn.txxx.com^
! Fixing the issues
AdGuard Home Compilation List/AdGuardHomeCompilationList.txt
+4588 -2759
View File
File diff suppressed because it is too large Load Diff
AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt
+3 -1
View File
@@ -3,7 +3,7 @@
! Expires: 14 days
! Licence: In accordance with the Dandelicence, the borrowed entries are considered to have been changed and reduced enough from their original lists, that they're counted as transformative work, meaning that creditation and seperate paragraphs are not necessary unless one of the lists' makers were to ask for such.
! Description: This was made as a proof-of-concept to see if the IP-based entries of major adblock lists, could be used to create an IP adblocker list for IP blockers, despite how IP lists are normally only meant to block malware, E-mail spam, or port scanners.
! Version: 19October2020v1-Alpha
! Version: 12November2020v1-Alpha
104.197.0.0/16
104.198.0.0/16
130.211.0.0/16
@@ -98,6 +98,8 @@
25.52.111.246
34.250.229.112
37.187.248.215
45.120.80.107
45.195.71.249
45.32.147.99
45.77.61.11
46.101.139.152