Update QQ.xml (#16544)

* Update QQ.xml * Update QQ.com-Problematic.xml * Update QQ.xml * Update QQ.com-Problematic.xml * Update QQ.xml * Update QQ.xml * Update QQ.xml * Update QQ.com-mixedcontent.xml
EFForg · Sep 17, 2018 · 558f7dc · 558f7dc
1 parent 722ef4b
commit 558f7dc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 30 deletions.
diff --git a/src/chrome/content/rules/QQ.com-Problematic.xml b/src/chrome/content/rules/QQ.com-Problematic.xml
@@ -1,17 +1,16 @@
 <!--
 	For other rulesets of QQ.com, see QQ.xml
 
-	They don't have problem with https, just some encoding
-	problems are failing test.
+	They don't have problem with https, just some problems are failing test.
 -->
 <ruleset name="QQ.com-Problematic">
-	<!-- https://travis-ci.org/EFForg/https-everywhere/jobs/157928826#L257 -->
-	<target host="en.exmail.qq.com" />
-	<target host="m.exmail.qq.com" />
-	<target host="open.exmail.qq.com" />
+	<target host="qq.com" />
+	<target host="www.qq.com" />
 
 	<securecookie host=".+" name=".+" />
 
+	<rule from="^http://qq\.com/" to="https://www.qq.com/" />
+
 	<rule from="^http:" to="https:" />
 </ruleset>
 
diff --git a/src/chrome/content/rules/QQ.com-mixedcontent.xml b/src/chrome/content/rules/QQ.com-mixedcontent.xml
@@ -4,13 +4,15 @@
 <ruleset name="QQ.com (mixed content)" platform="mixedcontent">
 	<target host="888.qq.com" />
 	<target host="cb.qq.com" />
+	<target host="daju.qq.com" />
 	<target host="games.qq.com" />
+		<test url="http://games.qq.com/mobile/" />
 	<target host="gamevip.qq.com" />
 	<target host="qqgame.qq.com" />
 	<target host="shang.qq.com" />
 	<target host="cache.tv.qq.com" />
 
-	<securecookie host="^\w" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/QQ.xml b/src/chrome/content/rules/QQ.xml
@@ -2,10 +2,6 @@
 	For rules causing MCB: QQ.com-mixedcontent.xml.
 	For rules causing test fails: QQ.com-Problematic.xml
 
-	CDN buckets:
-		- qzone.qq.com.edgesuite.net
-			- imgcache.qq.com
-
 	500:
 		misc.3g.qq.com
 		pushdata.qq.com
@@ -62,12 +58,10 @@
 		yanchu.qq.com
 		cgi.yanchu.qq.com
 
-	Redirect to http:
-		ac.qq.com
-
 	Mismatched:
 		^.qq.com
 		adsfile.qq.com      https://adsfile.qq.com/web/default0.swf
+		buy.qq.com
 		chuangshi.qq.com
 		img1.chuangshi.qq.com
 		sta1.chuangshi.qq.com
@@ -105,21 +99,13 @@
 		y.3g.qq.com
 		zc.qq.com           Akamai
 
-	Mixed content:
+	MCB:
 		1.qq.com
-		buy.qq.com           ᶜ
-		cb.qq.com            ᶜ   from imgcache.qq.com
-		act.daoju.qq.com     ᶜ   from ossweb-img.qq.com
-		daoju.qq.com         ᶜ ʲ from js01.daoju.qq.com
-		igame.qq.com             from i.igcdn.cn
-		qzs.qq.com           ᶜ ʲ
-		cdn.tencentgroup.qq.com
-		cache.tv.qq.com      ᶜ   from imgcache.qq.com & img1.gtimg.com
-		cache.v.qq.com       ᶜ
-		wetest.qq.com        ᶜ ʲ
-		y.qq.com             ᶜ
-	ᶜ Mixed css
-	ʲ Mixed js
+		cb.qq.com
+		daoju.qq.com
+		igame.qq.com
+		qzs.qq.com
+		cache.tv.qq.com
 
 	Insecure cookies are set for these domains and hosts:
 		- .qq.com
@@ -137,9 +123,9 @@
 		- .login.wx2.qq.com
 -->
 <ruleset name="QQ.com (partial)">
-	<target host="www.qq.com" />
 	<target host="3gimg.qq.com" />
 	<target host="3gqq.qq.com" />
+	<target host="ac.qq.com" />
 	<target host="m.ac.qq.com" />
 	<target host="aq.qq.com" />
 	<target host="js.aq.qq.com" />
@@ -150,6 +136,8 @@
 	<target host="browser.qq.com" />
 	<target host="btrace.qq.com" />
 	<target host="connect.qq.com" />
+	<target host="act.daoju.qq.com" />
+		<test url="http://act.daoju.qq.com/act/a20180629traders/index.htm" />
 	<target host="js01.daoju.qq.com" />
 	<target host="js02.daoju.qq.com" />
 	<target host="pcbrowser.dd.qq.com" />
@@ -159,6 +147,9 @@
 	<target host="exmail.qq.com" />
 	<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="service.exmail.qq.com" />
 	<target host="film.qq.com" />
 	<target host="fm.qq.com" />
@@ -260,6 +251,8 @@
 	<target host="qlogo4.store.qq.com" />
 	<target host="support.qq.com" />
 	<target host="tajs.qq.com" />
+	<target host="cdn.tencentgroup.qq.com" />
+		<test url="http://cdn.tencentgroup.qq.com/join_static/ext/20170905/" />
 	<target host="ugcbsy.qq.com" />
 	<target host="v.qq.com" />
 		<!--	Redirect to http	-->
@@ -295,8 +288,10 @@
 	<target host="vpdata.video.qq.com" />
 	<target host="vv.video.qq.com" />
 		<test url="http://vv.video.qq.com/getinfo?otype=json" />
+	<target host="vip.qq.com" />
 	<target host="weixin.qq.com" />
 	<target host="weread.qq.com" />
+	<target host="wetest.qq.com" />
 	<target host="cdn.wetest.qq.com" />
 	<target host="weixiao.qq.com" />
 	<target host="login.weixin.qq.com" />
@@ -326,7 +321,7 @@
 	<target host="m.y.qq.com" />
 	<target host="p.y.qq.com" />
 
-	<securecookie host="^\w" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>