Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions src/chrome/content/rules/Gtimg.cn.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!--

Nonfunctional hosts in *gtimg.cn:

- img ¹
Expand All @@ -14,32 +15,44 @@
* 504, Akamai

-->

<ruleset name="gtimg.cn (partial)">

<!-- Direct rewrites:
-->
<!-- MCB at some page. e.g: https://imgcache.gtimg.cn/channel/-->
<target host="i.gtimg.cn" />
<exclusion pattern="^http://i\.gtimg\.cn/$" />
<target host="imgcache.gtimg.cn" />

<!-- Mixed content:Exclusion because of mixed content errors.
Detail: https://github.com/EFForg/https-everywhere/pull/4591
-->
<exclusion pattern="^http://imgcache\.gtimg\.cn/$" />
<rule from="^http://(i|imgcache)\.gtimg\.cn/(.+)\.(html|pdf|swf)$"
to="https://$1.gtimg.cn/$2.$3" />
<test url="http://i.gtimg.cn/bossweb/jifen/mobile/activity/20160224hhw.html" />
<test url="http://i.gtimg.cn/bossweb/jifen/mobile/activity/20151113sqms.html" />
<test url="http://i.gtimg.cn/club/themes/mobile/bq/2015/design_guide_2015.pdf" />
<test url="http://i.gtimg.cn/vipstyle/act/vip_130709_jsq/img/video.swf" />
<test url="http://imgcache.gtimg.cn/bossweb/jifen/mobile/activity/20160224hhw.html" />
<test url="http://imgcache.gtimg.cn/bossweb/jifen/mobile/activity/20151113sqms.html" />
<test url="http://imgcache.gtimg.cn/club/themes/mobile/bq/2015/design_guide_2015.pdf" />
<test url="http://imgcache.gtimg.cn/vipstyle/act/vip_130709_jsq/img/video.swf" />


<target host="ctc.i.gtimg.cn" />
<exclusion pattern="^http://ctc\.i\.gtimg\.cn/$" />
<rule from="^http://ctc\.i\.gtimg\.cn/(.+)\.swf"
to="https://ctc.i.gtimg.cn/$1.swf" />
<test url="http://ctc.i.gtimg.cn/qzone/space_item/orig/7/57639.swf" />
<test url="http://ctc.i.gtimg.cn/qzone/space_item/orig/11/57643.swf?id=www.qqjia.com&amp;type=.swf" />


<!-- MCB : https://github.com/EFForg/https-everywhere/pull/4591 -->
<target host="qzonestyle.gtimg.cn" />
<exclusion pattern="^http://qzonestyle\.gtimg\.cn/(?![\w/-]+\.(css|js|ico|png))" />
<exclusion pattern="^http://qzonestyle\.gtimg\.cn/$" />
<rule from="^http://qzonestyle\.gtimg\.cn/(.+)\.(css|js|ico|png)"
to="https://qzonestyle.gtimg.cn/$1.$2" />
<test url="http://qzonestyle.gtimg.cn/touch_proj/proj-pad-report/style-pad.css" />
<test url="http://qzonestyle.gtimg.cn/qzone_v6/proj_qzonelogin/qzonelogin.css" />
<test url="http://qzonestyle.gtimg.cn/aoi/img/logo/favicon.ico" />
<test url="http://qzonestyle.gtimg.cn/touch_proj/proj-pad-report/js/tcisd.js" />
<test url="http://qzonestyle.gtimg.cn/ac/qzfl/stat.js" />
<test url="http://qzonestyle.gtimg.cn/qzone_v6/proj_qzonelogin/img/qzone-login-logo.32.png" />

<!-- Complications:
-->
<target host="i.gtimg.cn" />

<securecookie host="^\w" name="." />

<rule from="^http://i\.gtimg\.cn/"
to="https://imgcache.gtimg.cn/" />

<rule from="^http:"
to="https:" />
<test url="http://qzonestyle.gtimg.cn/qzone_v6/proj_qzonelogin/sprite/qzonelogin-jan160520135013.png" />

</ruleset>
22 changes: 12 additions & 10 deletions src/chrome/content/rules/QQ.com-mixedcontent.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
<!--

For rules not causing MCB, see QQ.xml.

Mismatch:
service.qq.com
Invalid certificate:
m.ac.qq.com
p.y.qq.com
service.qq.com
m.v.qq.com (51, "SSL: no alternative certificate subject name matches target host name 'm.v.qq.com'")

Only avaiable in China:
ac.qq.com

-->

<ruleset name="QQ.com (mixed content)" platform="mixedcontent">

<!-- Direct rewrites:
-->
<target host="ac.qq.com" />
<target host="888.qq.com" />
<target host="cb.qq.com" />
<target host="connect.qq.com" />
<target host="film.qq.com" />
<target host="kg.qq.com" />
<target host="nr.qq.com" />
<target host="cache.tv.qq.com" />
<target host="v.qq.com" />
<target host="m.v.qq.com" />
<target host="y.qq.com" />
<target host="p.y.qq.com" />


<securecookie host="^\w" name="." />


