Skip to content

Commit 22a6e69

Browse files
author
MB
committed
[Fastly] Split, enumerate, squish
1 parent f42efd1 commit 22a6e69

File tree

6 files changed

+117
-46
lines changed

6 files changed

+117
-46
lines changed

‎src/chrome/content/rules/FastSSL.net.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!--
2+
For other Fastly coverage, see Fastly.xml.
3+
4+
-->
5+
<ruleset name="FastSSL.net">
6+
7+
<target host="*.fastssl.net" />
8+
9+
10+
<rule from="^http:"
11+
to="https:" />
12+
13+
</ruleset>

‎src/chrome/content/rules/Fastly.net.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!--
2+
For other Fastly coverage, see Fastly.xml.
3+
4+
5+
Nonfunctional domains:
6+
7+
- *.global.prod.fastly.net
8+
- purge.fastly.net (times out)
9+
10+
11+
Fully covered domains:
12+
13+
- *.fastly.net:
14+
15+
- control
16+
- mirrors
17+
- assets1.fastly.com.a.prod (→ fastly.a.ssl.fastly.net)
18+
19+
- *.a.ssl:
20+
21+
- fastly
22+
- fastly-assets
23+
24+
-->
25+
<ruleset name="Fastly.net (partial)">
26+
27+
<target host="*.fastly.net" />
28+
<exclusion pattern="^http://(?:(?!assets1\.fastly\.com\.a\.prod\.).+\.prod|purge)\.fastly\.net/" />
29+
30+
31+
<rule from="^http://assets1\.fastly\.com\.a\.prod\.fastly\.net/"
32+
to="https://fastly.a.ssl.fastly.net/" />
33+
34+
<rule from="^http:"
35+
to="https:" />
36+
37+
</ruleset>

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

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
<!--
2+
Other Fastly rulesets:
3+
4+
- FastSSL.net.xml
5+
- Fastly.net.xml
6+
7+
28
CDN buckets:
39
410
- assets1.fastly.com.a.prod.fastly.net
@@ -7,12 +13,6 @@
713
- fastly.zendesk.com
814
915
10-
Nonfunctional domains:
11-
12-
- *.global.prod.fastly.net
13-
- purge.fastly.net (times out)
14-
15-
1616
Problematic domains:
1717
1818
- fastly.com (times out)
@@ -31,51 +31,29 @@
3131
- debug
3232
- maintenance
3333
34-
- *.fastly.net:
35-
36-
- control
37-
- mirrors
38-
- assets1.fastly.com.a.prod (→ fastly.a.ssl.fastly.net)
39-
40-
- *.a.ssl:
41-
42-
- fastly
43-
- fastly-assets
44-
45-
- *.imgix.net
46-
- *.parsecdn.com
47-
4834
-->
49-
<ruleset name="Fastly">
50-
35+
<ruleset name="Fastly.com">
36+
37+
<!-- Direct rewrites:
38+
-->
39+
<target host="api.fastly.com" />
40+
<target host="app.fastly.com" />
41+
<target host="beacon.fastly.com" />
42+
<target host="beta.fastly.com" />
43+
<target host="blog.fastly.com" />
44+
<target host="debug.fastly.com" />
45+
<target host="maintenance.fastly.com" />
46+
<target host="www.fastly.com" />
47+
48+
<!-- Complications:
49+
-->
5150
<target host="fastly.com" />
52-
<target host="*.fastly.com" />
53-
<target host="*.fastly.net" />
54-
<exclusion pattern="^http://(?:(?!assets1\.fastly\.com\.a\.prod\.).+\.prod|purge)\.fastly\.net/" />
55-
<target host="*.fastssl.net" />
56-
<target host="*.imgix.net" />
57-
<target host="*.parsecdn.com" />
5851

5952

60-
<rule from="^http://(?:www\.)?fastly\.com/"
53+
<rule from="^http://fastly\.com/"
6154
to="https://www.fastly.com/" />
6255

63-
<rule from="^http://(ap[ip]|beacon|beta|blog|debug|maintenance)\.fastly\.com/"
64-
to="https://$1.fastly.com/" />
65-
66-
<rule from="^http://assets1\.fastly\.com\.a\.prod\.fastly\.net/"
67-
to="https://fastly.a.ssl.fastly.net/" />
68-
69-
<rule from="^http://([^@:/]+)\.fastly\.net/"
70-
to="https://$1.fastly.net/" />
71-
72-
<rule from="^http://([\w-]+)\.fastssl\.net/"
73-
to="https://$1.fastssl.net/" />
74-
75-
<rule from="^http://([\w-]+)\.imgix\.net/"
76-
to="https://$1.imgix.net/" />
77-
78-
<rule from="^http://([\w-]+)\.parsecdn\.com/"
79-
to="https://$1.parsecdn.com/" />
56+
<rule from="^http:"
57+
to="https:" />
8058

