Skip to content

Commit e601581

Browse files
ivysronogloomy-ghost
ivysrono
authored and
gloomy-ghost
committed
Qq.com (EFForg#18338)
* Delete QQ.com-Problematic.xml * Update QQ.xml * Update QQ.com-mixedcontent.xml * Update ruleset-whitelist.csv * Update QQ.xml * Update QQ.xml
1 parent a7393f1 commit e601581

4 files changed

Lines changed: 68 additions & 120 deletions

File tree

‎src/chrome/content/rules/QQ.com-Problematic.xml‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎src/chrome/content/rules/QQ.com-mixedcontent.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<ruleset name="QQ.com (mixed content)" platform="mixedcontent">
55
<target host="1.qq.com" />
66
<test url="http://1.qq.com/mall/lottery.shtml" />
7-
<target host="dajia.qq.com" />
8-
<target host="iwan.qq.com" />
9-
<target host="qzs.qq.com" />
107
<target host="cache.tv.qq.com" />
8+
<test url="http://cache.tv.qq.com/zhuanti/premiership/web/premiership_0_1.htm" />
119

1210
<securecookie host=".+" name=".+" />
1311

‎src/chrome/content/rules/QQ.xml‎

Lines changed: 67 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<!--
22
For rules causing MCB: QQ.com-mixedcontent.xml.
3-
For rules causing test fails: QQ.com-Problematic.xml
43
5-
Redirect:
6-
qq.com equal to www.qq.com
7-
8-
Different http/https content:
9-
https://djt.qq.com https://djt.qq.com/home/index/
10-
https://qqgameplatcdn.qq.com https://qqgameplatcdn.qq.com/social_hall/js/jquery.js
4+
503：
115
https://tpai.qq.com https://tpai.qq.com/race
126
137
Expired:
@@ -47,9 +41,11 @@
4741
https://developer.qq.com
4842
https://discuz.qq.com
4943
https://cp.discuz.qq.com
44+
https://dp3.qq.com https://travis-ci.org/EFForg/https-everywhere/jobs/576119484#L615
5045
https://appupdate.elife.qq.com
5146
https://gad.qq.com
5247
https://ptlogin2.mail.qq.com
48+
https://bbs.g.qq.com https://travis-ci.org/EFForg/https-everywhere/jobs/576140695#L827
5349
https://bbs.map.qq.com
5450
https://radio.cloud.music.qq.com
5551
https://mx.qq.com
@@ -62,15 +58,25 @@
6258
https://bbs.vip.qq.com
6359
https://yanchu.qq.com
6460
https://cgi.yanchu.qq.com
61+
62+
Redirect:
63+
qq.com equal to www.qq.com
64+
65+
Redirect to http:
66+
https://qqgameplatcdn.qq.com https://qqgameplatcdn.qq.com/social_hall/js/jquery.js
6567
-->
6668
<ruleset name="QQ.com (partial)">
6769
<target host="qq.com" />
6870
<target host="www.qq.com" />
6971
<target host="misc.3g.qq.com" />
7072
<target host="softfile.3g.qq.com" />
73+
<target host="3gimg.qq.com" />
7174
<target host="3gqq.qq.com" />
75+
<target host="888.qq.com" />
7276
<target host="ac.qq.com" />
7377
<target host="m.ac.qq.com" />
78+
<target host="aq.qq.com" />
79+
<target host="js.aq.qq.com" />
7480
<target host="combo.b.qq.com" />
7581
<test url="http://combo.b.qq.com/da/id.html" />
7682
<target host="wpa.b.qq.com" />
@@ -83,7 +89,12 @@
8389
<target host="connect.qq.com" />
8490
<target host="crm2.qq.com" />
8591
<target host="cul.qq.com" />
92+
<target host="dajia.qq.com" />
8693
<target host="daju.qq.com" />
94+
<target host="act.daoju.qq.com" />
95+
<test url="http://act.daoju.qq.com/act/a20180629traders/index.htm" />
96+
<target host="js01.daoju.qq.com" />
97+
<target host="js02.daoju.qq.com" />
8798
<target host="data.qq.com" />
8899
<target host="daxue.qq.com" />
89100
<target host="pcbrowser.dd.qq.com" />
@@ -104,10 +115,10 @@
104115
<target host="film.qq.com" />
105116
<target host="finance.qq.com" />
106117
<target host="fm.qq.com" />
107-
<target host="bbs.g.qq.com" />
108118
<target host="game.qq.com" />
109119
<target host="games.qq.com" />
110120
<test url="http://games.qq.com/mobile/" />
121+
<target host="gamevip.qq.com" />
111122
<target host="gongyi.qq.com" />
112123
<target host="guanjia.qq.com" />
113124
<target host="bbs.guanjia.qq.com" />
@@ -122,10 +133,13 @@
122133
<target host="imgcache.qq.com" />
123134
<target host="isdspeed.qq.com" />
124135
<test url="http://isdspeed.qq.com/cgi-bin/r.cgi" />
136+
<target host="iwan.qq.com" />
137+
<test url="http://iwan.qq.com/pcwebsite/game" />
125138
<target host="jq.qq.com" />
126139
<target host="jqmt.qq.com" />
127140
<target host="jsqmt.qq.com" />
128141
<test url="http://jsqmt.qq.com/cdn_djl.js" />
142+
<target host="ke.qq.com" />
129143
<target host="kf.qq.com" />
130144
<!-- Redirect to http -->
131145
<rule from="^http://kf\.qq\.com/$"
@@ -152,51 +166,80 @@
152166
<target host="i.match.qq.com" />
153167
<target host="map.qq.com" />
154168
<target host="apis.map.qq.com" />
169+
<target host="open.map.qq.com" />
170+
<target host="pr.map.qq.com" />
171+
<target host="s.map.qq.com" />
155172
<target host="shangjia.map.qq.com" />
156173
<target host="sv.map.qq.com" />
157174
<target host="mil.qq.com" />
175+
<target host="minigame.qq.com" />
176+
<test url="http://minigame.qq.com/common_manage/381/big_image_2c247d2261206b6ae81ef1ccc7108582.jpg" />
158177
<target host="music.qq.com" />
159178
<target host="cp.music.qq.com" />
179+
<target host="mxm.qq.com" />
160180
<target host="news.qq.com" />
161181
<target host="view.news.qq.com" />
162182
<target host="nr.qq.com" />
163183
<target host="office.qq.com" />
164184
<target host="om.qq.com" />
165185
<target host="iot.open.qq.com" />
166186
<target host="op.open.qq.com" />
187+
<target host="ossweb-img.qq.com" />
188+
<test url="http://ossweb-img.qq.com/images/js/share/share.shtml" />
167189
<target host="pay.qq.com" />
168190
<target host="my.pay.qq.com" />
191+
<target host="s.pc.qq.com" />
192+
<test url="http://s.pc.qq.com/discuz/css/style.css" />
169193
<target host="pingfore.qq.com" />
170194
<!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471282290#L759 -->
171195
<exclusion pattern="^http://pingfore\.qq\.com/$" />
172196
<test url="http://pingfore.qq.com/pingd?dm=ent.qq.com&#x26;url=/a/20070713/000109.htm" />
173197
<target host="pingjs.qq.com" />
174198
<target host="player.qq.com" />
199+
<target host="ssl.ptlogin2.qq.com" />
175200
<target host="ui.ptlogin2.qq.com" />
176201
<target host="xui.ptlogin2.qq.com" />
177202
<target host="ssl.xui.ptlogin2.qq.com" />
178203
<target host="cgi.pub.qq.com" />
179204
<target host="pushdata.qq.com" />
180205
<target host="qian.qq.com" />
181206
<target host="wp.qiye.qq.com" />
207+
<target host="qqgame.qq.com" />
208+
<target host="open.qqgame.qq.com" />
182209
<target host="dl.stream.qqmusic.qq.com" />
183210
<target host="admin.qun.qq.com" />
184211
<target host="user.qzone.qq.com" />
212+
<target host="qzs.qq.com" />
213+
<test url="http://qzs.qq.com/syzs/overSeaLogin/index.html" />
214+
<test url="http://qzs.qq.com/open/baymax/8/10358_6af2d18906a25c07311b1c34cfe90ae0_0.html" />
185215
<target host="r.qq.com" />
186216
<target host="reader.qq.com" />
187217
<target host="file.service.qq.com" />
188218
<target host="shang.qq.com" />
219+
<target host="img1.sj.qq.com" />
220+
<test url="http://img1.sj.qq.com/api/styles/sjqqapi.css" />
221+
<target host="img2.sj.qq.com" />
222+
<test url="http://img2.sj.qq.com/api/scripts/sjqqapi.js" />
223+
<target host="img3.sj.qq.com" />
224+
<target host="img4.sj.qq.com" />
225+
<target host="img5.sj.qq.com" />
226+
<target host="img6.sj.qq.com" />
227+
<target host="sqimg.qq.com" />
189228
<target host="photo.store.qq.com" />
190229
<target host="*.photo.store.qq.com" />
191230
<target host="qlogo1.store.qq.com" />
192-
<!--test url="http://qlogo1.store.qq.com/qzone/11111111/11111111/100" /--> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471290133#L755 -->
231+
<test url="http://qlogo1.store.qq.com/qzone/11111111/11111111/100" />
193232
<target host="qlogo2.store.qq.com" />
194233
<target host="qlogo3.store.qq.com" />
195234
<target host="qlogo4.store.qq.com" />
196235
<target host="support.qq.com" />
197236
<target host="tajs.qq.com" />
237+
<target host="cdn.tencentgroup.qq.com" />
238+
<test url="http://cdn.tencentgroup.qq.com/join_static/ext/20170905/" />
198239
<target host="trace.qq.com" />
199240
<target host="ugcbsy.qq.com" />
241+
<target host="v.qq.com" />
242+
<test url="http://v.qq.com/vplus/colorsofchina" />
200243
<target host="m.v.qq.com" />
201244
<target host="c.v.qq.com" />
202245
<test url="http://c.v.qq.com/vuserinfo" />
@@ -216,28 +259,38 @@
216259
<test url="http://pay.video.qq.com/fcgi-bin/autopay" />
217260
<target host="routertips.video.qq.com" />
218261
<target host="sec.video.qq.com" />
262+
<target host="tj.video.qq.com" />
263+
<test url="http://tj.video.qq.com/fcgi-bin/set_cookie?otype=json" />
219264
<target host="vhotlx.video.qq.com" />
220265
<target host="vpic.video.qq.com" />
221266
<target host="vpdata.video.qq.com" />
222267
<target host="vv.video.qq.com" />
223268
<test url="http://vv.video.qq.com/getinfo?otype=json" />
269+
<target host="vip.qq.com" />
224270
<target host="web.qq.com" />
225271
<target host="web2.qq.com" />
226272
<target host="weixin.qq.com" />
227-
<target host="weread.qq.com" />
228-
<target host="wetest.qq.com" />
229-
<target host="weixiao.qq.com" />
273+
<target host="api.weixin.qq.com" />
230274
<target host="login.weixin.qq.com" />
231275
<target host="mp.weixin.qq.com" />
276+
<target host="open.weixin.qq.com" />
232277
<target host="support.weixin.qq.com" />
233278
<target host="web.weixin.qq.com" />
279+
<target host="webpush.weixin.qq.com" />
234280
<target host="weixin110.qq.com" />
281+
<target host="weread.qq.com" />
282+
<target host="wetest.qq.com" />
283+
<target host="cdn.wetest.qq.com" />
284+
<target host="f.wetest.qq.com" />
285+
<target host="weixiao.qq.com" />
235286
<target host="wj.qq.com" />
236287
<target host="wpa.qq.com" />
237288
<target host="img1.write.qq.com" />
238289
<test url="http://img1.write.qq.com/upload/cover/2016-09-26/cs_57e8da4a552c6.jpg" />
290+
<target host="wspeed.qq.com" />
239291
<target host="wx.qq.com" />
240292
<target host="file.wx.qq.com" />
293+
<test url="http://file.wx.qq.com/cgi-bin/mmwebwx-bin/webwxuploadmedia?f=json" />
241294
<target host="login.wx.qq.com" />
242295
<target host="res.wx.qq.com" />
243296
<target host="wx1.qq.com" />
@@ -246,9 +299,11 @@
246299
<target host="login.wx2.qq.com" />
247300
<target host="xg.qq.com" />
248301
<target host="xw.qq.com" />
302+
<target host="xx.qq.com" />
249303
<target host="y.qq.com" />
250304
<target host="c.y.qq.com" />
251305
<target host="i.y.qq.com" />
306+
<target host="m.y.qq.com" />
252307
<target host="p.y.qq.com" />
253308
<target host="zc.qq.com" />
254309

‎utils/ruleset-whitelist.csv‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,6 @@ b2e2a5f8ed45c939a47777f82b4f45f9e6f29434abcd942895047a2926718560,1,1,Purdue_Univ
18101810
b6057520488d6305bdb6398f415267cf8feba6274d26eea30399d35a52e778c4,0,1,Pusher.com.xml
18111811
3559850f77b0bc7b063de923ddadd129a1c31e704e27f3318f4dcbb7eeb2d623,1,0,PutLocker.xml
18121812
0c9b2d18c06cc6a3cdf9e3eda7c17efd3932f0a8a10e733cb1e3639b5b367dfc,1,1,QIP.xml
1813-
d8cfe771ca70a3159d7c8ae1d5e00586ac0a71e7bafccb88fdc62ef94db5496c,0,1,QQ.com-Problematic.xml
18141813
de96109bb8138c3932d1def5e147223642ddeff5063f85352049f89b8dbe0d07,1,0,Qrobe.it.xml
18151814
610d9ca4c64e1044ed49151a455e132dedc6cb288f14f86223b4bfc84d58a368,1,0,Quattroplay.com.xml
18161815
11670da974bdbd3ad8f36d0905cdb3b0a259181f1c2a7082c85c2ba432a1b21b,1,1,Queens_University_Belfast.xml

0 commit comments

Comments
 (0)