Skip to content

Commit 6a70f62

Browse files
author
Andrew Hobden
committed
Clean descriptions, improve pages
1 parent e9bba68 commit 6a70f62

File tree

8 files changed

+31
-23
lines changed

8 files changed

+31
-23
lines changed

‎_data/subdomains.yml

+14-18
Original file line numberDiff line numberDiff line change
@@ -47,30 +47,27 @@ self-signed:
4747
background: red
4848
category: Certs
4949
description: |
50-
TODO
50+
This certificate is not signed by a trusted CA, instead it is signed by the issuer.
5151
sha1:
5252
favicon: yellow
5353
background: rgb(246, 207, 47)
5454
category: Certs
5555
description: |
56-
The certificate for this site is signed using SHA-1<br>
57-
and expires on Dec. 29, 2016.
56+
The certificate for this site is signed using SHA-1 and expires on Dec. 29, 2016. This date is prior to the <a href="https://googleonlinesecurity.blogspot.ca/2014/09/gradually-sunsetting-sha-1.html">sunset date</a>.
5857
sha1-2016:
5958
favicon: yellow
6059
background: rgb(246, 207, 47)
6160
category: Certs
6261
# TODO: Why is this important?
6362
description: |
64-
The certificate for this site is signed using SHA-1<br>
65-
and expires on Dec. 29, 2016.
63+
The certificate for this site is signed using SHA-1 and expires on Dec. 29, 2016. This date is prior to the <a href="https://googleonlinesecurity.blogspot.ca/2014/09/gradually-sunsetting-sha-1.html">sunset date</a>.
6664
sha-2017:
6765
favicon: red
6866
background: red
6967
category: Certs
7068
# TODO: Why is this important?
7169
description: |
72-
The certificate for this site is signed using SHA-1<br>
73-
and expires on Jan. 5, 2017.
70+
The certificate for this site is signed using SHA-1 and expires on Jan. 5, 2017. This date is after to the <a href="https://googleonlinesecurity.blogspot.ca/2014/09/gradually-sunsetting-sha-1.html">sunset date</a>.
7471
sha256:
7572
favicon: green
7673
background: green
@@ -177,19 +174,19 @@ dsdtestprovider:
177174
background: red
178175
category: Known-Bad
179176
description: |
180-
See https://blog.hboeck.de/archives/876-Superfish-2.0-Dangerous-Certificate-on-Dell-Laptops-breaks-encrypted-HTTPS-Connections.html
177+
A MITM certificate installed on some Dell machines. <a href="https://blog.hboeck.de/archives/876-Superfish-2.0-Dangerous-Certificate-on-Dell-Laptops-breaks-encrypted-HTTPS-Connections.html">Hboeck source</a>.
181178
edellroot:
182179
favicon: red
183180
background: red
184181
category: Known-Bad
185182
description: |
186-
See https://blog.hboeck.de/archives/876-Superfish-2.0-Dangerous-Certificate-on-Dell-Laptops-breaks-encrypted-HTTPS-Connections.html
183+
Another MITM certificate installed on some Dell machines. <a href="https://blog.hboeck.de/archives/876-Superfish-2.0-Dangerous-Certificate-on-Dell-Laptops-breaks-encrypted-HTTPS-Connections.html">Hboeck source</a>.
187184
superfish:
188185
favicon: red
189186
background: red
190187
category: Known-Bad
191188
description: |
192-
See blog.erratasec.com/2015/02/extracting-superfish-certificate.html
189+
A MITM certificate installed on some Lenovo machines. <a href="http://blog.erratasec.com/2015/02/extracting-superfish-certificate.html">Erratasec source</a>.
193190
194191
### Misc ###
195192
badssl.com:
@@ -249,8 +246,7 @@ mixed-script:
249246
background: gray
250247
category: Mixed
251248
description: |
252-
This page triggers active mixed content<br>
253-
(a script from an insecure URL).
249+
This page triggers active mixed content (a script from an insecure URL).
254250
very:
255251
favicon: red
256252
background: red
@@ -270,7 +266,7 @@ hsts-https:
270266
background: rgb(68, 136, 68)
271267
category: Upgrade
272268
description: |
273-
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/hsts-test/status.svg" title="This is an image with an HTTP source location specified. If HSTS is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome.">
269+
TODO
274270
https-everywhere-http:
275271
favicon: red
276272
background: rgb(170, 68, 68)
@@ -283,21 +279,21 @@ https-everywhere-https:
283279
background: rgb(68, 136, 68)
284280
category: Upgrade
285281
description: |
286-
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/redirect-test/status.svg" title="This is an image with an HTTP source location specified. If HTTPS Everywhere is working and activated, the source should be rewritten to HTTPS. The image will vary depending on the outcome."><br>
282+
TODO
287283
This domain will be upgraded to HTTPS if you use <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a>.
288284
preloaded-hsts-http:
289285
favicon: red
290286
background: rgb(170, 68, 68)
291287
category: Upgrade
292288
description: |
293-
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/hsts-test/status.svg" title="This is an image with an HTTP source location specified. If HSTS is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome."><br>
289+
TODO
294290
Preloaded in: Chrome 44, Firefox 41
295291
preloaded-hsts-https:
296292
favicon: green
297293
background: rgb(68, 136, 68)
298294
category: Upgrade
299295
description: |
300-
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/hsts-test/status.svg" title="This is an image with an HTTP source location specified. If HSTS is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome."><br>
296+
TODO
301297
Preloaded in: Chrome 44, Firefox 41
302298
subdomain.preloaded-hsts:
303299
favicon: red
@@ -310,10 +306,10 @@ upgrade-http:
310306
background: red
311307
category: Upgrade
312308
description: |
313-
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/upgrade-test/upgrade-test.svg" title="This is an image with an HTTP source location specified. If upgrade-insecure-requests is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome.">
309+
TODO
314310
upgrade-https:
315311
favicon: green
316312
background: rgb(68, 136, 68)
317313
category: Upgrade
318314
description: |
319-
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/upgrade-test/upgrade-test.svg" title="This is an image with an HTTP source location specified. If upgrade-insecure-requests is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome.">
315+
TODO

