Skip to content

Commit fe0607e

Browse files
bardiharborowJ0WI
bardiharborow
authored and
J0WI
committed
[Wolfram.com] Update rulesets. (EFForg#12386)
1 parent 13e6ecb commit fe0607e

File tree

5 files changed

+140
-54
lines changed

5 files changed

+140
-54
lines changed

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,38 @@
11
<!--
2-
Other Wolfram Research rulesets:
2+
For other Wolfram Research coverage:
33
44
- Wolfram_Alpha.xml
55
- Wolfram_CDN.com.xml
6+
- Wolframcloud.com.xml
67
8+
Problematic hosts in *wolfram.com:
79
8-
Nonfunctional subdomains:
10+
- challenges ᵐ
11+
- datarepository ᵐ
12+
- mvid ᵐ
13+
- open.exploration ᵐ
14+
- open.sandbox ᵐ
15+
- streamingmedia (timeout)
916
10-
- support (times out)
17+
ᵐ Mismatched
1118
1219
-->
13-
<ruleset name="Wolfram.com (partial) ">
20+
<ruleset name="Wolfram (partial)">
1421

1522
<target host="wolfram.com" />
16-
<target host="*.wolfram.com" />
23+
<target host="www.wolfram.com" />
24+
<target host="account.wolfram.com" />
25+
<target host="amoeba.wolfram.com" />
26+
<target host="billing.wolfram.com" />
27+
<target host="calendar.wolfram.com" />
28+
<target host="community.wolfram.com" />
29+
<target host="education.wolfram.com" />
30+
<target host="reference.wolfram.com" />
31+
<target host="user.wolfram.com" />
1732

18-
19-
<!--securecookie host="^\.wolfram\.com$" name="^WR_SID$" /-->
2033
<securecookie host="^user\.wolfram\.com$" name=".+" />
2134

22-
23-
<rule from="^http://(?:www\.)?wolfram\.com/"
24-
to="https://www.wolfram.com/" />
25-
26-
<rule from="^http://user\.wolfram\.com/"
27-
to="https://user.wolfram.com/" />
28-
29-
<rule from="^http://reference\.wolfram\.com/"
30-
to="https://reference.wolfram.com/" />
35+
<rule from="^http:"
36+
to="https:" />
3137

3238
</ruleset>

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

Lines changed: 71 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,79 @@
11
<!--
2-
Invalid certificate:
3-
api-cn.wolframalpha.com
4-
api-maps.wolframalpha.com
5-
api-tw.wolframalpha.com
6-
dev1.cvs.wolframalpha.com
7-
dev2.cvs.wolframalpha.com
8-
reg.cvs.wolframalpha.com
9-
sit.cvs.wolframalpha.com
10-
cvsrx.wolframalpha.com
11-
cvsrx.devel.wolframalpha.com
12-
www-cn.wolframalpha.com
13-
www-tw.wolframalpha.com
14-
volunteer.wolframalpha.com
15-
16-
Refused:
17-
community.wolframalpha.com
18-
19-
Timeout:
20-
blog.wolframalpha.com
21-
nba.devel.wolframalpha.com
22-
homeworkday.wolframalpha.com
23-
www2.wolframalpha.com
2+
For other Wolfram Research coverage:
3+
4+
- Wolfram.com.xml
5+
- Wolfram_CDN.com.xml
6+
- Wolframcloud.com.xml
7+
8+
Refused hosts:
9+
10+
- api-cn
11+
- api-maps
12+
- api-tw
13+
- blog
14+
- citi
15+
- community
16+
- www[0-9][0-9]
17+
18+
SHA-1 certificate hosts:
19+
20+
- cvsrx
21+
- nielsen
22+
- volunteer
23+
- www-cn
24+
- www-tw
25+
26+
Timed out hosts:
27+
28+
- ^
29+
- homeworkday
30+
31+
Mismatched hosts:
32+
33+
- cvsrx.devel
34+
2435
-->
2536
<ruleset name="Wolfram Alpha">
37+
38+
<target host="wolframalpha.com" />
2639
<target host="*.wolframalpha.com" />
40+
41+
<test url="http://api.wolframalpha.com/" />
42+
<test url="http://api-cn.wolframalpha.com/" />
43+
<test url="http://api-maps.wolframalpha.com/" />
44+
<test url="http://api-tw.wolframalpha.com/" />
45+
<test url="http://developer.wolframalpha.com/" />
46+
<test url="http://m.wolframalpha.com/" />
47+
<test url="http://preview.wolframalpha.com/" />
48+
<test url="http://products.wolframalpha.com/" />
49+
<test url="http://volunteer.wolframalpha.com/" />
50+
<test url="http://wc.wolframalpha.com/" />
51+
<test url="http://www.wolframalpha.com/" />
52+
<test url="http://www1.wolframalpha.com/" />
2753
<test url="http://www10.wolframalpha.com/" />
2854
<test url="http://www20.wolframalpha.com/" />
55+
<test url="http://www3.wolframalpha.com/" />
56+
<test url="http://www30.wolframalpha.com/" />
57+
<test url="http://www4b.wolframalpha.com/" />
58+
<test url="http://www4c.wolframalpha.com/" />
59+
<test url="http://www4d.wolframalpha.com/" />
60+
<test url="http://www4f.wolframalpha.com/" />
61+
<test url="http://www5a.wolframalpha.com/" />
62+
<test url="http://www5b.wolframalpha.com/" />
63+
64+
<rule from="^http://wolframalpha\.com/"
65+
to="https://www.wolframalpha.com/" />
66+
67+
<rule from="^http://api-(cn|maps|tw)\.wolframalpha\.com/"
68+
to="https://www.wolframalpha.com/" />
69+
70+
<rule from="^http://volunteer\.wolframalpha\.com/"
71+
to="https://www.wolframalpha.com/" />
72+
73+
<rule from="^http://www[0-9]?[0-9a-z]?\.wolframalpha\.com/"
74+
to="https://www.wolframalpha.com/" />
75+
76+
<rule from="^http://(api|developer|m|preview|products|wc)\.wolframalpha\.com/"
77+
to="https://$1.wolframalpha.com/" />
2978

30-
<rule from="^http://api-(cn|maps|tw)\.wolframalpha\.com/" to="https://www.wolframalpha.com/" />
31-
<rule from="^http://volunteer\.wolframalpha\.com/" to="https://www.wolframalpha.com/" />
32-
<rule from="^http://(www[0-9][0-9]\.)wolframalpha\.com/" to="https://www.wolframalpha.com/" />
33-
<rule from="^http:" to="https:" />
3479
</ruleset>

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
<!--
2-
For other Wolfram Research coverage, see Wolfram.com.xml.
2+
For other Wolfram Research coverage:
3+
4+
- Wolfram.com.xml
5+
- Wolfram_Alpha.xml
6+
- Wolframcloud.com.xml
7+
8+
Problematic hosts in *wolframcdn.com:
9+
10+
- ^ (https timeout)
311
412
-->
513
<ruleset name="Wolfram CDN.com">
614

715
<target host="www.wolframcdn.com" />
16+
<target host="dl.wolframcdn.com" />
817

18+
<rule from="^http:"
19+
to="https:" />
920

10-
<rule from="^http:" to="https:" />
11-
12-
</ruleset>
21+
</ruleset>

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

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,36 @@
1+
<!--
2+
3+
For other Wolfram Research coverage:
4+
5+
- Wolfram.com.xml
6+
- Wolfram_Alpha.xml
7+
- Wolfram_CDN.com.xml
8+
9+
Problematic hosts in *wolframcloud.com:
10+
11+
- ^ (no https)
12+
13+
-->
114
<ruleset name="Wolframcloud.com">
2-
<target host="wolframcloud.com" />
3-
<target host="www.wolframcloud.com" />
4-
<target host="programming.wolframcloud.com" />
515

6-
<rule from="^http://(?:www\.)?wolframcloud\.com/" to="https://www.wolframcloud.com/" />
7-
<rule from="^http://programming\.wolframcloud\.com/" to="https://programming.wolframcloud.com/" />
16+
<target host="wolframcloud.com" />
17+
<target host="www.wolframcloud.com" />
18+
<target host="billing.wolframcloud.com" />
19+
<target host="channelbroker.wolframcloud.com" />
20+
<target host="datadrop.wolframcloud.com" />
21+
<target host="datarepository.wolframcloud.com" />
22+
<target host="develop.wolframcloud.com" />
23+
<target host="lab.wolframcloud.com" />
24+
<target host="mathematica.wolframcloud.com" />
25+
<target host="one.wolframcloud.com" />
26+
<target host="open.wolframcloud.com" />
27+
<target host="programming.wolframcloud.com" />
28+
<target host="reference.wolframcloud.com" />
29+
30+
<rule from="^http://wolframcloud\.com/"
31+
to="https://www.wolframcloud.com/" />
32+
33+
<rule from="^http:"
34+
to="https:" />
35+
836
</ruleset>

‎utils/ruleset-whitelist.csv‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3619,9 +3619,7 @@ b859ff3f78e0cc95b3eaf81ec38153ffd631b75974902b50e181c2b9a73b08f5,1,1,WinSuperSit
36193619
0812bcf9185f25ab18b3a7f034f332203cdd4f3de385ab2b5e2737e83e9d969c,1,1,Wishabi.xml
36203620
83ef353b9aab96e56973c3d8150c1f1e3b6cff4f68cad34cd754f3e2de999108,1,1,WiTopia.net.xml
36213621
107b0e53285b3cd5b876c03108d666cba1dfac53af5a62e0190c990cb08c4cc8,1,1,Wizard-Internet-Services.xml
3622-
b9f8cc3d837e320d48965b779ff0977fb14329226b2cff5ccf86f8b6b583f698,1,1,Wolfram_Alpha.xml
3623-
e1440a89fa9e0be3d51832b2c2d6f5f63d7edcbc30ef786a77bca5c8d9c7e4bb,0,1,Wolframcloud.com.xml
3624-
9cfc632cb53d9f01e6d82e0f36008181b0a4010ba453d154c20629bf9964832f,1,1,Wolfram.com.xml
3622+
a1b7325cf1b8968daca8a883ab2a7d04a6902283ff93d0a7889bcd6e5420451c,1,0,Wolfram_Alpha.xml
36253623
e237009069a1f7e25b8d4d83fb77aa2f273405abbeafa0f3d9f70110cc08c309,1,1,Womens_Health_Specialists.xml
36263624
f7999de568e74fdd703ef7c2aaa057ce2dc1a418d112ea5cc64aa6d29e57915f,1,1,Wonderlandmovies.xml
36273625
072d4bc8ac964f1db9fc4b3d1113dbe48d854b975c89839f3d5395226fee2b33,1,1,Woobox.com.xml

0 commit comments

Comments
 (0)