Skip to content

Commit e87cf7e

Browse files
author
MB
committed
[Geocaching.com] Preempt redirection, split,* add coverage, add comments
* Fixes EFForg#1567
1 parent e1f98a7 commit e87cf7e

File tree

3 files changed

+93
-3
lines changed

3 files changed

+93
-3
lines changed

‎src/chrome/content/rules/Geocaching.com-falsemixed.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!--
2+
For rules that are on by default, see Geocaching.com.xml.
3+
4+
-->
5+
<ruleset name="Geocaching.com (false MCB)" platform="mixedcontent">
6+
7+
<!-- Direct rewrites:
8+
-->
9+
<target host="geocaching.com" />
10+
<target host="www.geocaching.com" />
11+
12+
<!-- Complications:
13+
-->
14+
<target host="blog.geocaching.com" />
15+
16+
17+
<securecookie host="^www\.geocaching\.com$" name=".+" />
18+
19+
20+
<!-- Redirect keeps path, args,
21+
and forward slash:
22+
-->
23+
<rule from="^http://blog\.geocaching\.com/"
24+
to="https://www.geocaching.com/blog/" />
25+
26+
<rule from="^http:"
27+
to="https:" />
28+
29+
</ruleset>

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

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
<!--
2+
For rules causing false/broken MCB, see Geocaching.com-falsemixed.xml.
3+
4+
5+
Problematic hosts in *geocaching.com:
6+
7+
- blog *
8+
9+
* 403
10+
11+
212
Fully covered hosts:
313
4-
- (www.)?
514
- img
615
- shop
716
@@ -11,8 +20,28 @@
1120
- shop.geocaching.com
1221
- www.geocaching.com
1322
23+
24+
Mixed content:
25+
26+
- Scripts, on:
27+
28+
- www from d3mo08i005h0zn.cloudfront.net *
29+
- www from s.gravatar.com *
30+
- www from s0.wp.com *
31+
32+
- css on www from d3mo08i005h0zn.cloudfront.net *
33+
- Images on www from d3mo08i005h0zn.cloudfront.net *
34+
35+
- Bugs, on:
36+
37+
- www from static.ak.fbcdn.net *
38+
- www from platform.twitter.com *
39+
- www from stats.wp.com
40+
41+
* Secured by us
42+
1443
-->
15-
<ruleset name="Geocaching.com">
44+
<ruleset name="Geocaching.com (partial)">
1645

1746
<!-- Direct rewrites:
1847
-->
@@ -21,14 +50,44 @@
2150
<target host="shop.geocaching.com" />
2251
<target host="www.geocaching.com" />
2352

53+
<!-- Complications:
54+
-->
55+
<!--target host="blog.geocaching.com" /-->
56+
57+
<!-- Avoid broken MCB:
58+
-->
59+
<exclusion pattern="^http://(?:www\.)?geocaching\.com/blog(?:$|[?/])" />
60+
61+
<test url="http://geocaching.com/blog" />
62+
<test url="http://geocaching.com/blog/" />
63+
<test url="http://www.geocaching.com/blog" />
64+
<test url="http://www.geocaching.com/blog/" />
65+
2466

2567
<!-- Not secured by server:
2668
-->
2769
<!--securecookie host="^www\.geocaching\.com$" name="^(__RequestVerificationToken|ASP\.NET_SessionId)$" /-->
2870
<!--securecookie host="^shop\.geocaching\.com$" name="^(CUSTOMER|CUSTOMER_AUTH|CUSTOMER_INFO|CUSTOMER_SEGMENT_IDS|NEWMESSAGE|frontend)$" /-->
2971

30-
<securecookie host="^(?:shop|www)\.geocaching\.com$" name=".+" />
72+
<securecookie host="^shop\.geocaching\.com$" name=".+" />
73+
74+
75+
<!-- Redirect keeps path, args,
76+
and forward slash:
77+
-->
78+
<!--rule from="^http://blog\.geocaching\.com/"
79+
to="https://www.geocaching.com/blog/" /-->
80+
81+
<!-- Redirects to http as-is:
82+
(drops args)
83+
-->
84+
<rule from="^http://www\.geocaching\.com/forums/default\.aspx(?:\?.*)?"
85+
to="https://forums.groundspeak.com/GC/" />
3186

87+
<test url="http://www.geocaching.com/forums/default.aspx" />
88+
<test url="http://www.geocaching.com/forums/default.aspx?" />
89+
<test url="http://www.geocaching.com/forums/default.aspx?f" />
90+
<test url="http://www.geocaching.com/forums/default.aspx?o" />
3291

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

‎utils/duplicate-whitelist.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ g33kinfo.com
8787
geek.com
8888
genivi.org
8989
gentoo-art.org
90+
geocaching.com
91+
www.geocaching.com
9092
getdigital-blog.de
9193
getdigital.de
9294
gigenet.com

0 commit comments

Comments
 (0)