beb674ecbc
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy
371 lines
8.3 KiB
Go
371 lines
8.3 KiB
Go
package filtering
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/urlfilter/rules"
|
|
)
|
|
|
|
var serviceRules map[string][]*rules.NetworkRule // service name -> filtering rules
|
|
|
|
type svc struct {
|
|
name string
|
|
rules []string
|
|
}
|
|
|
|
// Keep in sync with:
|
|
// client/src/helpers/constants.js
|
|
// client/src/components/ui/Icons.js
|
|
var serviceRulesArray = []svc{{
|
|
name: "whatsapp",
|
|
rules: []string{"||whatsapp.net^", "||whatsapp.com^"},
|
|
}, {
|
|
name: "facebook",
|
|
rules: []string{
|
|
"||facebook.com^",
|
|
"||facebook.net^",
|
|
"||fbcdn.net^",
|
|
"||accountkit.com^",
|
|
"||fb.me^",
|
|
"||fb.com^",
|
|
"||fbsbx.com^",
|
|
"||messenger.com^",
|
|
"||facebookcorewwwi.onion^",
|
|
"||fbcdn.com^",
|
|
"||fb.watch^",
|
|
},
|
|
}, {
|
|
name: "twitter",
|
|
rules: []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"},
|
|
}, {
|
|
name: "youtube",
|
|
rules: []string{
|
|
"||youtube.com^",
|
|
"||ytimg.com^",
|
|
"||youtu.be^",
|
|
"||googlevideo.com^",
|
|
"||youtubei.googleapis.com^",
|
|
"||youtube-nocookie.com^",
|
|
"||youtube",
|
|
},
|
|
}, {
|
|
name: "twitch",
|
|
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
|
|
}, {
|
|
name: "netflix",
|
|
rules: []string{
|
|
"||nflxext.com^",
|
|
"||netflix.com^",
|
|
"||nflximg.net^",
|
|
"||nflxvideo.net^",
|
|
"||nflxso.net^",
|
|
},
|
|
}, {
|
|
name: "instagram",
|
|
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
|
|
}, {
|
|
name: "snapchat",
|
|
rules: []string{
|
|
"||snapchat.com^",
|
|
"||sc-cdn.net^",
|
|
"||snap-dev.net^",
|
|
"||snapkit.co",
|
|
"||snapads.com^",
|
|
"||impala-media-production.s3.amazonaws.com^",
|
|
},
|
|
}, {
|
|
name: "discord",
|
|
rules: []string{
|
|
"||discord.gg^",
|
|
"||discordapp.net^",
|
|
"||discordapp.com^",
|
|
"||discord.com^",
|
|
"||discord.media^",
|
|
},
|
|
}, {
|
|
name: "ok",
|
|
rules: []string{"||ok.ru^"},
|
|
}, {
|
|
name: "skype",
|
|
rules: []string{"||skype.com^", "||skypeassets.com^"},
|
|
}, {
|
|
name: "vk",
|
|
rules: []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"},
|
|
}, {
|
|
name: "origin",
|
|
rules: []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"},
|
|
}, {
|
|
name: "steam",
|
|
rules: []string{
|
|
"||steam.com^",
|
|
"||steampowered.com^",
|
|
"||steamcommunity.com^",
|
|
"||steamstatic.com^",
|
|
"||steamstore-a.akamaihd.net^",
|
|
"||steamcdn-a.akamaihd.net^",
|
|
},
|
|
}, {
|
|
name: "epic_games",
|
|
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
|
|
}, {
|
|
name: "reddit",
|
|
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
|
|
}, {
|
|
name: "mail_ru",
|
|
rules: []string{"||mail.ru^"},
|
|
}, {
|
|
name: "cloudflare",
|
|
rules: []string{
|
|
"||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.onion^",
|
|
},
|
|
}, {
|
|
name: "amazon",
|
|
rules: []string{
|
|
"||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",
|
|
},
|
|
}, {
|
|
name: "ebay",
|
|
rules: []string{
|
|
"||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^",
|
|
},
|
|
}, {
|
|
name: "tiktok",
|
|
rules: []string{
|
|
"||tiktok.com^",
|
|
"||tiktokcdn.com^",
|
|
"||musical.ly^",
|
|
"||snssdk.com^",
|
|
"||amemv.com^",
|
|
"||toutiao.com^",
|
|
"||ixigua.com^",
|
|
"||pstatp.com^",
|
|
"||ixiguavideo.com^",
|
|
"||toutiaocloud.com^",
|
|
"||toutiaocloud.net^",
|
|
"||bdurl.com^",
|
|
"||bytecdn.cn^",
|
|
"||byteimg.com^",
|
|
"||ixigua.com^",
|
|
"||muscdn.com^",
|
|
"||bytedance.map.fastly.net^",
|
|
"||douyin.com^",
|
|
"||tiktokv.com^",
|
|
},
|
|
}, {
|
|
name: "vimeo",
|
|
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
|
|
}, {
|
|
name: "pinterest",
|
|
rules: []string{"||pinterest.*^", "||pinimg.com^"},
|
|
}, {
|
|
name: "imgur",
|
|
rules: []string{"||imgur.com^"},
|
|
}, {
|
|
name: "dailymotion",
|
|
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
|
|
}, {
|
|
name: "qq",
|
|
rules: []string{
|
|
// Block qq.com and subdomains excluding WeChat's domains.
|
|
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com",
|
|
"||qqzaixian.com^",
|
|
},
|
|
}, {
|
|
name: "wechat",
|
|
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
|
|
}, {
|
|
name: "viber",
|
|
rules: []string{"||viber.com^"},
|
|
}, {
|
|
name: "weibo",
|
|
rules: []string{"||weibo.com^"},
|
|
}, {
|
|
name: "9gag",
|
|
rules: []string{"||9cache.com^", "||9gag.com^"},
|
|
}, {
|
|
name: "telegram",
|
|
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
|
|
}, {
|
|
name: "disneyplus",
|
|
rules: []string{
|
|
"||disney-plus.net^",
|
|
"||disneyplus.com^",
|
|
"||disney.playback.edge.bamgrid.com^",
|
|
"||media.dssott.com^",
|
|
},
|
|
}, {
|
|
name: "hulu",
|
|
rules: []string{"||hulu.com^"},
|
|
}, {
|
|
name: "spotify",
|
|
rules: []string{
|
|
"/_spotify-connect._tcp.local/",
|
|
"||spotify.com^",
|
|
"||scdn.co^",
|
|
"||spotify.com.edgesuite.net^",
|
|
"||spotify.map.fastly.net^",
|
|
"||spotify.map.fastlylb.net^",
|
|
"||spotifycdn.net^",
|
|
"||audio-ak-spotify-com.akamaized.net^",
|
|
"||audio4-ak-spotify-com.akamaized.net^",
|
|
"||heads-ak-spotify-com.akamaized.net^",
|
|
"||heads4-ak-spotify-com.akamaized.net^",
|
|
},
|
|
}, {
|
|
name: "tinder",
|
|
rules: []string{
|
|
"||gotinder.com^",
|
|
"||tinder.com^",
|
|
"||tindersparks.com^",
|
|
},
|
|
}}
|
|
|
|
// convert array to map
|
|
func initBlockedServices() {
|
|
serviceRules = make(map[string][]*rules.NetworkRule)
|
|
for _, s := range serviceRulesArray {
|
|
netRules := []*rules.NetworkRule{}
|
|
for _, text := range s.rules {
|
|
rule, err := rules.NewNetworkRule(text, BlockedSvcsListID)
|
|
if err != nil {
|
|
log.Error("rules.NewNetworkRule: %s rule: %s", err, text)
|
|
continue
|
|
}
|
|
netRules = append(netRules, rule)
|
|
}
|
|
serviceRules[s.name] = netRules
|
|
}
|
|
}
|
|
|
|
// BlockedSvcKnown - return TRUE if a blocked service name is known
|
|
func BlockedSvcKnown(s string) bool {
|
|
_, ok := serviceRules[s]
|
|
return ok
|
|
}
|
|
|
|
// ApplyBlockedServices - set blocked services settings for this DNS request
|
|
func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string, global bool) {
|
|
setts.ServicesRules = []ServiceEntry{}
|
|
if global {
|
|
d.confLock.RLock()
|
|
defer d.confLock.RUnlock()
|
|
list = d.Config.BlockedServices
|
|
}
|
|
for _, name := range list {
|
|
rules, ok := serviceRules[name]
|
|
|
|
if !ok {
|
|
log.Error("unknown service name: %s", name)
|
|
continue
|
|
}
|
|
|
|
s := ServiceEntry{}
|
|
s.Name = name
|
|
s.Rules = rules
|
|
setts.ServicesRules = append(setts.ServicesRules, s)
|
|
}
|
|
}
|
|
|
|
func (d *DNSFilter) handleBlockedServicesList(w http.ResponseWriter, r *http.Request) {
|
|
d.confLock.RLock()
|
|
list := d.Config.BlockedServices
|
|
d.confLock.RUnlock()
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
err := json.NewEncoder(w).Encode(list)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "json.Encode: %s", err)
|
|
|
|
return
|
|
}
|
|
}
|
|
|
|
func (d *DNSFilter) handleBlockedServicesSet(w http.ResponseWriter, r *http.Request) {
|
|
list := []string{}
|
|
err := json.NewDecoder(r.Body).Decode(&list)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
d.confLock.Lock()
|
|
d.Config.BlockedServices = list
|
|
d.confLock.Unlock()
|
|
|
|
log.Debug("Updated blocked services list: %d", len(list))
|
|
|
|
d.ConfigModified()
|
|
}
|
|
|
|
// registerBlockedServicesHandlers - register HTTP handlers
|
|
func (d *DNSFilter) registerBlockedServicesHandlers() {
|
|
d.Config.HTTPRegister(http.MethodGet, "/control/blocked_services/list", d.handleBlockedServicesList)
|
|
d.Config.HTTPRegister(http.MethodPost, "/control/blocked_services/set", d.handleBlockedServicesSet)
|
|
}
|