From 9b9902f0048e1bca5d0c55ff715fb226f6fbc6ac Mon Sep 17 00:00:00 2001 From: Simon Zolin Date: Wed, 12 Aug 2020 13:03:17 +0300 Subject: [PATCH] * Revert "Update blocked_services.go" Squashed commit of the following: commit 567bb4671ddb4f51c13e51094f96e870212137c8 Author: Simon Zolin Date: Tue Aug 11 19:29:31 2020 +0300 Revert "Update blocked_services.go" This reverts commit 4ca4fb8a113dda47336038ced905fa87a9fa380f. --- dnsfilter/blocked_services.go | 243 +++++++++++++++------------------- 1 file changed, 108 insertions(+), 135 deletions(-) diff --git a/dnsfilter/blocked_services.go b/dnsfilter/blocked_services.go index c86a26c7..14a3959e 100644 --- a/dnsfilter/blocked_services.go +++ b/dnsfilter/blocked_services.go @@ -18,175 +18,148 @@ type svc struct { // Keep in sync with: // client/src/helpers/constants.js // client/src/components/ui/Icons.js -// Do not use ||example.TLD^ rule unless particular name is unique or many extensions belong to it var serviceRulesArray = []svc{ - {"whatsapp", []string{"||whatsapp.TLD^"}}, + {"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}}, {"facebook", []string{ - "||facebook.TLD^", - "||fbcdn.TLD^", - "||accountkit.TLD^", - "||fb.TLD^", - "||fbsbx.TLD^", - "||discoverapp.TLD^", - "||freebasics.TLD^", - "||freebasic.TLD^", - "||internet.org^", - "||messenger.TLD^", - "||m.me^", - "||i.org^", - "||f8.TLD^", - "||tfbnw.TLD^", - "||fburl.TLD^", - "||hob.bi^", - "||workplace.TLD^", - "||novi.TLD^", - "||libra.org^", - "||f8.TLD^", - "||oculus.TLD^", - "||acebook.TLD^", - "||forecastapp.net^", - "||adversarialnli.TLD^", - "||facebookblueprint.TLD^", - "||facebookrecruiting.TLD^", - "||boostwithfacebook.TLD^", - "||facebooksuppliers.TLD^", - "||facebookbrand.TLD^", - "||accessfacebookfromschool.TLD^", - "||facebookcorewwwi.TLD^", + "||facebook.com^", + "||facebook.net^", + "||fbcdn.net^", + "||accountkit.com^", + "||fb.me^", + "||fb.com^", + "||fbsbx.com^", + "||messenger.com^", + "||facebookcorewwwi.onion^", + "||fbcdn.com^", }}, - {"twitter", []string{"||twitter.TLD^", "||twttr.TLD^", "||t.co^", "||twimg.TLD^", "||ads-twitter.TLD^"}}, + {"twitter", []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"}}, {"youtube", []string{ - "||youtube.TLD^", + "||youtube.com^", "||ytimg.com^", - "||youtu.TLD^", - "||googlevideo.TLD^", - "||youtubei.googleapis.TLD^", - "||youtube-nocookie.TLD^", + "||youtu.be^", + "||googlevideo.com^", + "||youtubei.googleapis.com^", + "||youtube-nocookie.com^", "||youtube", }}, - {"twitch", []string{"||twitch.tv^", "||ttvnw.TLD^", "||jtvnw.TLD^", "||twitchcdn.TLD^"}}, - {"netflix", []string{"||nflxext.TLD^", "||netflix.TLD^", "||nflximg.TLD^", "||nflxvideo.TLD^"}}, - {"instagram", []string{"||instagram.TLD^", "||cdninstagram.TLD^", "||instagram-brand.TLD^"}}, + {"twitch", []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"}}, + {"netflix", []string{"||nflxext.com^", "||netflix.com^", "||nflximg.net^", "||nflxvideo.net^"}}, + {"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}}, {"snapchat", []string{ - "||snapchat.TLD^", - "||sc-cdn.TLD^", - "||snap-dev.TLD^", + "||snapchat.com^", + "||sc-cdn.net^", + "||snap-dev.net^", "||snapkit.co", - "||snapads.TLD^", - "||impala-media-production.s3.amazonaws.TLD^", + "||snapads.com^", + "||impala-media-production.s3.amazonaws.com^", }}, - {"discord", []string{"||discordapp.TLD^", "||discord.TLD^"}}, + {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^", "||discord.com^", "||discord.media^"}}, {"ok", []string{"||ok.ru^"}}, - {"skype", []string{"||skype.TLD^", "||skypeassets.TLD^"}}, - {"vk", []string{"||vk.TLD^", "||userapi.TLD^", "||vk-cdn.TLD^", "||vkuservideo.TLD^"}}, + {"skype", []string{"||skype.com^", "||skypeassets.com^"}}, + {"vk", []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"}}, {"origin", []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"}}, {"steam", []string{ "||steam.com^", - "||steampowered.TLD^", - "||steamcommunity.TLD^", - "||steamstatic.TLD^", + "||steampowered.com^", + "||steamcommunity.com^", + "||steamstatic.com^", "||steamstore-a.akamaihd.net^", "||steamcdn-a.akamaihd.net^", }}, - {"epic_games", []string{"||epicgames.TLD^", "||easyanticheat.TLD^", "||easy.ac^", "||eac-cdn.TLD^"}}, - {"reddit", []string{"||reddit.TLD^", "||redditstatic.TLD^", "||redditmedia.TLD^", "||redd.it^"}}, + {"epic_games", []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"}}, + {"reddit", []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"}}, {"mail_ru", []string{"||mail.ru^"}}, {"cloudflare", []string{ - "||cloudflare.TLD^", - "||cloudflare-dns.TLD^", - "||cloudflareinsights.TLD^", - "||cloudflarestream.TLD^", - "||cloudflareresolve.TLD^", - "||cloudflareclient.TLD^", - "||cloudflare-quic.TLD^", - "||cloudflareapi.TLD^", - "||cloudflareapps.TLD^", - "||cloudflarechallenge.TLD^", - "||cloudflarepreview.TLD^", - "||cloudflarepreviews.TLD^", - "||cloudflarebolt.TLD^", - "||cloudflare-free.TLD^", - "||cloudflare-ipfs.TLD", - "||cloudflareworkers.TLD^", - "||cloudflarestatus.TLD^", - "||cloudflareaccess.TLD^", - "||cloudflareenterprise.TLD^", - "||cloudflarespeedtest.TLD^", - "||cloudflaressl.TLD^", - "||encryptedsni.TLD^", - "||mycloudflare.TLD^", - "||workers.dev^", + "||cloudflare.com^", + "||cloudflare-dns.com^", + "||cloudflare.net^", + "||cloudflareinsights.com^", + "||cloudflarestream.com^", + "||cloudflareresolve.com^", + "||cloudflareclient.com^", + "||cloudflarebolt.com^", + "||cloudflarestatus.com^", + "||cloudflare.cn^", "||one.one^", "||warp.plus^", "||1.1.1.1^", - "||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.TLD^", + "||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^", }}, {"amazon", []string{ - "||amazon.TLD^", - "||media-amazon.TLD^", - "||primevideo.TLD^", - "||amazontrust.TLD^", - "||images-amazon.TLD^", - "||amazonvideo.TLD^", - "||assoc-amazon.TLD^", - "||ssl-images-amazon.TLD^", - "||amazonpay.TLD^", - "||amazon-adsystem.TLD^", - "||amazonaws.TLD^", - "||aboutamazon.TLD^", - "||awsdns-cn-00.TLD^", - "||awsdns-00.TLD^", - "||awsstatic.TLD^", - "||comixology.TLD^", - "||boxofficemojo.TLD^", - "||aiv-delivery.TLD^", - "||jtvnw.TLD^", - "||awscloud.TLD^", - "||goodreads.TLD^", - "||shopbop.TLD^", - "||fabric.TLD^", - "||zappos.TLD^", - "||6pm.TLD^", - "||psdops.TLD^", - "||woot.TLD^", - "||mturk.TLD^", - "||aiv-cdn.TLD^", - "||a2z.TLD^", - "||createspace.TLD^", + "||amazon.com^", + "||media-amazon.com^", + "||primevideo.com^", + "||amazontrust.com^", + "||images-amazon.com^", + "||ssl-images-amazon.com^", + "||amazonpay.com^", + "||amazonpay.in^", + "||amazon-adsystem.com^", + "||a2z.com^", + "||amazon.ae^", + "||amazon.ca^", + "||amazon.cn^", + "||amazon.de^", + "||amazon.es^", + "||amazon.fr^", + "||amazon.in^", + "||amazon.it^", + "||amazon.nl^", + "||amazon.com.au^", + "||amazon.com.br^", + "||amazon.co.jp^", + "||amazon.com.mx^", + "||amazon.co.uk^", + "||createspace.com^", "||aws", }}, {"ebay", []string{ - "||ebay.TLD^", - "||ebayimg.TLD^", - "||ebaystatic.TLD^", - "||ebaycdn.TLD^", - "||appforebay.TLD^", - "||ebayinc.TLD^", - "||terapeak.TLD^", - "||e-bay.TLD^", - "||ebaydts.TLD^", - "||shopping.TLD^", - "||ebaystores.TLD^", - "||ebayglobalshipping.TLD^", + "||ebay.com^", + "||ebayimg.com^", + "||ebaystatic.com^", + "||ebaycdn.net^", + "||ebayinc.com^", + "||ebay.at^", + "||ebay.be^", + "||ebay.ca^", + "||ebay.ch^", + "||ebay.cn^", + "||ebay.de^", + "||ebay.es^", + "||ebay.fr^", + "||ebay.ie^", + "||ebay.in^", + "||ebay.it^", + "||ebay.ph^", + "||ebay.pl^", + "||ebay.nl^", + "||ebay.com.au^", + "||ebay.com.cn^", + "||ebay.com.hk^", + "||ebay.com.my^", + "||ebay.com.sg^", + "||ebay.co.uk^", }}, {"tiktok", []string{ - "||tiktok.TLD^", - "||tiktokcdn.TLD^", + "||tiktok.com^", + "||tiktokcdn.com^", "||musical.ly^", - "||snssdk.TLD^", - "||amemv.TLD^", + "||snssdk.com^", + "||amemv.com^", "||toutiao.com^", "||ixigua.com^", "||pstatp.com^", - "||ixiguavideo.TLD^", - "||toutiaocloud.TLD^", - "||bdurl.TLD^", - "||byteimg.TLD^", - "||muscdn.TLD^", + "||ixiguavideo.com^", + "||toutiaocloud.com^", + "||toutiaocloud.net^", + "||bdurl.com^", + "||bytecdn.cn^", + "||byteimg.com^", + "||ixigua.com^", + "||muscdn.com^", "||bytedance.map.fastly.net^", - "||douyin.TLD^", - "||iesdouyin.TLD^", - "||tiktokv.TLD^", + "||douyin.com^", + "||tiktokv.com^", }}, }