+
diff --git a/public/server-version.html b/public/server-version.html
index b41c1b8..7b9ddfe 100644
--- a/public/server-version.html
+++ b/public/server-version.html
@@ -18,7 +18,7 @@
{% endblock %}
{% block content %}
-
#{{ server_version }}
+
#{{ server_version }}
このサーバーで現在使用されているソースコードのコミットID(ハッシュ)の先頭7文字です。
サーバーが起動されるたびにgit rev-parse --short HEADを使用して取得しています。
diff --git a/public/tools.html b/public/tools.html
index 30e3701..89470b7 100644
--- a/public/tools.html
+++ b/public/tools.html
@@ -8,7 +8,7 @@
Nercone TLS Test
任意のホストに対して TLS/SSL 設定の詳細チェックとランク付けを行うWebサービス
-
tls-test
+
tls-test
{% endblock %}
diff --git a/public/tools/tls-test/assets/tls-test.css b/public/tools/tls-test/assets/tls-test.css
index 376bc86..90fae4a 100644
--- a/public/tools/tls-test/assets/tls-test.css
+++ b/public/tools/tls-test/assets/tls-test.css
@@ -3,7 +3,7 @@
* Palette comes from /public/assets/css/style.css
* #1A1A1A = page bg #272727 = block bg
* #202020 = input bg #3a3a3a = border
- * #E0E0E0 = tx #939393 = tx-alt
+ * #E0E0E0 = tx #939393 = light-grey-alt
* #00C878 = bright-green #00C0FF = bright-blue
* ===================================================== */
diff --git a/public/tools/tls-test/assets/tls-test.js b/public/tools/tls-test/assets/tls-test.js
index ebf6296..957e418 100644
--- a/public/tools/tls-test/assets/tls-test.js
+++ b/public/tools/tls-test/assets/tls-test.js
@@ -16,7 +16,7 @@
notgood: "bright-yellow",
bad: "bright-red",
serious: "bright-purple",
- info: "tx-alt",
+ info: "light-grey-alt",
};
const SEV_LABEL = {
good: "GOOD",
@@ -44,7 +44,7 @@
row.className = "tls-log-row";
const cat = document.createElement("span");
- cat.className = "tls-log-cat text-tx-alt";
+ cat.className = "tls-log-cat text-light-grey-alt";
cat.textContent = "[" + normalizeStep(category) + "]";
row.appendChild(cat);
@@ -60,13 +60,13 @@
// Title is always in the default text color (white). Severity is
// communicated by the coloured label tag, not by tinting the title.
const msgText = document.createElement("span");
- msgText.className = "text-tx";
+ msgText.className = "textlight-grey";
msgText.textContent = body || "";
msg.appendChild(msgText);
row.appendChild(msg);
const det = document.createElement("span");
- det.className = "tls-log-detail text-tx-alt";
+ det.className = "tls-log-detail text-light-grey-alt";
det.textContent = detail || "";
row.appendChild(det);
diff --git a/public/tools/tls-test/index.html b/public/tools/tls-test/index.html
index a54d6fe..17a9e1c 100644
--- a/public/tools/tls-test/index.html
+++ b/public/tools/tls-test/index.html
@@ -9,7 +9,7 @@
{% block content %}
Nercone TLS Test
- ただのTLS/SSL設定分析サービス
+ ただのTLS/SSL設定分析サービス
diff --git a/public/tools/tls-test/results.html b/public/tools/tls-test/results.html
index d88c710..b65b3a9 100644
--- a/public/tools/tls-test/results.html
+++ b/public/tools/tls-test/results.html
@@ -34,12 +34,12 @@
@@ -140,21 +140,21 @@
{% for c in chain %}
- | {{ loop.index }} |
+ {{ loop.index }} |
{{ c.common_name or c.subject or '—' }}
- {% if c.sans %}SAN: {{ (c.sans or [])|join(', ') }} {% endif %}
+ {% if c.sans %}SAN: {{ (c.sans or [])|join(', ') }} {% endif %}
|
{{ c.issuer or '—' }} |
{{ c.not_after or '—' }}
{% if c.is_expired %}期限切れ
- {% elif c.days_until_expiry is defined and c.days_until_expiry is not none %}残 {{ c.days_until_expiry }} 日{% endif %}
+ {% elif c.days_until_expiry is defined and c.days_until_expiry is not none %}残 {{ c.days_until_expiry }} 日{% endif %}
|
{{ (c.signature_hash_algorithm or '—')|upper }} |
{{ c.public_key_algorithm or '—' }}{% if c.public_key_size_bits %} {{ c.public_key_size_bits }}-bit{% endif %}
- {% if c.public_key_curve %} ({{ c.public_key_curve }}){% endif %}
+ {% if c.public_key_curve %} ({{ c.public_key_curve }}){% endif %}
|
{% endfor %}
@@ -175,7 +175,7 @@
| {{ t.platform }} |
{{ yn(t.trusted, '信頼', '未信頼') }} |
- {{ t.error or '—' }} |
+ {{ t.error or '—' }} |
{% endfor %}
@@ -197,10 +197,10 @@
| CRL | {{ rev_cell(crl, 'CRL') }} |
|---|
| HSTS |
{%- if not hsts or hsts.error -%}
- —
+ —
{%- elif hsts.present -%}
有効
- max-age={{ hsts.max_age }}{% if hsts.include_subdomains %}; includeSubDomains{% endif %}{% if hsts.preload %}; preload{% endif %}
+ max-age={{ hsts.max_age }}{% if hsts.include_subdomains %}; includeSubDomains{% endif %}{% if hsts.preload %}; preload{% endif %}
{%- else -%}
無効
{%- endif -%}
@@ -208,19 +208,19 @@
|
|---|
| HSTS preload |
{%- if preload -%}
{%- for p in preload -%}
- {{ p.browser }}: {% if p.error %}取得エラー{% else %}{{ yn(p.listed, 'Listed', 'Not listed') }}{% endif %}{% if not loop.last %} · {% endif %}
+ {{ p.browser }}: {% if p.error %}取得エラー{% else %}{{ yn(p.listed, 'Listed', 'Not listed') }}{% endif %}{% if not loop.last %} · {% endif %}
{%- endfor -%}
{%- else -%}
- —
+ —
{%- endif -%}
|
|---|
| CAA |
{%- if not caa -%}
- —
+ —
{%- elif caa.records -%}
{{ caa.records|length }} 件
- ({{ caa.effective_host }})
- {{ caa.records|join('; ') }}
+ ({{ caa.effective_host }})
+ {{ caa.records|join('; ') }}
{%- else -%}
未設定
{%- endif -%}
@@ -234,7 +234,7 @@
{% set findings = groups['reliability'] %}
{% if findings %}{% for f in findings %}{{ finding_row(f) }}{% endfor %}
- {% else %} [info]項目なし {% endif %}
+ {% else %} [info]項目なし {% endif %}
- {{ name }} ({{ cs|length }})
+ {{ name }} ({{ cs|length }})
| 脆弱性 | 判定 | 詳細 |
|---|
- | Heartbleed | {% if hb %}{{ yn(not hb.vulnerable, '影響なし', '影響あり') }}{% else %}—{% endif %} | {% if hb %}{% if hb.heartbeat_extension %}Heartbeat advertised{% endif %}{% if hb.error %} {{ hb.error }}{% endif %}{% endif %} |
- | CCS Injection | {% if ccs %}{{ yn(not ccs.vulnerable, '影響なし', '影響あり') }}{% else %}—{% endif %} | {{ (ccs or {}).get('detail','') }} |
- | Secure Renegotiation | {% if renego %}{{ yn(renego.supported, '対応', '未対応') }}{% else %}—{% endif %} | {{ (renego or {}).get('detail','') }} |
- | TLS_FALLBACK_SCSV | {% if scsv %}{{ yn(scsv.supported, '対応', '未対応') }}{% else %}—{% endif %} | {{ (scsv or {}).get('detail','') }} |
+ | Heartbleed | {% if hb %}{{ yn(not hb.vulnerable, '影響なし', '影響あり') }}{% else %}—{% endif %} | {% if hb %}{% if hb.heartbeat_extension %}Heartbeat advertised{% endif %}{% if hb.error %} {{ hb.error }}{% endif %}{% endif %} |
+ | CCS Injection | {% if ccs %}{{ yn(not ccs.vulnerable, '影響なし', '影響あり') }}{% else %}—{% endif %} | {{ (ccs or {}).get('detail','') }} |
+ | Secure Renegotiation | {% if renego %}{{ yn(renego.supported, '対応', '未対応') }}{% else %}—{% endif %} | {{ (renego or {}).get('detail','') }} |
+ | TLS_FALLBACK_SCSV | {% if scsv %}{{ yn(scsv.supported, '対応', '未対応') }}{% else %}—{% endif %} | {{ (scsv or {}).get('detail','') }} |
@@ -320,7 +320,7 @@
{% set findings = groups['vulnerabilities'] %}
{% if findings %}{% for f in findings %}{{ finding_row(f) }}{% endfor %}
- {% else %} [info]項目なし {% endif %}
+ {% else %} [info]項目なし {% endif %}
HTTP プロトコル対応
- | HTTP/1.1 | {% if http %}{{ yn(http.http1, '対応', '未対応') }}{% else %}—{% endif %} |
|---|
- | HTTP/2 | {% if http %}{{ yn(http.http2, '対応', '未対応') }}{% else %}—{% endif %} |
|---|
- | HTTP/3 (QUIC) | {% if http3 %}{{ yn(http3.supported, '対応', '未対応') }}{% if http3.error %} {{ http3.error }}{% endif %}{% else %}—{% endif %} |
|---|
- | ALPN | {% if alpn %}{{ alpn }}{% else %}—{% endif %} |
|---|
+ | HTTP/1.1 | {% if http %}{{ yn(http.http1, '対応', '未対応') }}{% else %}—{% endif %} |
|---|
+ | HTTP/2 | {% if http %}{{ yn(http.http2, '対応', '未対応') }}{% else %}—{% endif %} |
|---|
+ | HTTP/3 (QUIC) | {% if http3 %}{{ yn(http3.supported, '対応', '未対応') }}{% if http3.error %} {{ http3.error }}{% endif %}{% else %}—{% endif %} |
|---|
+ | ALPN | {% if alpn %}{{ alpn }}{% else %}—{% endif %} |
|---|
{% if http and http.server %}| Server | {{ http.server }} |
|---|
{% endif %}
{% if http and http.alt_svc %}| Alt-Svc | {{ http.alt_svc }} |
|---|
{% endif %}
@@ -357,7 +357,7 @@
{{ yn(s.connected, 'OK', 'Fail') }} |
{{ s.negotiated_version or '—' }} |
{{ s.negotiated_cipher or '—' }} |
- {{ s.error or '' }} |
+ {{ s.error or '' }} |
{% endfor %}
@@ -370,7 +370,7 @@
{% set findings = groups['compatibility'] %}
{% if findings %}{% for f in findings %}{{ finding_row(f) }}{% endfor %}
- {% else %} [info]項目なし {% endif %}
+ {% else %} [info]項目なし {% endif %}
- [{{ (e.phase or 'info')|replace('_','-')|lower }}]
- {{ e.detail or '' }}
-
+ [{{ (e.phase or 'info')|replace('_','-')|lower }}]
+ {{ e.detail or '' }}
+
{% else %}
{{ finding_row(e.finding) }}
{% endif %}
{% endfor %}
{% else %}
- [info]ログが記録されていません
+ [info]ログが記録されていません
{% endif %}
@@ -413,13 +413,13 @@
{{ h.finished_at_display or '—' }} |
{{ h.rank or '—' }} |
{{ "%.0f"|format(h.score or 0) }} |
- {{ h.id }} |
+ {{ h.id }} |
{% endfor %}
{% else %}
- [info]過去のテスト結果はありません
+ [info]過去のテスト結果はありません
{% endif %}
@@ -428,7 +428,7 @@
- GET /api/tools/tls-test/results/{{ test_id }}
+ GET /api/tools/tls-test/results/{{ test_id }}
{{ result | tojson(indent=2) }}
diff --git a/public/tools/tls-test/status.html b/public/tools/tls-test/status.html
index 1d13c40..8058122 100644
--- a/public/tools/tls-test/status.html
+++ b/public/tools/tls-test/status.html
@@ -9,21 +9,21 @@
{% block content %}
Nercone TLS Test
- {{ target }} のテストは実行中です。
+ {{ target }} のテストは実行中です。
- 待機中…
+ 待機中…
- テストID: {{ test_id }}
+ テストID: {{ test_id }}
{% for entry in progress_entries %}
- [{{ entry.phase }}]
+ [{{ entry.phase }}]
{{ entry.detail }}
{% endfor %}
diff --git a/src/nercone_website/tools/tls_test/schemas.py b/src/nercone_website/tools/tls_test/schemas.py
index 1abf9cb..68de8d1 100644
--- a/src/nercone_website/tools/tls_test/schemas.py
+++ b/src/nercone_website/tools/tls_test/schemas.py
@@ -17,7 +17,7 @@ SEVERITY_COLORS = {
"notgood": "bright-yellow",
"bad": "bright-red",
"serious": "bright-purple",
- "info": "tx-alt",
+ "info": "light-grey-alt",
}
# 4 main groups for the results UI tabs.
|
|---|