From 5efb19a6ce9455d28a25936ab58450593853ab99 Mon Sep 17 00:00:00 2001 From: Ghostery Adblocker Bot Date: Thu, 5 Sep 2024 20:36:38 +0000 Subject: [PATCH] Update local assets and compression codebooks --- .../assets/easylist/easylist-cookie.txt | 8 ++-- .../adblocker/assets/easylist/easylist.txt | 11 +++++- .../assets/ublock-origin/badware.txt | 13 +++++++ .../assets/ublock-origin/filters-2022.txt | 3 +- .../assets/ublock-origin/filters-2024.txt | 6 +-- .../assets/ublock-origin/filters.txt | 1 - .../assets/ublock-origin/privacy.txt | 6 ++- .../assets/ublock-origin/quick-fixes.txt | 9 ++--- .../src/codebooks/network-hostname.ts | 38 +++++++++---------- packages/adblocker/src/engine/engine.ts | 2 +- 10 files changed, 58 insertions(+), 39 deletions(-) diff --git a/packages/adblocker/assets/easylist/easylist-cookie.txt b/packages/adblocker/assets/easylist/easylist-cookie.txt index 01cb282763..a34085738d 100644 --- a/packages/adblocker/assets/easylist/easylist-cookie.txt +++ b/packages/adblocker/assets/easylist/easylist-cookie.txt @@ -1,7 +1,7 @@ [Adblock Plus 2.0] -! Checksum: ulqtvF+1ngukhgrBa92Jkw +! Checksum: JzyxiwvVrmv3LasCMR+8OQ ! Title: Easylist Cookie List -! Updated: 2024-09-04 13:15 UTC +! Updated: 2024-09-05 04:40 UTC ! Expires: 9 days (update frequency) ! License: http://creativecommons.org/licenses/by/3.0/ ! Please report any unblocked content or problems by email or in our forums @@ -20103,6 +20103,7 @@ designmodo.com##.dialogContainer atombank.co.uk##.dieHVN capture.dropbox.com##.dig-Snackbar[role="alert"] lovehoney.co.uk,lovehoney.com.au##.dis_message +btlaw.com##.disclaimer-container taste.com.au##.disclaimer-note armdocs.com##.disclaimer-notice cheynecapital.com##.disclaimer-overlay @@ -21553,7 +21554,7 @@ abrakadabra.com,etherealmechanics.info,evaair.com,flender.com.cn,heuristic.pl,la !! .cookies-component proprospan.ru,worksmile.com##.cookies-component !! #cc-main -andromede-cms.com,any.run,bienpreter.com,codesandbox.io,jackbox.tv,kirchberg.ch,liu.se,ndsas.sk,openresearchlab.org,sardynkibiznesu.pl,trakt.tv###cc-main +andromede-cms.com,any.run,bienpreter.com,codesandbox.io,jackbox.tv,kirchberg.ch,liu.se,ndsas.sk,openresearchlab.org,sardynkibiznesu.pl,trakt.tv,zitadel.com###cc-main !! #cc--main alde.se,arbetsgivarverket.se,bambulab.com,blackcomb-shop.eu,blog.fanfiktion.de,boardgamegeek.com,cdw.com,cdwg.com,defector.com,fashionnetwork.com,feedoptimise.com,flowforge.com,gatehousebank.com,kroo.com,linaro.org,myjob.ch,nowpatient.com,packtpub.com,reteimprese.it,spielregeln-spielanleitungen.de,sprintesport.it,stocksy.com,streetsblog.org,suncalc.org,teksavvy.com,toscana-notizie.it,ungeziefer-ratgeber.info,wifiwijs.nl,woche-bb.ch###cc--main !! .c--anim @@ -22436,6 +22437,7 @@ uhrzeit123.de##+js(set-cookie, ga-disable, true) marinelink.com##+js(set-cookie, GDPR, 9) thegraph.com##+js(set-cookie, cookie-consent, false) blog.documentfoundation.org##+js(set-cookie, ytprefs_gdpr_consent, 1, , reload, 1) +my.eneba.com##+js(set-cookie, cconsent, 1000) blitzortung.org##+js(set-cookie, CONSENT, 15) esim.redteago.com##+js(set-cookie, nCookieVisible, 2) tester.userbrain.com##+js(set-cookie, CookieConsent, false) diff --git a/packages/adblocker/assets/easylist/easylist.txt b/packages/adblocker/assets/easylist/easylist.txt index 6bc99c016f..25f217c4a2 100644 --- a/packages/adblocker/assets/easylist/easylist.txt +++ b/packages/adblocker/assets/easylist/easylist.txt @@ -1,7 +1,7 @@ [Adblock Plus 2.0] -! Version: 202409041144 +! Version: 202409041624 ! Title: EasyList -! Last modified: 04 Sep 2024 11:44 UTC +! Last modified: 04 Sep 2024 16:24 UTC ! Expires: 4 days (update frequency) ! *** easylist:template_header.txt *** ! @@ -18265,6 +18265,7 @@ browsershots.org#@#.advert_area ||ahngnhjdcu.com^ ||ahoxirsy.com^ ||ahporntube.com^ +||ahqovxli.com^ ||ahqpqpdjpj.com^ ||ahscdn.com^ ||ahtalcruzv.com^ @@ -23181,6 +23182,7 @@ browsershots.org#@#.advert_area ||coinadster.com^ ||coinblocktyrusmiram.com^ ||coinio.cc^ +||coinsmanning.com^ ||coinverti.com^ ||cokepompositycrest.com^ ||colanbalkily.com^ @@ -24436,6 +24438,7 @@ browsershots.org#@#.advert_area ||dcjeeqwrhg.com^ ||dclakbrifusivy.com^ ||dclfuniv.com^ +||dcsewjll.com^ ||dctkubltpbtt.com^ ||dcybyvmtwgnp.com^ ||dd0122893e.com^ @@ -29616,6 +29619,7 @@ browsershots.org#@#.advert_area ||gougersorrier.top^ ||gouheethsurvey.space^ ||goulbap287evenost.com^ +||gounevou.net^ ||gourgoldpieceso.com^ ||gousouse.com^ ||goutee.top^ @@ -33469,6 +33473,7 @@ browsershots.org#@#.advert_area ||kfjhd.com^ ||kfjkgfgr.com^ ||kfngvuu.com^ +||kfpljakmiousajl.com^ ||kfxkxyb.com^ ||kgdvs9ov3l2aasw4nuts.com^ ||kgfjrb711.com^ @@ -41785,6 +41790,7 @@ browsershots.org#@#.advert_area ||qcxhwrm.com^ ||qczukeud.com^ ||qdaawkgdaiwlh.com^ +||qdeduzaixe.com^ ||qdibvllqu.com^ ||qdlbdpsctalt.com^ ||qdlesuneeqoglp.com^ @@ -55361,6 +55367,7 @@ browsershots.org#@#.advert_area ||1437953666.rsc.cdn77.org^ ||1529462937.rsc.cdn77.org^ ||1548164934.rsc.cdn77.org^ +||1588341617.rsc.cdn77.org^ ||1675450967.rsc.cdn77.org^ ||1736253261.rsc.cdn77.org^ ||1wnurc.com^ diff --git a/packages/adblocker/assets/ublock-origin/badware.txt b/packages/adblocker/assets/ublock-origin/badware.txt index 77890375f7..799264cc1e 100644 --- a/packages/adblocker/assets/ublock-origin/badware.txt +++ b/packages/adblocker/assets/ublock-origin/badware.txt @@ -687,6 +687,18 @@ tech4yougadgets.com##+js(aopr, Notification) .com/dating/*/index.html?lang=$doc .info/?key=*&pixel=$doc ||snapbabes9.com^$all +||matcher.one^$all +||onlyhotdgirl.com^$all +||playfulmilfs.com^$all +||wooqi.win^$all +||chemiclk.com^$all +||techluki.com^$all +||lovestrive.org^$all +||vcnbbtrack.com^$all +||zodertracker.com^$all +||latenightlovers.com^$all +||clickrotate.net^$all +||date2night.b-cdn.net^$all ! https://github.com/uBlockOrigin/uAssets/issues/24602 ! https://www.virustotal.com/gui/url/ce2b833adda2f862d77398203bbe33ea331097ba2a803d1a763492d2ac0d5a60 ! https://safeweb.norton.com/report/show?url=discordvip.createsocialcard.top @@ -4514,5 +4526,6 @@ app##center#yangchen > iframe#external-frame[src="https://im136.mom/"]:not([clas ! https://github.com/uBlockOrigin/uAssets/issues/25076 ! https://github.com/uBlockOrigin/uAssets/issues/25113 ||sunpass-etoll-id.kupu.desa.id^$all +! https://github.com/uBlockOrigin/uAssets/pull/25177 ! https://github.com/uBlockOrigin/uAssets/issues/25044#issuecomment-2309068054 - malware spam ||gofile.io/d/yMHabA|$doc \ No newline at end of file diff --git a/packages/adblocker/assets/ublock-origin/filters-2022.txt b/packages/adblocker/assets/ublock-origin/filters-2022.txt index e936e61f2a..c4e9f051b8 100644 --- a/packages/adblocker/assets/ublock-origin/filters-2022.txt +++ b/packages/adblocker/assets/ublock-origin/filters-2022.txt @@ -129,7 +129,6 @@ cine-calidad.*,veryfreeporn.com##^script:has-text(popMagic) cine-calidad.*,veryfreeporn.com##+js(rmnt, script, popMagic) !#endif ||n4m5x60.com^ -simpcity.su##+js(aeld, , open) ||xsportshd.com/bet.gif$image manhwaid.org##.c-top-sidebar sexoverdose.com##.table @@ -181,6 +180,8 @@ bunkr.*##^script:has-text(WebAssembly) ||qakzfubfozaj.com^ ! https://www.reddit.com/r/uBlockOrigin/comments/1edhikz/need_help_in_blocking_popup_and_ads_on/ manhwaus.net##.my2023 +! https://github.com/uBlockOrigin/uAssets/issues/25203 +simpcity.su##+js(aeld, , shouldShow) ! D4zz-sites alluretube.com,anyxvideos.com,fetishtube.cc,fucktheporn.com,italianporn.com.es,japanporn.tv,javsub.buzz,lovefap.com,mommysucks.com,mzansinudes.com,napiszar.com,of-model.com,onlineporn24.com,onlyfansleaks.tv,porntube15.com,pornvdoxxx.com,sexavgo.com,sexdiaryz.*,store-of-beats.ru,vlxxs.net##+js(acs, decodeURI, decodeURIComponent) vlxxs.net##+js(set, D4zz, noopFunc) diff --git a/packages/adblocker/assets/ublock-origin/filters-2024.txt b/packages/adblocker/assets/ublock-origin/filters-2024.txt index 97d2125a87..75acf21d52 100644 --- a/packages/adblocker/assets/ublock-origin/filters-2024.txt +++ b/packages/adblocker/assets/ublock-origin/filters-2024.txt @@ -626,12 +626,8 @@ a2zapk.*,educatiocenter.online##+js(acs, %24, alertmsg) @@||virginmediatelevision.ie/player/$xhr,1p @@||virginmediatelevision.ie/includes/js/cookienotice.js.pagespeed.$script,1p ! https://github.com/uBlockOrigin/uAssets/issues/25164 -!#if ext_devbuild -!#if cap_html_filtering play.virginmediatelevision.ie##+js(json-prune, avails) -||amazonaws.com/v1/dash/$replace=/(?:mediaPresentationDuration|start)="[^"]+"//g,domain=play.virginmediatelevision.ie -!#endif -!#endif +play.virginmediatelevision.ie##+js(json-prune-fetch-response, response.ads, , propsToMatch, %2Fstreams) ! END: Rules from filters.txt ! START: Regional lists ! <<<<< czech slovak filters >>>>> diff --git a/packages/adblocker/assets/ublock-origin/filters.txt b/packages/adblocker/assets/ublock-origin/filters.txt index 89c43dbdaa..13f1dbdec1 100644 --- a/packages/adblocker/assets/ublock-origin/filters.txt +++ b/packages/adblocker/assets/ublock-origin/filters.txt @@ -8656,7 +8656,6 @@ secretsdujeu.com##+js(acs, document.getElementById, adsrefresh) ||googlesyndication.com/pagead/$script,redirect=noopjs,domain=iptvdroid1.blogspot.com ! https://github.com/NanoMeow/QuickReports/issues/3098 cruisingearth.com##+js(nostif, show) -@@/wutime$script,1p ! https://github.com/NanoMeow/QuickReports/issues/1738 @@||roanoke.com^$ghide roanoke.com##.dfp-ad diff --git a/packages/adblocker/assets/ublock-origin/privacy.txt b/packages/adblocker/assets/ublock-origin/privacy.txt index 981c83ffe1..6214db2b64 100644 --- a/packages/adblocker/assets/ublock-origin/privacy.txt +++ b/packages/adblocker/assets/ublock-origin/privacy.txt @@ -493,6 +493,9 @@ clickorlando.com##+js(set-cookie, bitmovin_analytics_uuid, OK) ! Google ads/analytics ! https://support.google.com/analytics/answer/10071811 ! https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters +! https://support.google.com/analytics/answer/11479699 +! https://github.com/AdguardTeam/AdguardFilters/issues/162080 +! https://github.com/DandelionSprout/adfilt/issues/715 ! Facebook analytics ! Yandex Metrika ! https://github.com/brave/brave-browser/issues/33216 @@ -556,7 +559,8 @@ natgeotv.com##+js(set, Visitor, %7B%7D) ! https://github.com/uBlockOrigin/uAssets/issues/19954 ||cdn.cuty.io/fps.js$script ! https://lenovo.com/us/en/legal/copytrade/?orgRef=[...] - Search Google for "Lenovo copyright", Click on the first result -www.lenovo.com##+js(aost, history.replaceState, injectedScript) +! https://www.reddit.com/r/uBlockOrigin/comments/1f8yhos/lenovo_site_not_loading/ +www.lenovo.com##+js(trusted-replace-argument, history.replaceState, 2, '', condition, %3ForgRef) ! https://developers.google.com/tag-platform/tag-manager/server-side/send-data ! https://simoahava.com/analytics/server-side-tagging-google-tag-manager !*$1p,strict3p,script,header=via:1.1 google diff --git a/packages/adblocker/assets/ublock-origin/quick-fixes.txt b/packages/adblocker/assets/ublock-origin/quick-fixes.txt index 989666b514..fe2c7f6003 100644 --- a/packages/adblocker/assets/ublock-origin/quick-fixes.txt +++ b/packages/adblocker/assets/ublock-origin/quick-fixes.txt @@ -123,10 +123,8 @@ japscan.lol#@#body > .container > .row > #main + #sidebar.col-md-3 > .card.mt-1 japscan.lol#@#+js(spoof-css, body%20%3E%20.container%20%3E%20.row%20%3E%20%23main%20%2B%20%23sidebar.col-md-3%20%3E%20.card.mt-1%20%3E%20.card%5Bstyle%3D%22margin%3A%200px%20auto%3B%20display%3A%20block%3B%22%5D%20%3E%20a.aikoi.donate%5Bhref%5E%3D%22http%22%5D%5Bhref*%3D%22%2F%3Futm_source%3Dindex%26utm_%22%5D%5Btarget%3D%22_blank%22%5D%5Brel%3D%22noopener%20noreferrer%20nofollow%22%5D%3Anot(%5Bhref%5E%3D%22http%3A%2F%2Fjapscan.lol%22%5D)%20%3E%20img, display, inline) japscan.lol#@#.card.copines japscan.lol##+js(no-fetch-if, method%3A%2FHEAD%7CGET%2F) -@@||i.ibb.co^$xhr,domain=japscan.lol -japscan.lol##+js(no-fetch-if, %2F%5C%2F468%5B-x%5D60%2F) -@@||postimg.cc^$xhr,domain=japscan.lol -@@||drive.google.com^$xhr,domain=japscan.lol +!japscan.lol##+js(prevent-fetch, %2F%5C%2F%5Cd%7B3%7D%5B-x%5D%5Cd%7B2%7D%2F) +@@*$xhr,domain=japscan.lol ! ads japscan.lol##+js(no-fetch-if, www.japscan.lol%2Fimgs%2F) ||japscan.lol^$csp=sandbox allow-forms allow-same-origin allow-scripts allow-modals allow-orientation-lock allow-pointer-lock allow-presentation allow-top-navigation @@ -204,8 +202,7 @@ kimcartoon.li,kc.linksgen.com,kisscartoon.se#@##hideAds @@||pagead2.googlesyndication.com/pagead/js/adsbygoogle.js$xhr,domain=animefire.info|animesonlinecc.us|animesup.info|animeyabu.net|animeyabu.org|anitube.us|anitube.vip|dattebayo-br.com|drstonebr.com|flyanimes.cloud|goanimes.vip|goyabu.us|hinatasoul.com|isekaibrasil.com|meuanime.info|otakuanimess.net @@||www.popads.net/js/adblock.js$xhr,domain=animefire.info|animesonlinecc.us|animesup.info|animeyabu.net|animeyabu.org|anitube.us|anitube.vip|dattebayo-br.com|drstonebr.com|flyanimes.cloud|goanimes.vip|goyabu.us|hinatasoul.com|isekaibrasil.com|meuanime.info|otakuanimess.net @@||widgets.outbrain.com/outbrain.js$xhr,domain=animefire.info|animesonlinecc.us|animesup.info|animeyabu.net|animeyabu.org|anitube.us|anitube.vip|dattebayo-br.com|drstonebr.com|flyanimes.cloud|goanimes.vip|goyabu.us|hinatasoul.com|isekaibrasil.com|meuanime.info|otakuanimess.net -caroloportunidades.com.br,connectionbrazilusa.com###player:style(display: block !important;) -caroloportunidades.com.br,connectionbrazilusa.com##+js(nostif, hasAdblock) +anitube.us,anitube.vip##+js(no-fetch-if, mode%3Ano-cors) ! https://www.reddit.com/r/uBlockOrigin/comments/1etpj7m/michigan_news_site_mlive_is_preventing_me_from/ al.com,cleveland.com,mlive.com,nj.com,oregonlive.com#@#+js(rmnt, script, admiral) ! https://github.com/uBlockOrigin/uAssets/issues/24961 diff --git a/packages/adblocker/src/codebooks/network-hostname.ts b/packages/adblocker/src/codebooks/network-hostname.ts index 83f623f142..a15cb11d54 100644 --- a/packages/adblocker/src/codebooks/network-hostname.ts +++ b/packages/adblocker/src/codebooks/network-hostname.ts @@ -18,23 +18,27 @@ export default [ "tracking.", "metrics.", "images.", + ".co.jp", ".co.uk", "a8clk.", "stats.", "a8cv.", - "media", "track", ".com", ".net", ".top", ".xyz", + "ight", + "mail", "tion", "www.", + ".de", ".io", ".jp", "app", "cdn", "new", + "pro", "web", ".b", ".c", @@ -42,14 +46,18 @@ export default [ ".f", ".g", ".h", + ".j", ".k", + ".l", ".m", ".n", ".p", + ".r", ".s", ".t", ".v", ".w", + "a-", "a1", "a2", "a4", @@ -59,6 +67,7 @@ export default [ "ad", "af", "ag", + "ah", "ai", "ak", "al", @@ -82,7 +91,6 @@ export default [ "ca", "ce", "ch", - "ci", "ck", "cl", "cr", @@ -90,19 +98,16 @@ export default [ "cu", "de", "di", - "dn", - "do", "dr", "ds", "du", - "dy", "e-", "eb", "ec", "ed", - "ee", "ef", "eg", + "ek", "el", "em", "en", @@ -115,19 +120,17 @@ export default [ "ew", "ex", "ey", - "fa", - "fe", - "ff", "fi", + "fl", "fo", "fr", "ge", "gh", + "gl", "go", "gr", "gu", "he", - "ho", "ia", "ib", "ic", @@ -146,24 +149,23 @@ export default [ "iv", "ix", "iz", - "jo", "ks", - "la", "ld", "le", "li", - "ll", "lo", "lu", "ly", - "ma", "me", "mo", "mp", "my", - "no", + "nd", + "nt", "ob", + "oc", "od", + "of", "og", "ok", "ol", @@ -171,6 +173,7 @@ export default [ "on", "op", "or", + "os", "ot", "ou", "ov", @@ -180,9 +183,7 @@ export default [ "pl", "po", "pr", - "pu", "qu", - "ra", "re", "ro", "ru", @@ -192,8 +193,8 @@ export default [ "sh", "si", "sk", + "sl", "sn", - "so", "sp", "ss", "st", @@ -218,7 +219,6 @@ export default [ "up", "ur", "us", - "ut", "ve", "vi", "we", diff --git a/packages/adblocker/src/engine/engine.ts b/packages/adblocker/src/engine/engine.ts index 266d462d47..161a447f0d 100644 --- a/packages/adblocker/src/engine/engine.ts +++ b/packages/adblocker/src/engine/engine.ts @@ -38,7 +38,7 @@ import { IOrganization } from './metadata/organizations.js'; import { IPattern } from './metadata/patterns.js'; import { fastHash } from '../utils.js'; -export const ENGINE_VERSION = 670; +export const ENGINE_VERSION = 671; function shouldApplyHideException(filters: NetworkFilter[]): boolean { if (filters.length === 0) {