Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8b9ce1e
Update Sohu.com.xml
ivysrono Nov 13, 2016
a316195
Update Sohu.com.xml
ivysrono Nov 13, 2016
90d3786
Create Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
9e8dcbc
Update Sohu.com.xml
ivysrono Nov 13, 2016
2471c2e
Update Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
f3e1213
Update Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
09bc321
Update Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
350f0ac
Update Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
f10bf44
Update Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
303d6fc
Update Sohu.com.xml
ivysrono Nov 13, 2016
88c5d0d
Update Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
089f193
Update Sohu.com.xml
ivysrono Nov 13, 2016
54eb6b1
Update Sohu.com.xml
ivysrono Nov 13, 2016
bdc554c
Update Sohu.com.xml
ivysrono Nov 13, 2016
d740410
Update Sohu.com-mixcontent.xml
ivysrono Nov 13, 2016
16d5ec5
Update Sohu.com.xml
ivysrono Dec 9, 2016
ce56007
Update Sohu.com.xml
ivysrono Dec 9, 2016
7dac0f5
Update Sohu.com-mixcontent.xml
ivysrono Dec 9, 2016
c2a19c2
Update Sohu.com.xml
ivysrono Dec 9, 2016
cdb5427
Create Sohu.com.cn.xml
ivysrono Dec 10, 2016
14f2681
Update Sohu.com.xml
ivysrono Dec 10, 2016
922613b
Update Sohu.com-mixcontent.xml
ivysrono Dec 10, 2016
7f8f439
Update Sohu.com.xml
ivysrono Dec 12, 2016
d6fdfcf
Update Sohu.com.xml
ivysrono Dec 16, 2016
7c138f0
Update Sohu.com-mixcontent.xml
ivysrono Dec 16, 2016
7899fd9
Update Sohu.com.xml
ivysrono Dec 17, 2016
daeb4fd
Update Sohu.com.xml
ivysrono Dec 17, 2016
556548d
Update Sohu.com.xml
ivysrono Dec 28, 2016
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
86 changes: 86 additions & 0 deletions src/chrome/content/rules/Sohu.com-mixcontent.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<!--
Other Sohu rulesets:
- Sohu.com.xml
- Sohu.com.cn.xml
- Sohu.net.xml
-->

<ruleset name="Sohu.com-mixedcontent">

@youdly youdly Nov 13, 2016 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Repalce with <ruleset name="Sohu.com-mixedcontent" platform="mixedcontent">
See MCB section of ruleset guide.

@ivysrono ivysrono Nov 13, 2016 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.
All of these rules could be enabled by default.
They won't cause MCB.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that's the case, why not combine them into Sohu.com.xml.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too complicated


<target host="www.sohu.com" />
<exclusion pattern="^http://www\.sohu\.com/$" />
<rule from="^http://www\.sohu\.com/sohuflash_1\.js"
to="https://www.sohu.com/sohuflash_1.js" />
<rule from="^http://www\.sohu\.com/upload/"
to="https://www.sohu.com/upload/" />
<test url="http://www.sohu.com/sohuflash_1.js" />
<test url="http://www.sohu.com/upload/style/style150302.css" />
<test url="http://www.sohu.com/upload/images9_18/bg.png" />
<test url="http://www.sohu.com/upload/images20151228/bg01.gif" />
<test url="http://www.sohu.com/upload/images/server/icon08.jpg" />

<target host="ad.sohu.com" />
<exclusion pattern="^http://ad\.sohu\.com/$" />
<rule from="^http://ad\.sohu\.com/upload/"
to="https://ad.sohu.com/upload/" />
<test url="http://ad.sohu.com/upload/ad20120517/images/bg_nav.gif" />
<test url="http://ad.sohu.com/upload/ad20120521/images/new_283x36.jpg" />
<test url="http://ad.sohu.com/upload/373-355.swf" />

<target host="money.sohu.com" />
<exclusion pattern="^http://money\.sohu\.com/$" />
<rule from="^http://money\.sohu\.com/upload/"
to="https://money.sohu.com/upload/" />
<test url="http://money.sohu.com/upload/shcj/css/base.css" />
<test url="http://money.sohu.com/upload/money20151222/js/MDC_FocusImage.js" />