8159
</ruleset>

‎src/chrome/content/rules/Imgix.net.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!--
2+
Fully covered domains:
3+
4+
- *.imgix.net
5+
6+
-->
7+
<ruleset name="imgix.net">
8+
9+
<target host="*.imgix.net" />
10+
11+
12+
<rule from="^http:"
13+
to="https:" />
14+
15+
</ruleset>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
For other Parse coverage, see Parse.xml.
3+
4+
5+
Fully covered domains:
6+
7+
- *.parsecdn.com:
8+
9+
- www
10+
11+
12+
^parsecdn.com doesn't exist.
13+
14+
-->
15+
<ruleset name="ParseCDN.com">
16+
17+
<target host="*.parsecdn.com" />
18+
19+
<test url="http://www.parsecdn.com/js/parse-1.2.19.min.js" />
20+
21+
22+
<rule from="^http:"
23+
to="https:" />
24+
25+
</ruleset>

‎utils/ruleset-coverage-whitelist.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4293,12 +4293,14 @@ c092efaf47353f6eaa1d433b2fc56eac6e8a7d59829fcc9882e1fb777c79b54e Fass.se.xml
42934293
62512d96d2f3943800f3deed590afa6da5c3ab04f10f7c38d3b10bafef8bde5c FastDomain.xml
42944294
762d604802890132c73106f3e0391b30bd07b1be96837a6c93b510480bd6bfee Fasthosts.xml
42954295
48f0544a04faff68a6138b43b4e40ff5185c3ba3688e007266c99344e08dfcd7 Fastly.xml
4296+
be899abeb302a1efc5a3b0f6ed350066ff24e8edb74351865a3d3cd01dc7f47b Fastly.net.xml
42964297
dd0e695a594018f3bedc113db753bde8e5cd4c1b4447a9a05edf24f86777e50a Fastmail.xml
42974298
c337a11c11760d119ebd6968b24c3007b814fa5fd5ffcc8407a7166e7bc8fb64 Fast_Serv.com.xml
42984299
fb2797ea4f3e61e4edc5734b3aac48a80ab75cb7c6c52ad0c19c9662fd61357b FastShare.cz.xml
42994300
9c51c5f3685da502281c46d976f7ae3bb8b9b2ac9799e41eaf7253c170fecc15 FastSoft.xml
43004301
44f8c472ec5cf817f39d33ff49457f79c3feba98b11e011114903e23d30913a6 FastSpring-mismatches.xml
43014302
a4f3f9a6bcd208fd5ca7cc7e6c2c60f88dfb220a8653b9b6e227f1f1c263db1e FastSpring.xml
4303+
dd287d47353154cfe23378ad3be870a78a7145eed1a8b901f7771340d09a2e19 FastSSL.net.xml
43024304
510e5b4871f75849ebf8ea50421dc076b8107b08435d58c1c5372fb0a0f1a36a FastWebHost.com-mismatches.xml
43034305
b1c6433972f39901d51420a91151f257e62c9a25aa234958713fc23ecf6d4506 FastWebHost.com.xml
43044306
ed459dd01f0558d611487a5c138afe4f19ca9b81967978473a5f1fe2c7b51b5b Fast-Web-Media.xml
@@ -5986,6 +5988,7 @@ ccf586890e4e64149a3a9a50e7fbb42d1ead933fdf5e3bf7f9e64adef88bc6f1 Imgbox.xml
59865988
ded349d0e0b6957b6ecb94f4e85ab1dfe7fa03b1a0ed16ba7531ff3b9cda9322 ImgDino.xml
59875989
8ecc3ad5353311d84332da06a024cdc6163bbe3a687c3a4ee1f85676c12f631f Imgfav.xml
59885990
aa7a719029440b57ae3a2fd4be68f59f2ca9902cf9f3febec8b7a11c818720cb Imgflip.com.xml
5991+
f00f285c965761d10436fd350d041275a640e728eb92783d66fde2c8805fab70 Imgix.net.xml
59895992
8beb6859c24039c5dff4ee93e23fb960f747568874a39abf2a46e7f14ac89cac IMGrind.com.xml
59905993
333ec0e376b43a6e1a082d3b634bff841600d04c5c8a2864d925d02fc90be129 Img.shields.io.xml
59915994
15fcd62901ca85408e3b4c830d8814d9c5952c5a4f73f7e489bafda434f7f72b Imgs_Mail.ru.xml

0 commit comments

Comments
 (0)