* Revert "Update blocked_services.go"

Squashed commit of the following:

commit 567bb4671ddb4f51c13e51094f96e870212137c8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Aug 11 19:29:31 2020 +0300

    Revert "Update blocked_services.go"

    This reverts commit 4ca4fb8a11.
This commit is contained in:
Simon Zolin 2020-08-12 13:03:17 +03:00
parent 020a30fb6d
commit 9b9902f004
1 changed files with 108 additions and 135 deletions

View File

@ -18,175 +18,148 @@ type svc struct {
// Keep in sync with: // Keep in sync with:
// client/src/helpers/constants.js // client/src/helpers/constants.js
// client/src/components/ui/Icons.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{ var serviceRulesArray = []svc{
{"whatsapp", []string{"||whatsapp.TLD^"}}, {"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}},
{"facebook", []string{ {"facebook", []string{
"||facebook.TLD^", "||facebook.com^",
"||fbcdn.TLD^", "||facebook.net^",
"||accountkit.TLD^", "||fbcdn.net^",
"||fb.TLD^", "||accountkit.com^",
"||fbsbx.TLD^", "||fb.me^",
"||discoverapp.TLD^", "||fb.com^",
"||freebasics.TLD^", "||fbsbx.com^",
"||freebasic.TLD^", "||messenger.com^",
"||internet.org^", "||facebookcorewwwi.onion^",
"||messenger.TLD^", "||fbcdn.com^",
"||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^",
}}, }},
{"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", []string{
"||youtube.TLD^", "||youtube.com^",
"||ytimg.com^", "||ytimg.com^",
"||youtu.TLD^", "||youtu.be^",
"||googlevideo.TLD^", "||googlevideo.com^",
"||youtubei.googleapis.TLD^", "||youtubei.googleapis.com^",
"||youtube-nocookie.TLD^", "||youtube-nocookie.com^",
"||youtube", "||youtube",
}}, }},
{"twitch", []string{"||twitch.tv^", "||ttvnw.TLD^", "||jtvnw.TLD^", "||twitchcdn.TLD^"}}, {"twitch", []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"}},
{"netflix", []string{"||nflxext.TLD^", "||netflix.TLD^", "||nflximg.TLD^", "||nflxvideo.TLD^"}}, {"netflix", []string{"||nflxext.com^", "||netflix.com^", "||nflximg.net^", "||nflxvideo.net^"}},
{"instagram", []string{"||instagram.TLD^", "||cdninstagram.TLD^", "||instagram-brand.TLD^"}}, {"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}},
{"snapchat", []string{ {"snapchat", []string{
"||snapchat.TLD^", "||snapchat.com^",
"||sc-cdn.TLD^", "||sc-cdn.net^",
"||snap-dev.TLD^", "||snap-dev.net^",
"||snapkit.co", "||snapkit.co",
"||snapads.TLD^", "||snapads.com^",
"||impala-media-production.s3.amazonaws.TLD^", "||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^"}}, {"ok", []string{"||ok.ru^"}},
{"skype", []string{"||skype.TLD^", "||skypeassets.TLD^"}}, {"skype", []string{"||skype.com^", "||skypeassets.com^"}},
{"vk", []string{"||vk.TLD^", "||userapi.TLD^", "||vk-cdn.TLD^", "||vkuservideo.TLD^"}}, {"vk", []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"}},
{"origin", []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"}}, {"origin", []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"}},
{"steam", []string{ {"steam", []string{
"||steam.com^", "||steam.com^",
"||steampowered.TLD^", "||steampowered.com^",
"||steamcommunity.TLD^", "||steamcommunity.com^",
"||steamstatic.TLD^", "||steamstatic.com^",
"||steamstore-a.akamaihd.net^", "||steamstore-a.akamaihd.net^",
"||steamcdn-a.akamaihd.net^", "||steamcdn-a.akamaihd.net^",
}}, }},
{"epic_games", []string{"||epicgames.TLD^", "||easyanticheat.TLD^", "||easy.ac^", "||eac-cdn.TLD^"}}, {"epic_games", []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"}},
{"reddit", []string{"||reddit.TLD^", "||redditstatic.TLD^", "||redditmedia.TLD^", "||redd.it^"}}, {"reddit", []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"}},
{"mail_ru", []string{"||mail.ru^"}}, {"mail_ru", []string{"||mail.ru^"}},
{"cloudflare", []string{ {"cloudflare", []string{
"||cloudflare.TLD^", "||cloudflare.com^",
"||cloudflare-dns.TLD^", "||cloudflare-dns.com^",
"||cloudflareinsights.TLD^", "||cloudflare.net^",
"||cloudflarestream.TLD^", "||cloudflareinsights.com^",
"||cloudflareresolve.TLD^", "||cloudflarestream.com^",
"||cloudflareclient.TLD^", "||cloudflareresolve.com^",
"||cloudflare-quic.TLD^", "||cloudflareclient.com^",
"||cloudflareapi.TLD^", "||cloudflarebolt.com^",
"||cloudflareapps.TLD^", "||cloudflarestatus.com^",
"||cloudflarechallenge.TLD^", "||cloudflare.cn^",
"||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^",
"||one.one^", "||one.one^",
"||warp.plus^", "||warp.plus^",
"||1.1.1.1^", "||1.1.1.1^",
"||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.TLD^", "||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^",
}}, }},
{"amazon", []string{ {"amazon", []string{
"||amazon.TLD^", "||amazon.com^",
"||media-amazon.TLD^", "||media-amazon.com^",
"||primevideo.TLD^", "||primevideo.com^",
"||amazontrust.TLD^", "||amazontrust.com^",
"||images-amazon.TLD^", "||images-amazon.com^",
"||amazonvideo.TLD^", "||ssl-images-amazon.com^",
"||assoc-amazon.TLD^", "||amazonpay.com^",
"||ssl-images-amazon.TLD^", "||amazonpay.in^",
"||amazonpay.TLD^", "||amazon-adsystem.com^",
"||amazon-adsystem.TLD^", "||a2z.com^",
"||amazonaws.TLD^", "||amazon.ae^",
"||aboutamazon.TLD^", "||amazon.ca^",
"||awsdns-cn-00.TLD^", "||amazon.cn^",
"||awsdns-00.TLD^", "||amazon.de^",
"||awsstatic.TLD^", "||amazon.es^",
"||comixology.TLD^", "||amazon.fr^",
"||boxofficemojo.TLD^", "||amazon.in^",
"||aiv-delivery.TLD^", "||amazon.it^",
"||jtvnw.TLD^", "||amazon.nl^",
"||awscloud.TLD^", "||amazon.com.au^",
"||goodreads.TLD^", "||amazon.com.br^",
"||shopbop.TLD^", "||amazon.co.jp^",
"||fabric.TLD^", "||amazon.com.mx^",
"||zappos.TLD^", "||amazon.co.uk^",
"||6pm.TLD^", "||createspace.com^",
"||psdops.TLD^",
"||woot.TLD^",
"||mturk.TLD^",
"||aiv-cdn.TLD^",
"||a2z.TLD^",
"||createspace.TLD^",
"||aws", "||aws",
}}, }},
{"ebay", []string{ {"ebay", []string{
"||ebay.TLD^", "||ebay.com^",
"||ebayimg.TLD^", "||ebayimg.com^",
"||ebaystatic.TLD^", "||ebaystatic.com^",
"||ebaycdn.TLD^", "||ebaycdn.net^",
"||appforebay.TLD^", "||ebayinc.com^",
"||ebayinc.TLD^", "||ebay.at^",
"||terapeak.TLD^", "||ebay.be^",
"||e-bay.TLD^", "||ebay.ca^",
"||ebaydts.TLD^", "||ebay.ch^",
"||shopping.TLD^", "||ebay.cn^",
"||ebaystores.TLD^", "||ebay.de^",
"||ebayglobalshipping.TLD^", "||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", []string{
"||tiktok.TLD^", "||tiktok.com^",
"||tiktokcdn.TLD^", "||tiktokcdn.com^",
"||musical.ly^", "||musical.ly^",
"||snssdk.TLD^", "||snssdk.com^",
"||amemv.TLD^", "||amemv.com^",
"||toutiao.com^", "||toutiao.com^",
"||ixigua.com^", "||ixigua.com^",
"||pstatp.com^", "||pstatp.com^",
"||ixiguavideo.TLD^", "||ixiguavideo.com^",
"||toutiaocloud.TLD^", "||toutiaocloud.com^",
"||bdurl.TLD^", "||toutiaocloud.net^",
"||byteimg.TLD^", "||bdurl.com^",
"||muscdn.TLD^", "||bytecdn.cn^",
"||byteimg.com^",
"||ixigua.com^",
"||muscdn.com^",
"||bytedance.map.fastly.net^", "||bytedance.map.fastly.net^",
"||douyin.TLD^", "||douyin.com^",
"||iesdouyin.TLD^", "||tiktokv.com^",
"||tiktokv.TLD^",
}}, }},
} }