<target host="mt.sohu.com" />
<exclusion pattern="^http://mt\.sohu\.com/$" />
<rule from="^http://mt\.sohu\.com/upload/"
to="https://mt.sohu.com/upload/" />
<test url="http://mt.sohu.com/upload/20140718/css/index.css" />
<test url="http://mt.sohu.com/upload/list20140626/js/index.js" />

<target host="news.sohu.com" />
<exclusion pattern="^http://news\.sohu\.com/$" />
<rule from="^http://news\.sohu\.com/upload/"
to="https://news.sohu.com/upload/" />
<test url="http://news.sohu.com/upload/style.css" />
<test url="http://news.sohu.com/upload/images/pic09.jpg" />
<test url="http://news.sohu.com/upload/images/flash.swf" />

<target host="stock.sohu.com" />
<exclusion pattern="^http://stock\.sohu\.com/$" />
<rule from="^http://stock\.sohu\.com/upload/"
to="https://stock.sohu.com/upload/" />
<test url="http://stock.sohu.com/upload/stockindex2015/static/css/base.css" />
<test url="http://stock.sohu.com/upload/stockindex2015/static/images/stocklogo.gif" />
<test url="http://stock.sohu.com/upload/stockindex2015/static/images/ico.png" />

<target host="q.stock.sohu.com" />
<exclusion pattern="^http://q\.stock\.sohu\.com/$" />
<rule from="^http://q\.stock\.sohu\.com/app1/stockgroup\.up"
to="https://q.stock.sohu.com/app1/stockgroup.up" />
<test url="http://q.stock.sohu.com/app1/stockgroup.up" />

<target host="tv.sohu.com" />
<exclusion pattern="^http://tv\.sohu\.com/$" />
<rule from="^http://tv\.sohu\.com/([\w/-]+)\.(inc|jpg|js|png|swf)"
to="https://tv.sohu.com/$1.$2" />
<test url="http://tv.sohu.com/commonfrag/vrs_flashPlayer.inc" />
<test url="http://tv.sohu.com/upload/space/skin/imgs/avatar_s.jpg" />
<test url="http://tv.sohu.com/frag/vrs_inc/phb_variety_day_10_simple.js" />
<test url="http://tv.sohu.com/upload/Trace/wrating.js" />
<test url="http://tv.sohu.com/upload/static/global/skin/images/icon_merge.png" />
<test url="http://tv.sohu.com/upload/swf/20161102/Main.swf" />

<target host="push.my.tv.sohu.com" />
<exclusion pattern="^http://push\.my\.tv\.sohu\.com/$" />
<rule from="^http://push\.my\.tv\.sohu\.com/getwebpush_sohuHD\.globalNewPushTrigger\.json"
to="https://push.my.tv.sohu.com/getwebpush_sohuHD.globalNewPushTrigger.json" />
<rule from="^http://push\.my\.tv\.sohu\.com/user/a/fa/list\.do"
to="https://push.my.tv.sohu.com/user/a/fa/list.do" />
<test url="http://push.my.tv.sohu.com/getwebpush_sohuHD.globalNewPushTrigger.json" />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Judging from the ruleset test, I think you need to add one more link with .json.

<test url="http://push.my.tv.sohu.com/user/a/fa/list.do" />

</ruleset>
17 changes: 17 additions & 0 deletions src/chrome/content/rules/Sohu.com.cn.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!--
Other Sohu rulesets:
- Sohu.com.xml
- Sohu.com-mixcontent.xml
- Sohu.net.xml
-->

<ruleset name="Sohu.com.cn">
<target host="001.img.pu.sohu.com.cn" />
<target host="002.img.pu.sohu.com.cn" />
<target host="003.img.pu.sohu.com.cn" />
<target host="004.img.pu.sohu.com.cn" />
<target host="005.img.pu.sohu.com.cn" />
<test url="http://005.img.pu.sohu.com.cn/images/default.jpg" />

<rule from="^http:" to="https:" />
</ruleset>
123 changes: 68 additions & 55 deletions src/chrome/content/rules/Sohu.com.xml
Original file line number Diff line number Diff line change
@@ -1,90 +1,103 @@
<!--
Other Sohu rulesets:
- Sohu.com.cn.xml
- Sohu.com-mixcontent.xml
- Sohu.net.xml


