Skip to content

Commit 275781e

Browse files
J0WIJ0WI
committed
Squashed commit of the following:
commit 7af0045 Merge: 38896cd ffdffee Author: jowi <sjw@gmx.ch> Date: Fri Jul 29 03:00:14 2016 +0200 Merge branch 'ancestry-patch' of https://github.com/fuglede/https-everywhere into fuglede-ancestry-patch commit ffdffee Author: Søren Fuglede Jørgensen <s@fuglede.dk> Date: Sun Jul 17 20:40:19 2016 +0200 [Custhelp.com] Remove subdomains See the parent commit for more details; basically, even with a bit of assistance, too many redirects were there for the tests to be happy about it. Since the ultimate target of those redirects could not be secured anyway, let us just remove the rules. commit 8c08ce6 Author: Søren Fuglede Jørgensen <s@fuglede.dk> Date: Sun Jul 17 20:26:17 2016 +0200 [Custhelp.com] Update targets This redirects directly to the target that the host itself redirects to through a middle-man, when accessed via http. Normally, we don't carry out the redirects for the sites, if we can instead upgrade to a secure connection directly (as the ruleset did previously), but in this case, the total amount of redirects were causing issues for the fetch tests (see EFForg#4747 (comment)), and since the initial redirect already bounced to a different domain, I figured this wasn't as bad an idea in this case, as it might be in others. commit 50ac266 Author: Søren Fuglede Jørgensen <s@fuglede.dk> Date: Sun Jun 26 14:39:05 2016 +0200 Merge submodule changes commit 77d8a84 Author: Søren Fuglede Jørgensen <s@fuglede.dk> Date: Sun Jun 26 14:30:16 2016 +0200 [Ancestry] Update ruleset This incorporates the notes on subdomains mentioned in EFForg#4747 (comment). It also removes the rule for secure.store.ancestry.com which currently times out. commit 4df85d4 Author: Søren Fuglede Jørgensen <s@fuglede.dk> Date: Sun Jun 26 14:32:48 2016 +0200 Remove Ancestry.xml from whitelist Conflicts: utils/ruleset-coverage-whitelist.txt commit 7b420ea Author: Søren Fuglede Jørgensen <s@fuglede.dk> Date: Wed May 11 22:46:43 2016 +0200 [Ancestry] Disable a few rules This should fix the issues mentioned in EFForg#4742 -- unfortunately, one of those requires a user login, but based on the input provided in that GH issue, simply taking out the CORS issue-causing domain should do the job.
1 parent 38896cd commit 275781e

3 files changed

Lines changed: 28 additions & 25 deletions

File tree

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,41 @@
99
- (www.)ancestry.co.uk *
1010
- (www.)ancestry.com *
1111
- blog.ancestry.com *
12+
- blogs.ancestry.com ¹
13+
- boards.ancestry.com *
14+
- community.ancestry.com *
15+
- home.ancestry.com *
16+
- rootsweb.ancestry.com *
17+
- search.ancestry.com *
18+
- trees.ancestry.com *
1219
1320
* Refused
21+
¹ Mismatch
1422
1523
1624
Problematic domains:
1725
18-
- c.ancestry.com (akamai)
19-
20-
21-
Fully covered domains:
22-
23-
- secure.ancestry.co.uk
24-
- c.ancestry.com (→ c.mfcreative.com)
25-
- c.mfcreative.com
26+
- c.ancestry.com (akamai)
27+
- corporate.ancestry.com (redirects to HTTP)
28+
- c.mfccreative.com (causes CORS issues)
2629
2730
-->
2831
<ruleset name="Ancestry.com (partial)">
2932

3033
<target host="secure.ancestry.co.uk" />
31-
<target host="*.ancestry.com" />
32-
<target host="c.mfcreative.com" />
34+
35+
<target host="health.ancestry.com" />
36+
<target host="help.ancestry.com" />
37+
<target host="dna.ancestry.com" />
38+
<target host="store.ancestry.com" />
39+
<target host="support.ancestry.com" />
3340

3441

3542
<securecookie host="^secure\.ancestry\.co\.uk$" name=".+" />
3643
<securecookie host="^dna\.ancestry\.com$" name=".+" />
3744

3845

39-
<rule from="^http://secure\.ancestry\.co\.uk/"
40-
to="https://secure.ancestry.co.uk/" />
41-
42-
<rule from="^http://dna\.ancestry\.com/"
43-
to="https://dna.ancestry.com/" />
44-
45-
<rule from="^http://(?:secure\.)?store\.ancestry\.com/"
46-
to="https://secure.store.ancestry.com/" />
47-
48-
<rule from="^http://c\.(?:ancestry|mfcreative)\.com/"
49-
to="https://c.mfcreative.com/" />
46+
<rule from="^http:"
47+
to="https:" />
5048

5149
</ruleset>

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,16 @@
3636
<exclusion pattern="^http://canoncanada\.custhelp\.com/" />
3737

3838
<test url="http://canoncanada.custhelp.com/" />
39-
39+
4040
<!-- Fix #4742 -->
4141
<exclusion pattern="^http://ancestryuk\.custhelp\.com/" />
42-
43-
<test url="http://ancestryuk.custhelp.com/" />
42+
43+
<test url="http://ancestryuk.custhelp.com/" />
44+
45+
<!-- Redirects through a number of sites which ultimately can not be secured. -->
46+
<exclusion pattern="^http://www\.custhelp\.com/" />
47+
48+
<test url="http://www.custhelp.com/" />
4449

4550
<!-- Mismatched (CN: forums.motorola.com)
4651

‎utils/ruleset-coverage-whitelist.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ b2552ff803ea1ca29d3c3daba9f91d398e812a34fd9649a64ed8541e240dbb2d Analytics.edge
349349
dd70debfd991bb22af84defbd2e2e138ffcb6833abc14c2306ca8a74884adc69 Analytics.edgesuite.net.xml
350350
e98e069b007f4adb9098eccd264fe472c4d5af95bbce86fdf03fe1e21c23a580 AnarchistNews.xml
351351
2441455388de9d12ccfad5c0b83035d8b47127291f9c06dbce841ec75db3a6fc ANB.xml
352-
d7016ce4b049d3bf0a5ab6b601b0189ed9c6f6c5d8392daf5486d022d632ae58 Ancestry.xml
352+
3defe75f544d17aade0f482f90ffc16077f9f3cf1b55df24b0fa71f3e65f8ec7 Anchor.xml
353353
7ac1cec22ddf2d592fc25f91c145bedf66894ec6ba6b369c9527b520b35e2711 AnchorFree.xml
354354
4b70b0b18a0bff5c2c2f9bcd770f000a9d9be1df8b1c33428a682fe11ec8d15f Ancud.de.xml
355355
4374b1d75194a0b7191a28cbb5363d9065e69ca23f46f8778a899e9e3c74a6e6 Andalucia_Property_Rentals.com.xml

0 commit comments

Comments
 (0)