Skip to content
This repository has been archived by the owner on Nov 6, 2023. It is now read-only.

Update Sinaimg.cn.xml #14972

Merged
merged 7 commits into from
Apr 6, 2018
Merged
Changes from 4 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
49 changes: 29 additions & 20 deletions src/chrome/content/rules/Sinaimg.cn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@

Invalid certificate:
u1.sinaimg.cn.cdngc.net
www.sinaimg.cn ( Uses Akamai outside the Chinese GFW, something else inside the GFW that doesn't get a mismatch. )
Copy link
Collaborator

Choose a reason for hiding this comment

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

I tested https://www.sinaimg.cn/cj/pc/2007-10-19/32/U453P31T32D36393F1538DT20071019102225.pdf through an US-CA tunnel and it seems to be working. I suppose Sinaimg.cn.xml can be updated accordingly.

gongyi.sinaimg.cn
henan.sinaimg.cn https://henan.sinaimg.cn/16/2010/0604/U4314P827T16D8548F242DT20100604175637.jpg
jiangxi.sinaimg.cn https://jiangxi.sinaimg.cn/2013/0619/S92318T1371614052459.pdf
sh.sinaimg.cn https://sh.sinaimg.cn/2014/0819/IsSh.js
r[1-4].sinaimg.cn https://r1.sinaimg.cn/201512/000/000/aHR0cDovL21tYml6LnFwaWMuY24vbW1iaXovT3VwQW81cVd0aWNMTUdpY0podWNJMnpmUXd3eEZFRGhGQ2Q2WlNuR25SRmRCZERqNlJQN1Nha3U1UHdGRlZXbWRDS09kajRKZXU2eG03YXZ4VDNlMW4xZy8wP3d4X2ZtdD1qcGVnK2h0dHA6Ly9tcC53ZWl4aW4ucXEuY29tL3M/X19iaXo9TXpBM01UY3dPREEwTnc9PSZtaWQ9NDAyMzI2OTk0JmlkeD0xJnNuPTE4OWZjZTkwZGE5YmU5MGNjODk1ZDJlOGQ4OTM3N2Ex.jpg
www.sinaimg.cn ( Uses Akamai outside the Chinese GFW, something else inside the GFW that doesn't get a mismatch. )
s[1-16].sinaimg.cn ( Some IPs may be mismatched. Equal to ss[1-16].sinaimg.cn )
-->
<ruleset name="Sinaimg.cn">
<!-- Directly: -->
<target host="wwws.sinaimg.cn" />
<target host="jiangxi.sinaimg.cn" />
<target host="sh.sinaimg.cn" />

<target host="d0.sinaimg.cn" />
<target host="d1.sinaimg.cn" />
<target host="d2.sinaimg.cn" />
Expand Down Expand Up @@ -59,22 +61,6 @@
<target host="portrait6.sinaimg.cn" />
<target host="portrait7.sinaimg.cn" />
<target host="portrait8.sinaimg.cn" />
<target host="s1.sinaimg.cn" />
<target host="s2.sinaimg.cn" />
<target host="s3.sinaimg.cn" />
<target host="s4.sinaimg.cn" />
<target host="s5.sinaimg.cn" />
<target host="s6.sinaimg.cn" />
<target host="s7.sinaimg.cn" />
<target host="s8.sinaimg.cn" />
<target host="s9.sinaimg.cn" />
<target host="s10.sinaimg.cn" />
<target host="s11.sinaimg.cn" />
<target host="s12.sinaimg.cn" />
<target host="s13.sinaimg.cn" />
<target host="s14.sinaimg.cn" />
<target host="s15.sinaimg.cn" />
<target host="s16.sinaimg.cn" />
<target host="ss1.sinaimg.cn" />
<target host="ss2.sinaimg.cn" />
<target host="ss3.sinaimg.cn" />
Expand Down Expand Up @@ -130,6 +116,8 @@
<target host="z8.sinaimg.cn" />
<target host="z9.sinaimg.cn" />

<test url="http://jiangxi.sinaimg.cn/2013/0619/S92318T1371614052459.pdf" />
<test url="http://sh.sinaimg.cn/2014/0819/IsSh.js" />
<test url="http://d0.sinaimg.cn/pfpghc/a0e6ccaf907445459a70b275444894a9.jpg" />
<test url="http://h5.sinaimg.cn/m/videoPlayer/js/app.c7e9c480.js" />
<test url="http://i0.sinaimg.cn/cha/images/c.gif" />
Expand All @@ -144,7 +132,6 @@
<test url="http://ns.sinaimg.cn/news/transform/20160504/mHkI-fxrtztc3215730.jpg" />
<test url="http://p1.sinaimg.cn/1679869477/180/94201408034020" />
<test url="http://portrait1.sinaimg.cn/6004496926/blog/50" />
<test url="http://s1.sinaimg.cn/orignal/001PGyMZzy6LeICm9HHe9" />
<test url="http://ss1.sinaimg.cn/orignal/001O7HQgzy6M5no8anw7a" />
<test url="http://tp1.sinaimg.cn/5554103544/180/0/1" />
<test url="http://tva1.sinaimg.cn/crop.0.0.798.798.180/6462d00fgw1egno4hgy6wj20m80m8mxn.jpg" />
Expand All @@ -162,5 +149,27 @@
<rule from="^http://www\.sinaimg\.cn/" to="https://wwws.sinaimg.cn/" />
<test url="http://www.sinaimg.cn/dy/weather/main/w2015/wt_switch2.png" />

<target host="s1.sinaimg.cn" />
<target host="s2.sinaimg.cn" />
<target host="s3.sinaimg.cn" />
<target host="s4.sinaimg.cn" />
<target host="s5.sinaimg.cn" />
<target host="s6.sinaimg.cn" />
<target host="s7.sinaimg.cn" />
<target host="s8.sinaimg.cn" />
<target host="s9.sinaimg.cn" />
<target host="s10.sinaimg.cn" />
<target host="s11.sinaimg.cn" />
<target host="s12.sinaimg.cn" />
<target host="s13.sinaimg.cn" />
<target host="s14.sinaimg.cn" />
<target host="s15.sinaimg.cn" />
<target host="s16.sinaimg.cn" />

<rule from="^http://s(\d(\d)?)\.sinaimg\.cn/" to="https://ss$1.sinaimg.cn/" />
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can (\d(\d)? be simplified to (\d+)?

<test url="http://s1.sinaimg.cn/orignal/001PGyMZzy6LeICm9HHe9" />
<test url="http://s2.sinaimg.cn/mw690/0042rM3Xzy6HBCst4Um8e" />
<test url="http://s16.sinaimg.cn/middle/4cd04747nb1d3a3b7637d" />

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