<rule from="^http:" to="https:" />

</ruleset>
117 changes: 54 additions & 63 deletions src/chrome/content/rules/QQ.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
For rules causing MCB, see QQ.com-mixedcontent.xml.

For only avaiable in China : Tencent_CN.xml

CDN buckets:

Expand Down Expand Up @@ -31,16 +31,16 @@
- discuz *
- cp.discuz *
- djt *
- dldir1 404
- dldir1 ⁴
- dldir3 *
- dlied6 504
- appupdate.elife *
- finance 504
- fm *
- bbs.g ²
- gad *
- games 404
- gongyi 404
- games ⁴
- gongyi ⁴
- guanjia Redirects to 3gqq.qq.com
- bbs.guanjia *
- heat *
Expand All @@ -53,11 +53,11 @@
- bbs.m *
- yun.m ²

- open.mail 503
- open.mail **
- ptlogin2.mail *
- qzs
- service.mail (502)
- stockweb.mail (503)
- stockweb.mail **

- map Redirects to 3gqq.qq.com

Expand All @@ -66,7 +66,7 @@
- shangjia.map *
- ugc.map *

- mat1 404
- mat1 ⁴
- mil ⁴
- radio.cloud.music *
- cp.music *
Expand Down Expand Up @@ -94,7 +94,7 @@
- soft *
- t Shows another domain

- ad.t 404
- ad.t ⁴
- c.t Shows another domain
- dev.t 502
- e.t Shows another domain
Expand All @@ -114,7 +114,7 @@
- xg *
- yanchu *
- cgi.yanchu *
- www 404
- www ⁴
- zc (Handshake fails)

- mat1.gtimg.com **
Expand All @@ -140,15 +140,16 @@
- img1.chuangshi ²
- sta1.chuangshi ²
- connect ³

- act.daoju ² ³
- js01.daoju ²
- js02.daoju ²

- dldir2 ²
- cnc.exmail ²
- service.exmail ²
- tel.exmail ²
- film ³
- g ²
- gaauth ²
- gamevip ³
- gameweb-img ²
- qqgameplatcdn ²
Expand All @@ -171,7 +172,7 @@
- cdn.wetest ²
- img1.write ²
- y ³

- y.3g ²
- i.y ²
- m.y ² ³
- p.y ³
Expand Down Expand Up @@ -239,36 +240,40 @@

-->
<ruleset name="QQ.com (partial)">
<!-- Direct rewrites:
-->
<target host="y.3g.qq.com" />

<!--target host="ac.qq.com" /-->
<target host="aq.qq.com" />
<target host="js.aq.qq.com" />
<target host="combo.b.qq.com" />
<!-- Get from http://www.geetest.com/ -->
<test url="http://combo.b.qq.com/da/id.html" />
<target host="byod.qq.com" />
<!--target host="cb.qq.com" /-->
<!--target host="connect.qq.com" /-->
<!-- Time out
target host="dp3.qq.com" /-->
<target host="pcbrowser.dd.qq.com" />
<target host="exmail.qq.com" />
<target host="cnc.exmail.qq.com" />
<target host="edu.exmail.qq.com" />
<target host="en.exmail.qq.com" />
<target host="m.exmail.qq.com" />
<target host="open.exmail.qq.com" />
<target host="tel.exmail.qq.com" />
<!--target host="cnc.exmail.qq.com" /-->

<!-- May stop the auto check : https://travis-ci.org/EFForg/https-everywhere/jobs/157928826#L257
target host="edu.exmail.qq.com" />
<test url="http://edu.exmail.qq.com/cgi-bin/sellonlinestatic" /-->

<target host="en.exmail.qq.com" />
<target host="m.exmail.qq.com" />
<target host="open.exmail.qq.com" />
<!--target host="tel.exmail.qq.com" /-->
<!--target host="film.qq.com" /-->
<!-- Time out
target host="gaauth.qq.com" /-->
<!--target host="gaauth.qq.com" /-->
<target host="hao.qq.com" />
<target host="igame.qq.com" />
<!-- https://github.com/EFForg/https-everywhere/issues/4516
target host="imgcache.qq.com" /-->
<target host="imgcache.qq.com" />
<target host="ke.qq.com" />
<!-- redirects to http and Mixedcontent on https://kf.qq.com/product/weixin.html :
target host="kf.qq.com" /-->
<target host="kg.qq.com" />
<target host="x.l.qq.com" />
<test url="http://x.l.qq.com/unique.swf" />
<test url="http://x.l.qq.com/web/jsproxy/uuser.html" />
<target host="list.qq.com" />
<target host="live.qq.com" />
<target host="mail.qq.com" />
Expand Down Expand Up @@ -301,51 +306,37 @@
<target host="open.t.qq.com" />
<target host="tajs.qq.com" />
<!--target host="cache.tv.qq.com" /-->
<!--target host="v.qq.com" /-->
<!--target host="m.v.qq.com" /-->
<target host="v.qq.com" />
<!-- Mixcontented but break nothing. -->
<exclusion pattern="^http://v\.qq\.com/(?!x/)" />
<test url="http://v.qq.com/x/cover/jj0y3okpdfg82b3/z0021zgdwqa.html" />
<test url="http://v.qq.com/x/cover/zf2z0xpqcculhcz/t001688s8yi.html" />
<test url="http://v.qq.com/movie/" />

