Skip to content

Commit ba5fd58

Browse files
irykoonirykoon
committed
Merge remote-tracking branch 'upstream/master'
2 parents eb826a7 + a8ee7ae commit ba5fd58

16 files changed

+227
-365
lines changed

‎src/chrome/content/rules/Bitly.com.xml‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,23 @@
11
<!--
22
For other Bitly coverage, see Bitly.xml.
33
4+
Refused:
5+
api.bitly.com
46
5-
Nonfunctional domains:
6-
7-
- dev.bitly.com ¹
8-
- word.bitly.com ²
9-
- api.bitly.com ³
10-
11-
¹ Refused
12-
² Tumblr
13-
³ Dropped
14-
15-
16-
Problematic domains:
17-
18-
- support.bitly.com ¹
19-
- www.bitly.com ²
20-
21-
¹ Mismatched
22-
² Reset
23-
24-
25-
Insecure cookies are set for these hosts:
26-
27-
- bitly.com
7+
Invalid certificate:
8+
word.bitly.com
289
2910
-->
3011
<ruleset name="Bitly.com (partial)">
3112

32-
<!-- Direct rewrites:
33-
-->
3413
<target host="bitly.com" />
35-
<target host="platform.bitly.com" />
36-
37-
<!-- Complications:
38-
-->
3914
<target host="www.bitly.com" />
40-
41-
42-
<!-- Not secured by server:
43-
-->
44-
<!--securecookie host="^bitly\.com$" name="^(_xsrf|anon_u)$" /-->
15+
<target host="dev.bitly.com" />
16+
<target host="platform.bitly.com" />
17+
<target host="support.bitly.com" />
4518

4619
<securecookie host="^bitly\.com$" name=".+" />
4720

48-
49-
<rule from="^http://www\.bitly\.com/"
50-
to="https://bitly.com/" />
51-
5221
<rule from="^http:"
5322
to="https:" />
5423

‎src/chrome/content/rules/Disqus.xml‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,42 @@
11
<!--
22
Commenting system used by several large sites.
3-
4-
Subdomains like SITENAME.disqus.com aren't covered in this ruleset.
5-
Probably some other subdomains aren't covered either.
3+
64
-->
7-
<ruleset name="Disqus (partial)">
5+
<ruleset name="Disqus">
86

97
<target host="disqus.com" />
10-
<target host="www.disqus.com" />
11-
<target host="alternativeto-blog.disqus.com" />
12-
<target host="blog.disqus.com" />
13-
<target host="chenyufei.disqus.com" />
14-
<target host="community.disqus.com" />
15-
<target host="go.disqus.com" />
16-
<target host="help.disqus.com" />
17-
<target host="jbosstools.disqus.com" />
18-
<target host="nytchinese.disqus.com" />
19-
<target host="redirect.disqus.com" />
20-
<target host="refferer.disqus.com" />
21-
<target host="secure.disqus.com" />
22-
23-
<target host="realtime.services.disqus.com" />
24-
<target host="juggler.services.disqus.com" />
25-
<target host="extract.services.disqus.com" />
26-
<target host="sentry.services.disqus.com" />
8+
<!-- Each customer has its own subdomain. STS header includes subdomains -->
9+
<target host="*.disqus.com" />
10+
<test url="http://www.disqus.com/" />
11+
<test url="http://alternativeto-blog.disqus.com/" />
12+
<test url="http://blog.disqus.com/" />
13+
<test url="http://chenyufei.disqus.com/" />
14+
<test url="http://community.disqus.com/" />
15+
<test url="http://go.disqus.com/" />
16+
<test url="http://help.disqus.com/" />
17+
<test url="http://jbosstools.disqus.com/" />
18+
<test url="http://nytchinese.disqus.com/" />
19+
<test url="http://redirect.disqus.com/" />
20+
<test url="http://refferer.disqus.com/" />
21+
<test url="http://secure.disqus.com/" />
22+
<test url="http://realtime.services.disqus.com/" />
23+
<test url="http://juggler.services.disqus.com/" />
24+
<test url="http://extract.services.disqus.com/" />
25+
<test url="http://sentry.services.disqus.com/" />
2726

