diff --git a/client/src/helpers/filters/filters.js b/client/src/helpers/filters/filters.js index a1bf0555a63..b7e4a06a428 100644 --- a/client/src/helpers/filters/filters.js +++ b/client/src/helpers/filters/filters.js @@ -142,11 +142,11 @@ export default { "homepage": "https://github.com/AdguardTeam/AdGuardSDNSFilter", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt" }, - "adway_default_blocklist": { - "name": "AdAway Default Blocklist", + "awavenue_ads_rule": { + "name": "AWAvenue Ads Rule", "categoryId": "general", - "homepage": "https://github.com/AdAway/adaway.github.io/", - "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt" + "homepage": "https://awavenue.top/", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_53.txt" }, "curben_phishing_filter": { "name": "Phishing URL Blocklist (PhishTank and OpenPhish)", @@ -190,6 +190,12 @@ export default { "homepage": "https://github.com/hagezi/dns-blocklists#piracy", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_46.txt" }, + "hagezi_dyndns_blocklist": { + "name": "HaGeZi's DynDNS Blocklist", + "categoryId": "security", + "homepage": "https://github.com/hagezi/dns-blocklists", + "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_54.txt" + }, "hagezi_encrypted_dns_vpn_tor_proxy_bypass": { "name": "HaGeZi's Encrypted DNS/VPN/TOR/Proxy Bypass", "categoryId": "security", diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json index b5016dfb20f..247e5ce8401 100644 --- a/client/src/helpers/trackers/trackers.json +++ b/client/src/helpers/trackers/trackers.json @@ -1,5 +1,5 @@ { - "timeUpdated": "2023-12-01T15:24:07.522Z", + "timeUpdated": "2024-01-22T00:10:10.554Z", "categories": { "0": "audio_video_player", "1": "comments", @@ -10758,9 +10758,10 @@ }, "localytics": { "name": "Localytics", - "categoryId": 6, - "url": "http://www.localytics.com/", - "companyId": "localytics" + "categoryId": 101, + "url": "https://uplandsoftware.com/localytics/", + "companyId": "upland", + "source": "AdGuard" }, "lockerdome": { "name": "LockerDome", @@ -15613,10 +15614,11 @@ "companyId": "sharecompany" }, "sharepoint": { - "name": "Microsoft SharePoint", - "categoryId": 2, - "url": "https://products.office.com/en-us/sharepoint/sharepoint-online-collaboration-software", - "companyId": "microsoft" + "name": "SharePoint", + "categoryId": 8, + "url": "https://www.microsoft.com/microsoft-365/sharepoint/collaboration", + "companyId": "microsoft", + "source": "AdGuard" }, "sharethis": { "name": "ShareThis", @@ -22958,6 +22960,7 @@ "loadercdn.com": "loadercdn.com", "loadsource.org": "loadsource.org", "web.localytics.com": "localytics", + "localytics.com": "localytics", "cdn2.lockerdome.com": "lockerdome", "addtoany.com": "lockerz_share", "pixel.loganmedia.mobi": "logan_media", @@ -23254,6 +23257,7 @@ "k-msedge.net": "msedge", "l-msedge.net": "msedge", "s-msedge.net": "msedge", + "spo-msedge.net": "msedge", "t-msedge.net": "msedge", "wac-msedge.net": "msedge", "msn.com": "msn", @@ -23521,8 +23525,10 @@ "outbrain.com": "outbrain", "outbrainimg.com": "outbrain", "live.com": "outlook", + "cloud.microsoft": "outlook", "hotmail.com": "outlook", "outlook.com": "outlook", + "svc.ms": "outlook", "overheat.it": "overheat.it", "oewabox.at": "owa", "owneriq.net": "owneriq", @@ -23790,6 +23796,7 @@ "rcsmediagroup.it": "rcs.it", "d335luupugsy2.cloudfront.net": "rd_station", "rea-group.com": "rea_group", + "reagroupdata.com.au": "rea_group", "reastatic.net": "rea_group", "d12ulf131zb0yj.cloudfront.net": "reachforce", "reachforce.com": "reachforce", @@ -24109,6 +24116,8 @@ "quintrics.nl": "sharecompany", "sharecompany.nl": "sharecompany", "sharepointonline.com": "sharepoint", + "onmicrosoft.com": "sharepoint", + "sharepoint.com": "sharepoint", "sharethis.com": "sharethis", "shareth.ru": "sharethrough", "sharethrough.com": "sharethrough", diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go index ec893ecf13e..2ee8bf4b6ed 100644 --- a/internal/filtering/servicelist.go +++ b/internal/filtering/servicelist.go @@ -12,6 +12,15 @@ type blockedService struct { // blockedServices contains raw blocked service data. var blockedServices = []blockedService{{ + ID: "4chan", + Name: "4chan", + IconSVG: []byte(""), + Rules: []string{ + "||4cdn.org^", + "||4chan.org^", + "||4channel.org^", + }, +}, { ID: "500px", Name: "500px", IconSVG: []byte(""), @@ -583,6 +592,14 @@ var blockedServices = []blockedService{{ "||discordstatus.com^", "||watchanimeattheoffice.com^", }, +}, { + ID: "discoveryplus", + Name: "Discovery+", + IconSVG: []byte(""), + Rules: []string{ + "||disco-api.com^", + "||discoveryplus.com^", + }, }, { ID: "disneyplus", Name: "Disney+", @@ -1449,6 +1466,16 @@ var blockedServices = []blockedService{{ "||flickrpro.com^", "||staticflickr.com^", }, +}, { + ID: "globoplay", + Name: "Globoplay", + IconSVG: []byte(""), + Rules: []string{ + "||globoplay.com.br^", + "||globoplay.com^", + "||globoplay.globo.com^", + "|||cloud-jarvis.globo.com^", + }, }, { ID: "gog", Name: "GOG", @@ -1475,6 +1502,7 @@ var blockedServices = []blockedService{{ "||hbomax.com^", "||hbomaxcdn.com^", "||hbonow.com^", + "||max.com^", "||maxgo.com^", }, }, { @@ -2140,6 +2168,16 @@ var blockedServices = []blockedService{{ "||rockstargames.com^", "||rsg.sc^", }, +}, { + ID: "samsung_tv_plus", + Name: "Samsung TV Plus", + IconSVG: []byte(""), + Rules: []string{ + "||internetat.tv^", + "||samsung.wurl.tv^", + "||samsungcloud.tv^", + "||samsungtvplus.com^", + }, }, { ID: "shein", Name: "Shein", @@ -2328,7 +2366,6 @@ var blockedServices = []blockedService{{ Name: "TikTok", IconSVG: []byte(""), Rules: []string{ - "|p16-tiktokcdn-com.akamaized.net^", "||amemv.com^", "||bdurl.com^", "||bytecdn.cn^", @@ -2348,6 +2385,7 @@ var blockedServices = []blockedService{{ "||muscdn.com^", "||musical.ly^", "||p16-tiktok-*.ibyteimg.com^", + "||p16-tiktokcdn-com.akamaized.net^", "||pstatp.com^", "||snssdk.com^", "||tiktok.com^", @@ -2356,6 +2394,7 @@ var blockedServices = []blockedService{{ "||tiktokv.com^", "||ttlivecdn.com.c.bytefcdn-oversea.com^", "||ttlivecdn.com^", + "||v*.tiktokcdn-eu.com^", }, }, { ID: "tinder",