‎_layouts/page.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4+
{% assign data = site.data.subdomains[page.subdomain] %}
45
<meta name="viewport" content="width=device-width, initial-scale=1">
5-
{% if page.no-favicon %}<!-- No favicon -->{% else %}<link rel="shortcut icon" href="/icons/favicon-{{ page.favicon }}.ico"/>
6+
{% if subdomain.no-favicon %}<!-- No favicon -->{% else %}<link rel="shortcut icon" href="/icons/favicon-{{ subdomain.favicon }}.ico"/>
67
<link rel="apple-touch-icon" href="/icons/icon-{{ page.favicon }}.png"/>{% endif %}
7-
<title>{% if page.title %}{{ page.title }}{% else %}{{ page.subdomain }}.{{ site.domain }}{% endif %}</title>
8+
<title>{% if data.title %}{{ data.title }}{% else %}{{ page.subdomain }}.{{ site.domain }}{% endif %}</title>
89
<link rel="stylesheet" href="/style.css">
9-
<style>body { background: {% if page.background %}{{ page.background }}{% else %}gray{% endif %}; }</style>
10+
<style>body { background: {% if data.background %}{{ data.background }}{% else %}gray{% endif %}; }</style>
1011
</head>
1112
<body>
1213
{{ content }}

‎_layouts/spoofed.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4+
{% assign data = site.data.subdomains[page.subdomain] %}
45
<meta name="viewport" content="width=device-width, initial-scale=1">
56
<link rel="shortcut icon" href="/favicons/favicon.ico"/>
67
<link rel="apple-touch-icon" href="/favicons/icon.png"/>
7-
<title>{% if page.title %}{{ page.title }}{% else %}{{ page.subdomain }}.{{ site.domain }}{% endif %}</title>
8+
<title>{% if data.title %}{{ data.title }}{% else %}{{ subdomain.subdomain }}.{{ site.domain }}{% endif %}</title>
89
<link rel="stylesheet" href="/style.css">
9-
<style>body { background: {% if page.background %}{{ page.background }}{% else %}gray{% endif %}; }</style>
10+
<style>body { background: {% if data.background %}{{ data.background }}{% else %}gray{% endif %}; }</style>
1011
</head>
1112
<body>
1213
{{ content }}

‎domains/upgrade/hsts-http/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
layout: page
44
---
55

6+
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/hsts-test/status.svg" title="This is an image with an HTTP source location specified. If HSTS is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome.">
7+
68
<div id="content">
79
<h1 style="font-size: 7vw;">
810
http://{{ page.subdomain }}.{{ site.domain }}

‎domains/upgrade/https-everywhere-https/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
layout: page
44
---
55

6+
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/redirect-test/status.svg" title="This is an image with an HTTP source location specified. If HTTPS Everywhere is working and activated, the source should be rewritten to HTTPS. The image will vary depending on the outcome."><br>
7+
68
<div id="content">
79
<h1 style="font-size: 9vw;">
810
{{ page.subdomain }}.<br>{{ site.domain }}

‎domains/upgrade/preloaded-hsts-http/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
layout: page
44
---
55

6+
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/hsts-test/status.svg" title="This is an image with an HTTP source location specified. If HSTS is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome."><br>
7+
68
<div id="content">
79
<h1 style="font-size: 7vw;">
810
http://{{ page.subdomain }}.<br>{{ site.domain }}

‎domains/upgrade/preloaded-hsts-https/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
layout: page
44
---
55

6+
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/hsts-test/status.svg" title="This is an image with an HTTP source location specified. If HSTS is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome."><br>
7+
68
<div id="content">
79
<h1 style="font-size: 9vw;">
810
{{ page.subdomain }}.<br>{{ site.domain }}

‎domains/upgrade/upgrade-https/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
background: rgb(68, 136, 68)
66
---
77

8+
<img id="http-vs-https" src="http://{{ page.subdomain }}.{{ site.domain }}/upgrade-test/upgrade-test.svg" title="This is an image with an HTTP source location specified. If upgrade-insecure-requests is working, the source should be rewritten to HTTPS. The image will vary depending on the outcome.">
9+
810
<div id="content">
911
<h1 style="font-size: 9vw;">
1012
{{ page.subdomain }}.<br>{{ site.domain }}

0 commit comments

Comments
 (0)