2827
<target host="a.disquscdn.com" />
28+
<test url="http://c.disquscdn.com/next/embed/styles/lounge.b6e30194f7733461731644bd3f145d25.css" />
29+
<target host="c.disquscdn.com" />
30+
<test url="http://c.disquscdn.com/next/embed/styles/lounge.b6e30194f7733461731644bd3f145d25.css" />
31+
<target host="imagerator.disquscdn.com" />
2932
<target host="media.disquscdn.com" />
33+
<test url="http://media.disquscdn.com/channel-docs/Mod_Playbook.pdf" />
34+
<target host="uploads.disquscdn.com" />
35+
<test url="http://uploads.disquscdn.com/images/b142d2c778d1939e4c0555edece4ee74eb3f18b8b9a63648623f9fa5bdf9f2fa.jpg" />
3036

3137
<target host="disq.us" />
3238

33-
<securecookie host="^(\.)?disqus\.com$" name=".+" />
39+
<securecookie host="^disqus\.com$" name=".+" />
3440

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

‎src/chrome/content/rules/FacebookCoreWWWi.onion.xml‎

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,23 @@
1-
21
<!--
3-
42
For other Facebook coverage, see Facebook.xml.
53
64
This ruleset covers Facebook hidden services on Tor.
75
8-
9-
Fully covered hosts:
10-
11-
- facebookcorewwwi.onion
12-
13-
- *.facebookcorewwwi.onion:
14-
15-
- (www.)?
16-
- ar-ar
17-
- de-de
18-
- developers
19-
- es-la
20-
- fr-fr
21-
- hi-in
22-
- it-it
23-
- ja-jp
24-
- pt-br
25-
- m
26-
- zh-cn
27-
28-
- in *fbcdn23dssr3jqnq.onion:
29-
30-
- ^
31-
- scontent.xx
32-
33-
- fbsbx2q4mvcl63pw.onion
34-
35-
36-
Insecure cookies are set for these domains:
37-
38-
- .facebookcorewwwi.onion
39-
406
-->
417
<ruleset name="Facebook Hidden Service">
428

43-
<!-- Direct rewrites:
44-
-->
459
<target host="facebookcorewwwi.onion" />
4610
<target host="*.facebookcorewwwi.onion" />
4711

4812
<test url="http://developers.facebookcorewwwi.onion/" />
4913
<test url="http://m.facebookcorewwwi.onion/" />
5014
<test url="http://www.facebookcorewwwi.onion/" />
5115

52-
<target host="scontent.xx.fbcdn23dssr3jqnq.onion" />
53-
16+
<target host="*.xx.fbcdn23dssr3jqnq.onion" />
5417

55-
<!-- Not secured by server:
56-
-->
57-
<!--securecookie host="^\.facebookcorewwwi\.onion$" name="^(datr|noscript|reg_ext_ref|reg_fb_gate|reg_fb_ref)$" /-->
18+
<test url="http://static.xx.fbcdn23dssr3jqnq.onion/rsrc.php/v3/yw/l/0,cross/BiATacNWkhp.css" />
19+
<test url="http://scontent.xx.fbcdn23dssr3jqnq.onion/v/t39.2365-6/851585_216271631855613_2121533625_n.png?oh=7a437b0bae2ba8efc157cf6564ce1440&amp;oe=5ADC6020" />
20+
<test url="http://external-lht6-1.xx.fbcdn23dssr3jqnq.onion/safe_image.php" />
5821

5922
<securecookie host=".+" name=".+" />
6023

‎src/chrome/content/rules/Freetz.org.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
Invalid certificate:
3+
- svn.freetz.org
4+
- trac.freetz.org
5+
-->
6+
<ruleset name="Freetz.org">
7+
<target host="freetz.org" />
8+
<target host="www.freetz.org" />
9+
<target host="trac.freetz.org" />
10+
11+
<rule from="^http://trac\.freetz\.org/" to="https://freetz.org/" />
12+
13+
<rule from="^http:" to="https:" />
14+
</ruleset>