Nonfunctional hosts in *sohu.com:
- add ¹
- app.auto ²
- mobile.auto ²
- club ¹
- dir ¹
- game ¹
- m ¹
- mirrors ³
- mp ¹
- scp ³
- quan ¹
- img.my.tv 401
- vip ⁴

¹ 404
² Shows default page
⁴ Shows mail.sohu.com


Problematic hosts in *sohu.com:
- ^ ¹
- book ²
- business ²
- corp ²
- css ¹
- cul ¹
- english ²
- help ²
- login.mail ²
- mgame ²
- money ²
- travel ²
- my.tv ²

¹ 404, preemptable redirect
² Mismatched


These altnames don't exist:
- portal.cs.sohu.com


Insecure cookies are set for these domains and hosts:
- .sohu.com
- mail.sohu.com
- passport.sohu.com
- pay.sohu.com
- sendcloud.sohu.com

Different http/https content:
- ^ (http redirect to www.sohu.com ; https redirect to pay.sohu.com )
- add.sohu.com (http redirect to fuwu.sohu.com ; https redirect to pay.sohu.com )
- app.auto.sohu.com
- dir.sohu.com (http redirect to 123.sogou.com ; https redirect to pay.sohu.com )
- fuwu.sohu.com
- txt.go.sohu.com ( https://txt.go.sohu.com/ip/soip )
- mp.sohu.com (https redirect to pay.sohu.com )
- quan.sohu.com (https redirect to pay.sohu.com )

MCB:
- 0502.sohu.com
- 2008.sohu.com
- ad.sohu.com
- auto.sohu.com
- db.auto.sohu.com
- book.sohu.com
- business.sohu.com
- corp.sohu.com
- cul.sohu.com
- fashion.sohu.com
- film.sohu.com
- game.sohu.com
- help.sohu.com
- mail.sohu.com
- mgame.sohu.com
- money.sohu.com
- mt.sohu.com
- news.sohu.com
- comment.news.sohu.com
- s.sohu.com
- stock.sohu.com
- q.stock.sohu.com
- travel.sohu.com
- tv.sohu.com
- my.tv.sohu.com https://my.tv.sohu.com/us/274383673/86733219.shtml
- push.my.tv.sohu.com
- www.sohu.com

Mismatched:
- 2se.sohu.com
- mobile.auto.sohu.com
- club.sohu.com
- login.mail.sohu.com

Redirect to http:
mirrors.sohu.com

Refused:
scp.sohu.com
ldd.sohu.com

Non-2xx HTTP code:
txt.go.sohu.com

Strange:
photocdn.sohu.com
OK:https://photocdn.sohu.com/20161111/Img472968305.jpeg
Broken:https://photocdn.sohu.com/20060930/Img227840979.swf

Insecure cookies are set for these domains and hosts:
- .sohu.com
- mail.sohu.com
- passport.sohu.com
- pay.sohu.com
- sendcloud.sohu.com
-->

<ruleset name="Sohu.com (partial)">

<target host="txt.go.sohu.com" />
<test url="http://txt.go.sohu.com/ip/soip" />
<target host="v.aty.sohu.com" />
<target host="vstat.v.blog.sohu.com" />
<target host="assets.changyan.sohu.com" />
<test url="http://assets.changyan.sohu.com/upload/changyan.js" />
<target host="css.sohu.com" />
<test url="http://css.sohu.com/upload/global1.4.1.css" />
<target host="english.sohu.com" />
<target host="pl.hd.sohu.com" />
<test url="http://pl.hd.sohu.com/videolist?playlistid=9174927" />
<target host="images.sohu.com" />
<test url="http://images.sohu.com/bill/s2015/yanchunzhang/richan/logo.png" />
<target host="js.sohu.com" />
<target host="m.sohu.com" />
<target host="mail.sohu.com" />
<target host="passport.sohu.com" />
<target host="pay.sohu.com" />
<target host="pv.sohu.com" />
<target host="sendcloud.sohu.com" />
<target host="m.tv.sohu.com" />
<target host="ushq.stock.sohu.com" />
<target host="vip.sohu.com" />
<target host="count.vrs.sohu.com" />
<test url="http://count.vrs.sohu.com/count/query.action" />

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

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

</ruleset>