Skip to content

Commit 402ecd2

Browse files
author
MB
committed
[NASA.gov] Add/update comments, handle mars.jpl as-is, add searchpub.nssc, split
1 parent 56736df commit 402ecd2

3 files changed

Lines changed: 61 additions & 10 deletions

File tree

‎src/chrome/content/rules/NASA.gov-falsemixed.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
For rules not causing false/broken MCB, see NASA.gov.xml.
3+
4+
-->
5+
<ruleset name="NASA.gov (false MCB)" platform="mixedcontent">
6+
7+
<!-- Direct rewrites:
8+
-->
9+
<target host="mars.jpl.nasa.gov" />
10+
11+
<!-- Complications:
12+
-->
13+
<target host="mars.nasa.gov" />
14+
15+
16+
<securecookie host="." name="." />
17+
18+
19+
<rule from="^http://mars\.nasa\.gov/"
20+
to="https://mars.jpl.nasa.gov/" />
21+
22+
<rule from="^http:"
23+
to="https:" />
24+
25+
</ruleset>

‎src/chrome/content/rules/NASA.gov.xml‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<!--
2+
For rules causing false/broken MCB, see NASA.gov-falsemixed.
3+
24
For other US government coverage, see US-government.xml.
35
46
@@ -83,6 +85,7 @@
8385
- trs-new *
8486
- voyager
8587
- www *
88+
- www.istp *
8689
8790
- www.jps
8891
- eol.jsc
@@ -91,6 +94,7 @@
9194
- science.ksc **
9295
- www-pao.ksc *
9396
- www.msfc (301s to http, akamai)
97+
- nasapeople *
9498
- sohowww.nascom *
9599
- stereo-ssc.nascom *
96100
- pds *
@@ -114,15 +118,15 @@
114118
- heasarc ³
115119
116120
- insight.jpl ¹
117-
- mars.jpl ⁴
121+
- mars.jpl Mixed css
118122
- marsrovers.jpl ⁴
119123
- marsstaticcdn.jpl ⁴
120124
- nightsky.jpl (Expired)
121125
- rosetta.jpl ³
122126
- sse.jpl (Mismatched)
123127
124128
- stiprod.larc ⁵
125-
- mars ⁴
129+
- mars ¹
126130
- ntrs ⁵
127131
128132
¹ Mismatched
@@ -134,6 +138,7 @@
134138
135139
Partially covered subdomains:
136140
141+
- mars.jpl ²
137142
- rosetta.jpl ²
138143
139144
² Avoiding broken MCB
@@ -172,7 +177,6 @@
172177
- icis
173178
- jpldataeval
174179
- jplspaceship
175-
- mars (→ d2cj35nmzi9erd.cloudfront.net)
176180
- marsstaticcdn (→ d3r05mwudimf00.cloudfront.net)
177181
- metrics (→ jpl-nasa-gov.122.2o7.net)
178182
- naif
@@ -186,8 +190,6 @@
186190
- telework
187191
- www-robotics
188192
189-
190-
- mars (→ d2cj35nmzi9erd.cloudfront.net)
191193
- open
192194
- people
193195
- solarsystem
@@ -204,12 +206,14 @@
204206
205207
- css, on:
206208
209+
- mars.jpl from mars.nasa.gov ¹
207210
- rosetta.jpl from $self ¹
208211
- stiprod.larc from www.sti ²
209212
- oig from fonts.googleapis.com ¹
210213
211214
- Images, on:
212215
216+
- mars.jpl from mars.nasa.gov ¹
213217
- rosetta.jpl from $self ¹
214218
- scienceandtechnology.jpl from www-robotics.jpl ¹
215219
- stiprod.larc from www.sti ²
@@ -262,6 +266,7 @@
262266
<target host="jpldataeval.jpl.nasa.gov" />
263267
<target host="jplspaceship.jpl.nasa.gov" />
264268
<target host="naif.jpl.nasa.gov" />
269+
<target host="mars.jpl.nasa.gov" />
265270
<!--target host="nightsky.jpl.nasa.gov" /-->
266271
<target host="pds.jpl.nasa.gov" />
267272
<target host="ras.jpl.nasa.gov" />
@@ -273,6 +278,7 @@
273278
<target host="telework.jpl.nasa.gov" />
274279
<target host="www-robotics.jpl.nasa.gov" />
275280

281+
<target host="searchpub.nssc.nasa.gov" />
276282
<target host="oig.nasa.gov" />
277283
<target host="open.nasa.gov" />
278284
<target host="people.nasa.gov" />
@@ -283,13 +289,31 @@
283289
-->
284290
<target host="www.data.nasa.gov" />
285291
<target host="heasarc.nasa.gov" />
286-
<target host="mars.nasa.gov" />
287292

288-
<target host="mars.jpl.nasa.gov" />
289293
<target host="marsstaticcdn.jpl.nasa.gov" />
290294
<target host="metrics.jpl.nasa.gov" />
291295
<target host="sse.jpl.nasa.gov" />
292296

297+
<target host="mars.nasa.gov" />
298+
299+
<!-- Avoid broken MCB:
300+
-->
301+
<exclusion pattern="^http://mars(?:\.jpl)?\.nasa\.gov/+(?!favicon\.ico|images/|layout/)" />
302+
303+
<!-- +ve:
304+
-->
305+
<test url="http://mars.nasa.gov/allaboutmars/" />
306+
<test url="http://mars.jpl.nasa.gov/maps/" />
307+
<test url="http://mars.jpl.nasa.gov/msl_frontpage_15.swf" />
308+
<test url="http://mars.jpl.nasa.gov/news/whatsnew/" />
309+
<test url="http://mars.jpl.nasa.gov/programmissions/" />
310+
311+
<!-- -ve:
312+
-->
313+
<test url="http://mars.nasa.gov/favicon.ico" />
314+
<test url="http://mars.jpl.nasa.gov/images/general/promote/mars-map/nasa-explore-mars-map-favblock.jpg" />
315+
<test url="http://mars.jpl.nasa.gov/layout/mep/images/spacer.gif" />
316+
293317
<!-- Avoid broken MCB:
294318
-->
295319
<exclusion pattern="^http://rosetta\.jpl\.nasa\.gov/+(?!favicon\.ico|modules/|sites/)" />
@@ -325,9 +349,6 @@
325349
<rule from="^http://heasarc\.nasa\.gov/"
326350
to="https://heasarc.gsfc.nasa.gov/" />
327351

328-
<rule from="^http://mars\.(?:jpl\.)?nasa\.gov/"
329-
to="https://d2cj35nmzi9erd.cloudfront.net/" />
330-
331352
<rule from="^http://marsstaticcdn\.jpl\.nasa\.gov/"
332353
to="https://d3r05mwudimf00.cloudfront.net/" />
333354

@@ -337,6 +358,9 @@
337358
<rule from="^http://sse\.jpl\.nasa\.gov/"
338359
to="https://solarsystem.nasa.gov/" />
339360

361+
<rule from="^http://mars\.nasa\.gov/"
362+
to="https://mars.jpl.nasa.gov/" />
363+
340364
<rule from="^http:"
341365
to="https:" />
342366

‎utils/duplicate-whitelist.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ mozo.com.au
178178
mybuys.com
179179
mycanvas.com
180180
nandos.com
181+
mars.jpl.nasa.gov
182+
mars.nasa.gov
181183
nelonen.fi
182184
*.netapp.com
183185
netnow.co

0 commit comments

Comments
 (0)