From e0f2c3d170f8c9bf74ad03285614142dbbed4c5a Mon Sep 17 00:00:00 2001
From: NeP <2996023783@qq.com>
Date: Sat, 30 Jul 2022 12:22:24 +0800
Subject: [PATCH 1/3] filtering: add Bilibili service
---
client/src/components/ui/Icons.js | 4 ++++
client/src/helpers/constants.js | 4 ++++
internal/filtering/blocked.go | 26 +++++++++++++++++++++++---
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index e2186529..47e71f59 100644
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -408,6 +408,10 @@ const Icons = () => (
+
+
+
+
);
diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
index 6598530c..184e7a24 100644
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -211,6 +211,10 @@ export const SERVICES = [
id: 'amazon',
name: 'Amazon',
},
+ {
+ id: 'bilibili',
+ name: 'Bilibili',
+ },
{
id: 'cloudflare',
name: 'CloudFlare',
diff --git a/internal/filtering/blocked.go b/internal/filtering/blocked.go
index 48996a6d..75fafa62 100644
--- a/internal/filtering/blocked.go
+++ b/internal/filtering/blocked.go
@@ -216,6 +216,8 @@ var serviceRulesArray = []svc{{
"||bytedance.map.fastly.net^",
"||douyin.com^",
"||tiktokv.com^",
+ "||toutiaovod.com^",
+ "||douyincdn.com^",
},
}, {
name: "vimeo",
@@ -235,16 +237,24 @@ var serviceRulesArray = []svc{{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com",
"||qqzaixian.com^",
+ "||qq-video.cdn-go.cn^",
+ "||url.cn^",
},
}, {
- name: "wechat",
- rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
+ name: "wechat",
+ rules: []string{
+ "||wechat.com^",
+ "||wx.qq.com^",
+ "||weixin.qq.com^",
+ "||weixin.qq.com.cn^",
+ "||weixinbridge.com^",
+ },
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
- rules: []string{"||weibo.com^"},
+ rules: []string{"||weibo.com^", "||weibo.cn^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
@@ -284,6 +294,16 @@ var serviceRulesArray = []svc{{
"||tinder.com^",
"||tindersparks.com^",
},
+}, {
+ name: "bilibili",
+ rules: []string{
+ "||bilibili.com^",
+ "||bilivideo.com^",
+ "||biligame.com^",
+ "||biliapi.net^",
+ "||dreamcast.hk^",
+ "||hdslb.com^",
+ },
}}
// convert array to map
From 4c6377c5cb79c80f409e6b0ad8c33b8d91fc61be Mon Sep 17 00:00:00 2001
From: NeP <2996023783@qq.com>
Date: Thu, 4 Aug 2022 19:45:10 +0800
Subject: [PATCH 2/3] filtering: add Bilibili and Weibo domains
---
internal/filtering/blocked.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/internal/filtering/blocked.go b/internal/filtering/blocked.go
index 75fafa62..89531a22 100644
--- a/internal/filtering/blocked.go
+++ b/internal/filtering/blocked.go
@@ -254,7 +254,7 @@ var serviceRulesArray = []svc{{
rules: []string{"||viber.com^"},
}, {
name: "weibo",
- rules: []string{"||weibo.com^", "||weibo.cn^"},
+ rules: []string{"||weibo.com^", "||weibo.cn^", "||weibocdn.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
@@ -299,6 +299,7 @@ var serviceRulesArray = []svc{{
rules: []string{
"||bilibili.com^",
"||bilivideo.com^",
+ "||bilivideo.cn^",
"||biligame.com^",
"||biliapi.net^",
"||dreamcast.hk^",
From e6ebb8efef4430c48b06469ba566349bba3d9856 Mon Sep 17 00:00:00 2001
From: Ainar Garipov
Date: Thu, 18 Aug 2022 14:51:28 +0300
Subject: [PATCH 3/3] filtering: fmt
---
CHANGELOG.md | 5 +++
internal/filtering/blocked.go | 83 +++++++++++++++++++++++++----------
2 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4ad05b4..b92e14c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,11 +20,16 @@ and this project adheres to
- Weaker cipher suites that use the CBC (cipher block chaining) mode of
operation have been disabled ([#2993]).
+### Added
+
+- Bilibili service blocking ([#4795]).
+
### Deprecated
- Go 1.18 support. v0.109.0 will require at least Go 1.19 to build.
[#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993
+[#4795]: https://github.com/AdguardTeam/AdGuardHome/issues/4795
diff --git a/internal/filtering/blocked.go b/internal/filtering/blocked.go
index 89531a22..665b62d4 100644
--- a/internal/filtering/blocked.go
+++ b/internal/filtering/blocked.go
@@ -20,8 +20,11 @@ type svc struct {
// client/src/helpers/constants.js
// client/src/components/ui/Icons.js
var serviceRulesArray = []svc{{
- name: "whatsapp",
- rules: []string{"||whatsapp.net^", "||whatsapp.com^"},
+ name: "whatsapp",
+ rules: []string{
+ "||whatsapp.com^",
+ "||whatsapp.net^",
+ },
}, {
name: "facebook",
rules: []string{
@@ -38,8 +41,13 @@ var serviceRulesArray = []svc{{
"||fb.watch^",
},
}, {
- name: "twitter",
- rules: []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"},
+ name: "twitter",
+ rules: []string{
+ "||t.co^",
+ "||twimg.com^",
+ "||twitter.com^",
+ "||twttr.com^",
+ },
}, {
name: "youtube",
rules: []string{
@@ -53,8 +61,13 @@ var serviceRulesArray = []svc{{
"||ytimg.com^",
},
}, {
- name: "twitch",
- rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
+ name: "twitch",
+ rules: []string{
+ "||jtvnw.net^",
+ "||ttvnw.net^",
+ "||twitch.tv^",
+ "||twitchcdn.net^",
+ },
}, {
name: "netflix",
rules: []string{
@@ -220,17 +233,28 @@ var serviceRulesArray = []svc{{
"||douyincdn.com^",
},
}, {
- name: "vimeo",
- rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
+ name: "vimeo",
+ rules: []string{
+ "*vod-adaptive.akamaized.net^",
+ "||vimeo.com^",
+ "||vimeocdn.com^",
+ },
}, {
- name: "pinterest",
- rules: []string{"||pinterest.*^", "||pinimg.com^"},
+ name: "pinterest",
+ rules: []string{
+ "||pinimg.com^",
+ "||pinterest.*^",
+ },
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
- name: "dailymotion",
- rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
+ name: "dailymotion",
+ rules: []string{
+ "||dailymotion.com^",
+ "||dm-event.net^",
+ "||dmcdn.net^",
+ },
}, {
name: "qq",
rules: []string{
@@ -244,23 +268,34 @@ var serviceRulesArray = []svc{{
name: "wechat",
rules: []string{
"||wechat.com^",
- "||wx.qq.com^",
- "||weixin.qq.com^",
"||weixin.qq.com.cn^",
+ "||weixin.qq.com^",
"||weixinbridge.com^",
+ "||wx.qq.com^",
},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
- name: "weibo",
- rules: []string{"||weibo.com^", "||weibo.cn^", "||weibocdn.com^"},
+ name: "weibo",
+ rules: []string{
+ "||weibo.cn^",
+ "||weibo.com^",
+ "||weibocdn.com^",
+ },
}, {
- name: "9gag",
- rules: []string{"||9cache.com^", "||9gag.com^"},
+ name: "9gag",
+ rules: []string{
+ "||9cache.com^",
+ "||9gag.com^",
+ },
}, {
- name: "telegram",
- rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
+ name: "telegram",
+ rules: []string{
+ "||t.me^",
+ "||telegram.me^",
+ "||telegram.org^",
+ },
}, {
name: "disneyplus",
rules: []string{
@@ -297,11 +332,11 @@ var serviceRulesArray = []svc{{
}, {
name: "bilibili",
rules: []string{
- "||bilibili.com^",
- "||bilivideo.com^",
- "||bilivideo.cn^",
- "||biligame.com^",
"||biliapi.net^",
+ "||bilibili.com^",
+ "||biligame.com^",
+ "||bilivideo.cn^",
+ "||bilivideo.com^",
"||dreamcast.hk^",
"||hdslb.com^",
},