‎src/chrome/content/rules/LackName.org.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ruleset name="LackName.org">
2+
3+
<target host="lackname.org" />
4+
5+
<rule from="^http:" to="https:" />
6+
7+
</ruleset>

‎src/chrome/content/rules/National_Geographic.com-problematic.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/chrome/content/rules/National_Geographic.com.xml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<!--
2+
CDN buckets:
3+
- nationalgeographic.desk.com
4+
- natgeo.edgeboss.net
5+
- dotcom-media.nationalgeographic.com.edgesuite.net
6+
- a1843.g1.akamai.net
7+
- images.nationalgeographic.com.edgesuite.net
8+
- a1621.g.akamai.net
9+
- kids.nationalgeographic.com.edgesuite.net
10+
- a1966.b.akamai.net
11+
- news.nationalgeographic.com.edgesuite.net
12+
- a1420.g.akamai.net
13+
- t.p.mybuys.com/clients/NATIONALGEOGRAPHIC/
14+
- s7d2.scene7.com/is/image/NationalGeographic/
15+
16+
Redirects to HTTP:
17+
- channel
18+
- media-channel (Redirects to channel)
19+
- tvblogs (Redirects to channel)
20+
21+
Invalid certificate:
22+
- adventureblog
23+
- environment
24+
- help
25+
- metric
26+
- newswatch
27+
- ngm
28+
- photography
29+
- travel
30+
- yourshotblog
31+
32+
502 proxy error:
33+
- images
34+
35+
Mixed content:
36+
- archive (Example: https://archive.nationalgeographic.com/?iid=133596#folio=CV1)
37+
- news
38+
- Images, from:
39+
- avatars.fyre.co *
40+
- zor.fyre.co *
41+
- Ads/web bugs, from:
42+
- b.comcardresearch.com *
43+
- loadus.exelator.com *
44+
- cdn.gigya.com *
45+
- www.googleadservices.com *
46+
* Secured by us
47+
48+
No working URL known:
49+
- media-yourshot
50+
51+
Time out:
52+
- nationalgeographic.com *
53+
54+
* Standard rule times out over HTTPS, new rule redirects to https://www.nationalgeographic.com/
55+
56+
-->
57+
<ruleset name="National Geographic">
58+
59+
<target host="nationalgeographic.com" />
60+
<target host="www.nationalgeographic.com" />
61+
<target host="digitalnomad.nationalgeographic.com" />
62+
<target host="events.nationalgeographic.com" />
63+
<target host="genographic.nationalgeographic.com" />
64+
<target host="intelligenttravel.nationalgeographic.com" />
65+
<target host="kids.nationalgeographic.com" />
66+
<target host="media-members.nationalgeographic.com" />
67+
<test url="http://media-members.nationalgeographic.com/static-media/img/favicon.ico" />
68+
<target host="media-mmdb.nationalgeographic.com" />
69+
<test url="http://media-mmdb.nationalgeographic.com/static-media/img/favicon.ico" />
70+
<target host="members.nationalgeographic.com" />
71+
<target host="metrics.nationalgeographic.com" />
72+
<target host="mmdb.nationalgeographic.com" />
73+
<target host="mshop.nationalgeographic.com" />
74+
<target host="news.nationalgeographic.com" />
75+
<target host="press.nationalgeographic.com" />
76+
<target host="shop.nationalgeographic.com" />
77+
<target host="video.nationalgeographic.com" />
78+
79+
<!-- Tracking cookies:
80+
-->
81+
<securecookie host="^\.nationalgeographic\.com$" name="^(gpv_p\d+|s_\w+|__utm)?\w$" />
82+
83+
<rule from="^http://nationalgeographic\.com/"
84+
to="https://www.nationalgeographic.com/" />
85+
86+
<rule from="^http:"
87+
to="https:" />
88+
89+
</ruleset>

0 commit comments

Comments
 (0)