Skip to content

Commit ce0fe58

Browse files
author
MB
committed
[DeviantArt.com] Add/update lots of comments, sort, add exclusions, add tests, update default_off
www & usernames still send a mismatched cert. Related: EFForg#2126
1 parent 0b957e2 commit ce0fe58

1 file changed

Lines changed: 51 additions & 9 deletions

File tree

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

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,69 @@
77
- Sta.sh.xml
88
99
10-
ToDo: Find edgecast URL for /(fc|th)\d+.
10+
Mixed content:
1111
12+
- Images, on:
13+
14+
- shop. ... .com from www.da-files.com ¹
15+
- *. ... .com from e.deviantart.net ²
16+
17+
¹ Unsecurable <= 404
18+
² Secured by us
1219
13-
Mixed content:
1420
15-
- Images on *.....com from e.deviantart.net *
21+
Note: A site operator previously asked for this rule to be
22+
disabled with the rationale of the site's https deployment
23+
not having been ready at that point.
1624
17-
* Secured by us
25+
We're waiting for:
26+
27+
- test (elements)
28+
- More feedback from ( https-e user ∪ da user ) testers
29+
- Statements from DA webmasters affirming that the site is ready
1830
1931
-->
20-
<ruleset name="DeviantArt (pending)" default_off="site operator says not ready yet">
32+
<ruleset name="DeviantArt (pending)" default_off="waiting for webmasters to indicate site is ready">
2133

2234
<target host="deviantart.com" />
2335
<target host="*.deviantart.com" />
2436
<target host="deviantart.net" />
2537
<target host="*.deviantart.net" />
2638

39+
<!-- Per https://github.com/EFForg/https-everywhere/pull/2861
40+
-->
41+
<exclusion pattern="^http://chat\.deviantart\.(?:com|net)/" />
42+
43+
<!-- +ve:
44+
-->
45+
<test url="http://chat.deviantart.com/" />
46+
<test url="http://chat.deviantart.net/" />
47+
48+
<!-- Mismatched, =/=> .com
49+
-->
50+
<exclusion pattern="^http://l\.deviantart\.net/" />
51+
52+
<!-- +ve:
53+
-->
54+
<test url="http://l.deviantart.net/" />
55+
56+
<!-- Direct rewrites (1st rule):
57+
-->
58+
<test url="http://27d.deviantart.com/" />
59+
<test url="http://chat.deviantart.com/" />
60+
<test url="http://l.deviantart.com/" />
61+
<test url="http://shop.deviantart.com/" />
62+
<test url="http://www.deviantart.com/" />
63+
64+
<!-- Complications (2nd rule):
65+
-->
66+
<test url="http://27d.deviantart.net/" />
67+
<test url="http://www.deviantart.net/" />
68+
2769

2870
<!-- Not secured by server:
2971
-->
30-
<!--securecookie host="^\.deviantart\.com$" name="^userinfo$" /-->
72+
<!--securecookie host="^\.deviantart\.com$" name="^(?:__qca|userinfo)$" /-->
3173

3274
<securecookie host="^\.deviantart\.com$" name=".*" />
3375

@@ -37,8 +79,8 @@
3779
<rule from="^http://([aei]|fc\d\d|img\d\d|orig\d\d|pre\d\d|s[ht]|th?\d\d)\.deviantart\.(com|net)/"
3880
to="https://$1.deviantart.$2/" />
3981

40-
<!-- This handles everything that isn't in the first rule.
41-
Namely, usernames, backend, fc, th, and (www.).
82+
<!-- This handles everything that isn't in the first rule and
83+
isn't excluded.
4284
These domains present a cert that is only
4385
valid for .com.
4486
Note that .net isn't used on DA, but.net does
@@ -50,6 +92,6 @@
5092
<rule from="^http://([^/:@.]+\.)?deviantart\.(?:com|net)/"
5193
to="https://$1deviantart.com/" />
5294

53-
<test url="http://27d.deviantart.com/" />
95+
5496

5597
</ruleset>

0 commit comments

Comments
 (0)