<!--target host="m.v.qq.com" /-->
<target host="sec.video.qq.com" />
<target host="vpic.video.qq.com" />
<target host="weixin.qq.com" />
<target host="api.weixin.qq.com" />
<target host="login.weixin.qq.com" />
<target host="mp.weixin.qq.com" />
<target host="open.weixin.qq.com" />
<target host="support.weixin.qq.com" />
<target host="web.weixin.qq.com" />
<target host="webpush.weixin.qq.com" />
<target host="api.weixin.qq.com" />
<target host="login.weixin.qq.com" />
<target host="mp.weixin.qq.com" />
<target host="open.weixin.qq.com" />
<target host="support.weixin.qq.com" />
<target host="web.weixin.qq.com" />
<target host="webpush.weixin.qq.com" />
<target host="weixin110.qq.com" />
<target host="wx.qq.com" />
<target host="file.wx.qq.com" />
<target host="login.wx.qq.com" />
<target host="res.wx.qq.com" />
<target host="file.wx.qq.com" />
<target host="login.wx.qq.com" />
<target host="res.wx.qq.com" />
<target host="wx1.qq.com" />
<target host="wx2.qq.com" />
<target host="file.wx2.qq.com" />
<target host="login.wx2.qq.com" />
<target host="file.wx2.qq.com" />
<target host="login.wx2.qq.com" />
<!--target host="y.qq.com" /-->
<!--target host="p.y.qq.com" /-->

<!-- Sets cookie without Secure:
-->
<!--test url="http://mp.weixin.qq.com/s?__biz=&amp;mid=&amp;idx=1&amp;sn=&amp;scene=1&amp;srcid=&amp;key=&amp;ascene=1&amp;uin=&amp;devicetype=&amp;version=&amp;pass_ticket=" /-->


<!-- Not secured by server:
-->
<!--securecookie host="^\.qq\.com$" name="^(device|mm_lang|pt_clientip|pt_serverip)$" /-->
<!--securecookie host="^\.aq\.qq\.com$" name="^aq_base_sid$" /-->
<!--securecookie host="^\.exmail\.qq\.com$" name="^(?:edition|mcookie|ssl_edition)$" /-->
<!--securecookie host="^\.ptlogin2\.qq\.com$" name="^(pt_local_token|pt_login_sig|uikey)$" /-->
<!--securecookie host="^\.(?:mail|r|reader)\.qq\.com$" name="^(?:edition|ssl_edition)$" /-->
<!--securecookie host="^\.ui\.ptlogin2\.qq\.com$" name="^(pt_user_id|ptui_identifier)$" /-->
<!--securecookie host="^mp\.weixin\.qq\.com$" name="^payforreadsn$" /-->
<!--securecookie host="^\.(?:wx[12]?|login\.wx2?)\.qq\.com$" name="^mm_lang$" /-->

<!-- Could we secure any of these safely?
-->
<!--securecookie host="^\.qq\.com$" name="^(mm_lang|webwxuvid)$" /-->
<securecookie host="^\w" name="." />
<!--target host="p.y.qq.com" /-->

<securecookie host="^\w" name="." />

<rule from="^http:" to="https:" />

Expand Down
28 changes: 13 additions & 15 deletions src/chrome/content/rules/Qlogo.cn.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<!--
Nonfunctional hosts in *qlogo.cn:

- shp ¹

¹ Dropped
502:
wx (get test from club.fir.im : http://wx.qlogo.cn/mmopen/PiajxSqBRaEJmzddrgRDEwqtNgZl6F4wKLR00a7FM21ZCwiciaAjChmWBmK9Sv3CAQCZyn0icNdaImAsBliaj723sow/0)

Invalid certificate:
q[1-4]
shp ( Test: http://shp.qlogo.cn/ttsing/40297318/40297318/ )

May stop the auto check:
t9

Ony avaiable in China:
t8
-->

<ruleset name="Qlogo.cn">

<target host="app.qlogo.cn" />
<target host="mmbiz.qlogo.cn" />
<target host="q1.qlogo.cn" />
<target host="q2.qlogo.cn" />
<target host="q3.qlogo.cn" />
<target host="q4.qlogo.cn" />
<target host="t0.qlogo.cn" />
<target host="t1.qlogo.cn" />
<target host="t2.qlogo.cn" />
Expand All @@ -22,14 +25,9 @@
<target host="t5.qlogo.cn" />
<target host="t6.qlogo.cn" />
<target host="t7.qlogo.cn" />
<!-- Time out
target host="t8.qlogo.cn" /-->
<target host="t9.qlogo.cn" />
<target host="wx.qlogo.cn" />

<securecookie host="^\w" name="." />

<rule from="^http:"
to="https:" />
<rule from="^http:" to="https:" />

</ruleset>
Loading