Skip to content

Commit bb294fd

Browse files
injustJ0WI
authored andcommitted
Update rulesets: NYDailyNews (EFForg#15429)
* Add custom rule for root domain * Remove www because of active mixed content * Replace wildcard with explicitly listed targets * Add working targets - beta.nydailynews.com - m.nydailynews.com * Update nonfunctional subdomains * Add more nonfunctional domains * Specify port 8443 for webport1.nydailynews.com * Fix errors - classifiedads: Times out on both HTTP and HTTPS - homedelivery: Self-signed cert - webport1 (:8443): Missing intermediate cert * Add target: placeanad.nydailynews.com * No longer used: classifieds.nydailynews.com/resource/ * Add target: myaccount2 * Remove static\d.nydailynews.com * Move Cloudfront target to Cloudfront.xml * Add rule to Cloudfront.xml * Fix server errors on www * Fix test URLs * Fix tests properly * Update comment for assets.nydailynews.com * Fix exclusion * Removal targets failing tests * Remove comments
1 parent f0e0f5a commit bb294fd

File tree

3 files changed

+38
-49
lines changed

3 files changed

+38
-49
lines changed

src/chrome/content/rules/Cloudfront.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
<test url="http://d1ej19d7kwigfi.cloudfront.net/" />
99
<test url="http://d1h9a8s8eodvjz.cloudfront.net/" />
1010

11+
<!-- from NYDailyNews.xml, used on classifieds.nydailynews.com -->
12+
<test url="http://dmpwow64jb5ov.cloudfront.net/resource/stylesheet/6d3a9c8bc9ebafc0bba40e52c5b86008/fef8e26fba7270d13c02bac0af00ec9d.css" />
13+
<test url="http://dmpwow64jb5ov.cloudfront.net/resource/javascript/6d3a9c8bc9ebafc0bba40e52c5b86008/0b13a3fc2c3955f1d27992bc6458d8a0.js" />
14+
1115
<!--test url="http://d1o1wlqwda3y1b.cloudfront.net/A-NAL/CNVNAL-35096_31457369972thmb.jpg" /-->
1216
<!--test url="http://d1uc3ft0n4nkav.cloudfront.net/images/gradient_bg.png" /-->
1317
<!--test url="http://d235bdyk0zpoq6.cloudfront.net/assets/vibratissimo.jpg" /-->
Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
<!--
22
For rules not causing false/broken MCB, see NYDailyNews.xml.
3+
4+
Server error:
5+
- nydailynews.com/(autos|horoscopes)
6+
7+
SSL error:
8+
- nydailynews.com, equivalent to www.nydailynews.com
39
-->
10+
411
<ruleset name="NYDailyNews (false MCB)" platform="mixedcontent">
512

613
<target host="nydailynews.com" />
714
<target host="www.nydailynews.com" />
815

16+
<rule from="^http://nydailynews\.com/"
17+
to="https://www.nydailynews.com/" />
18+
19+
<exclusion pattern="^http://www\.nydailynews\.com/(autos|horoscopes)" />
20+
<test url="http://www.nydailynews.com/autos" />
21+
<test url="http://www.nydailynews.com/autos/" />
22+
<test url="http://www.nydailynews.com/horoscopes" />
923

10-
<rule from="^http:"
11-
to="https:" />
24+
<rule from="^http:" to="https:" />
1225

1326
</ruleset>
Lines changed: 19 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://nydailynews.com/ => http://nydailynews.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
42
For rules causing false/broken MCB, see NYDailyNews.com-falsemixed.xml.
53
64
@@ -15,33 +13,26 @@ Fetch error: http://nydailynews.com/ => http://nydailynews.com/: (60, 'SSL certi
1513
- .hs. doesn't exist
1614
- assets
1715
- multimedia
18-
- static[123]
1916
2017
2118
Nonfunctional subdomains:
2219
23-
- assets ²
20+
- assets: Invalid certificate. Also causes CORS problem, see https://github.com/EFForg/https-everywhere/pull/11514
21+
- classifieds: Works; mismatched, CN: *.adperfect.com
22+
- creative.nydailynews.com: Works; mismatched, CN: *.creatavist.com
23+
- games.nydailynews.com: Timed out
24+
- homedelivery.nydailynews.com: Self-signed certificate
25+
- interactive.nydailynews.com: 500; mismatched, CN: a248.e.akamai.net
26+
- live.nydailynews.com: Works; mismatched, CN: *.scribblelive.com
27+
- liveblog.nydailynews.com: Works; mismatched, CN: *.scribblelive.com
28+
- local.nydailynews.com: Works; mismatched, CN: *.localedge.com
29+
- m: Invalid certificate
2430
- multimedia *
31+
- obituaries: 400; mismatched, CN: *.legacy.com
32+
- video: Works; mismatched, CN: *.newsinc.com
33+
- webport1.nydailynews.com:8443: Chain issue (missing intermediate certificate)
2534
26-
* 400; mismatched, CN: *.hs.llnwd.net
27-
² redirects to www and causes CORS problem, see https://github.com/EFForg/https-everywhere/pull/11514
28-
29-
30-
Problematic subdomains:
31-
32-
- classifieds ²
33-
- static[123] *
34-
35-
* 400; mismatched, CN: *.hs.llnwd.net
36-
² Works; mismatched, CN: *.adperfect.com
37-
38-
39-
Fully covered subdomains:
40-
41-
- homedelivery
42-
- webport
43-
- webport...:8443
44-
- webport1...:8443
35+
* 400; mismatched, CN: a248.e.akamai.net
4536
4637
4738
Mixed content:
@@ -55,10 +46,6 @@ Fetch error: http://nydailynews.com/ => http://nydailynews.com/: (60, 'SSL certi
5546
5647
- classifieds from *.cloudfront.net *
5748
58-
Mixed image on www from multimedia
59-
60-
- www from static[123] *
61-
6249
6350
Web bugs, on www from:
6451
@@ -70,29 +57,14 @@ Fetch error: http://nydailynews.com/ => http://nydailynews.com/: (60, 'SSL certi
7057
- i.simpli.fi *
7158
7259
* Secured by us
73-
7460
-->
75-
<ruleset name="NYDailyNews (partial)">
76-
77-
<target host="nydailynews.com" />
78-
<target host="*.nydailynews.com" />
79-
<!--
80-
Avoid false/broken MCB:
81-
-->
82-
<exclusion pattern="^http://classifieds\.nydailynews\.com/+(?!resource/)"/>
83-
<exclusion pattern="^http://www\.nydailynews\.com/+(?!cmlink/|nydn/|polopoly_fs/)" />
8461

62+
<ruleset name="NYDailyNews (partial)">
63+
<target host="beta.nydailynews.com" />
64+
<target host="myaccount2.nydailynews.com" />
65+
<target host="placeanad.nydailynews.com" />
8566

8667
<securecookie host="^[^@:/]*\.nydailynews\.com$" name=".+" />
8768

88-
89-
<rule from="^http://(?:static\d|www)\.nydailynews\.com/"
90-
to="https://www.nydailynews.com/" />
91-
92-
<rule from="^http://(classifiedads|homedelivery|webport1?)\.nydailynews\.com(:8443)?/"
93-
to="https://$1.nydailynews.com$2/" />
94-
95-
<rule from="^http://classifieds\.nydailynews\.com/resource/"
96-
to="https://casmp.adperfect.com/resource/" />
97-
69+
<rule from="^http:" to="https:" />
9870
</ruleset>

0 commit comments

Comments
 (0)