aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Rude <[email protected]>2018-02-04 02:19:51 -0600
committerMatt Rude <[email protected]>2018-02-04 02:19:51 -0600
commit043168573a7ec53dd61583bbcabd34b4a0587cce (patch)
treed54257d8bad4c0df46ae4c940e25047284c0d966
parentaa6027a82f3840989be22f5aeba9b23d7bf8955d (diff)
downloadxmpp-site-lite-043168573a7ec53dd61583bbcabd34b4a0587cce.tar.gz
xmpp-site-lite-043168573a7ec53dd61583bbcabd34b4a0587cce.tar.bz2
xmpp-site-lite-043168573a7ec53dd61583bbcabd34b4a0587cce.zip
more format upates
-rw-r--r--_config.yml9
-rw-r--r--_data/clienttypes.yml2
-rw-r--r--_data/features.yml2
-rw-r--r--_sass/site.scss14
-rw-r--r--certificates.md112
-rw-r--r--clients.html18
-rw-r--r--index.html2
7 files changed, 151 insertions, 8 deletions
diff --git a/_config.yml b/_config.yml
index ade5905..b046c25 100644
--- a/_config.yml
+++ b/_config.yml
@@ -39,17 +39,20 @@ xep-0387: 1 # XMPP Compliance Suites 2017
fingerprints: 1
fingerprint-expires: "Apr 30 00:01:14 2018 GMT"
+fingerprint-im-expires: "Mar 11 07:10:22 2018 GMT"
fingerprint-conference-expires: "Mar 11 07:10:22 2018 GMT"
fingerprint-proxy-expires: "Mar 11 07:10:22 2018 GMT"
-fingerprint-proxy-expires: "Mar 11 07:10:22 2018 GMT"
+fingerprint-upload-expires: "Mar 11 07:10:22 2018 GMT"
fingerprint-sha1: "5E:F9:B5:77:C3:26:3F:E5:A7:D0:33:65:EC:DC:7E:D2:20:26:1B:D4"
fingerprint-sha256: "8F:7D:29:8D:95:A7:87:32:49:13:CB:9C:38:46:6D:7A:AD:D0:B3:DD:78:A2:38:72:52:AE:75:7C:81:31:44:EF"
+fingerprint-im-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
+fingerprint-im-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
fingerprint-conference-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
fingerprint-conference-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
fingerprint-proxy-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
fingerprint-proxy-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
-fingerprint-proxy-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
-fingerprint-proxy-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
+fingerprint-upload-sha1: "FB:26:68:13:7E:B4:A8:E1:88:EF:5C:DD:74:D5:52:58:46:16:61:D4"
+fingerprint-upload-sha256: "23:4F:C1:82:71:CE:24:47:64:E9:EE:A2:75:5B:0A:D4:78:45:F3:B3:24:25:47:9E:D3:A2:D3:B5:FC:08:EB:D8"
# Analytics settings
#google_analytics_id: UA-9532791-9
diff --git a/_data/clienttypes.yml b/_data/clienttypes.yml
index a21750c..20d4b72 100644
--- a/_data/clienttypes.yml
+++ b/_data/clienttypes.yml
@@ -1,8 +1,10 @@
- name: Mobile
slug: mobile
+ icon: fa-mobile
- name: Destop/Laptop
slug: desktop
+ icon: fa-desktop
#- name: Server
# slug: server
diff --git a/_data/features.yml b/_data/features.yml
index e50d096..28fab97 100644
--- a/_data/features.yml
+++ b/_data/features.yml
@@ -48,7 +48,7 @@
- name: Security
section: security
- text: <ul><li>SSL/TLS encryption is <a href="https://github.com/stpeter/manifesto/blob/master/manifesto.txt">required</a> between clients and servers (C2S) and server to server (S2S) connections</li><li>The backend is configured to store hashed and salted authentication data</li><li>Use <a href="https://conversations.im/omemo/">OMEMO</a> or <a href="{{ site.url }}/help/definitions/#otr">Off-the-Record (OTR)</a> in your chat client to have fully encrypted chats</li></ul>
+ text: <ul><li>SSL/TLS encryption is <a href="https://github.com/stpeter/manifesto/blob/master/manifesto.txt">required</a> between clients and servers (C2S) and server to server (S2S) connections</li><li>The backend is configured to store hashed and salted authentication data</li><li>Use <a href="https://conversations.im/omemo/">OMEMO</a> or <a href="https://otr.cypherpunks.ca/">Off-the-Record (OTR)</a> in your chat client to have fully encrypted chats</li><li>You may also validate the servers <a href="/certificates/">TLS Certificates</a>.</li></ul>
- name: Policies
section: security
diff --git a/_sass/site.scss b/_sass/site.scss
index bf263aa..9ad7da2 100644
--- a/_sass/site.scss
+++ b/_sass/site.scss
@@ -39,6 +39,20 @@ a:hover {
text-decoration: underline;
}
+pre {
+ display: block;
+ padding: 9.5px;
+ margin: 0 0 10px;
+ font-size: 13px;
+ line-height: 1.42857143;
+ color: #f5f5f5;
+ word-break: break-all;
+ word-wrap: break-word;
+ background-color: #333;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+}
+
// Buttons
.btn-primary {
diff --git a/certificates.md b/certificates.md
new file mode 100644
index 0000000..ca5d465
--- /dev/null
+++ b/certificates.md
@@ -0,0 +1,112 @@
+---
+layout: default
+title: Server Certificates
+permalink: /certificates/
+---
+
+# Server Certificates
+One of the benefits of communicating via XMPP is the level of security involved. To allow users to validate the servers they are connecting to, below is the current fingerprints for each domain name.
+
+<div id="cert-table">
+<h2>{{ site.xmpp-url }}</h2>
+<p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-expires }})</small></p>
+{% if site.fingerprint-sha1 %}
+ <div class="cert-title">
+ <b>SHA1 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.fingerprint-sha256 %}
+ <div class="cert-title">
+ <b>SHA256 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-sha256 }}</pre>
+ </div>
+{% endif %}
+{% if site.xmpp-host %}
+<h2>{{ site.xmpp-host }}</h2>
+<p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-im-expires }})</small></p>
+{% if site.xmpp-host and site.fingerprint-im-sha1 %}
+ <div class="cert-title">
+ <b>SHA1 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-im-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.xmpp-host and site.fingerprint-im-sha256 %}
+ <div class="cert-title">
+ <b>SHA256 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-im-sha256 }}</pre>
+ </div>
+{% endif %}
+{% endif %}
+{% if site.xmpp-conference-url and site.xep-0045 == 1 %}
+<h2>{{ site.xmpp-conference-url }}</h2>
+<p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-conference-expires }})</small></p>
+{% if site.xmpp-conference-url and site.xep-0045 == 1 and site.fingerprint-conference-sha1 %}
+ <div class="cert-title">
+ <b>SHA1 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-conference-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.xmpp-conference-url and site.xep-0045 == 1 and site.fingerprint-conference-sha256 %}
+ <div class="cert-title">
+ <b>SHA256 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-conference-sha256 }}</pre>
+ </div>
+{% endif %}
+{% endif %}
+{% if site.xmpp-proxy-url and site.xep-0065 == 1 %}
+<h2>{{ site.xmpp-proxy-url }}</h2>
+<p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-proxy-expires }})</small></p>
+{% if site.xmpp-proxy-url and site.xep-0065 == 1 and site.fingerprint-proxy-sha1 %}
+ <div class="cert-title">
+ <b>SHA1 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-proxy-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.xmpp-proxy-url and site.xep-0065 == 1 and site.fingerprint-proxy-sha256 %}
+ <div class="cert-title">
+ <b>SHA256 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-proxy-sha256 }}</pre>
+ </div>
+{% endif %}
+{% endif %}
+{% if site.xmpp-upload-url and site.xep-0363 == 1 %}
+<h2>{{ site.xmpp-upload-url }}</h2>
+<p style="margin-top:-0.6em;"><small>(expires: {{ site.fingerprint-upload-expires }})</small></p>
+{% if site.xmpp-upload-url and site.xep-0363 == 1 and site.fingerprint-upload-sha1 %}
+ <div class="cert-title">
+ <b>SHA1 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-upload-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.xmpp-upload-url and site.xep-0363 == 1 and site.fingerprint-upload-sha256 %}
+ <div class="cert-title">
+ <b>SHA256 Fingerprint</b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-upload-sha256 }}</pre>
+ </div>
+{% endif %}
+{% endif %}
+</div> <!-- Closing cert-table id div -->
+
+<p style='text-align:right;'><a href="https://check.messaging.one/result.php?domain={{ site.xmpp-url }}&amp;type=server"><img src="https://check.messaging.one/badge.php?domain={{ site.xmpp-url }}" alt="check.messaging.one server score" /></a></p>
+
diff --git a/clients.html b/clients.html
index e2a3300..c44e9a3 100644
--- a/clients.html
+++ b/clients.html
@@ -4,11 +4,23 @@ title: XMPP Client List
permalink: /clients/
---
-<h1>XMPP Client List</h1>
+
+ <div class="jumbotron">
+ <div class="row">
+ <div class="col-md-4">
+ <center><span class="fa fa-cloud-download" style="font-size:100px;" aria-hidden="true"></span></center>
+ </div>
+ <div class="col-md-8 float-md-right site-title">
+ <h1>XMPP Client List</h1>
+ </div>
+ </div>
+ </div>
+
<div class="container offsetanchor" id="clients">
{% for type in site.data.clienttypes %}
- <center><h2 style="padding:20px 0;font-size:3em;">{{ type.name }}</h2></center>
+ <hr class="my-4">
+ <center><span class="fa {{ type.icon }}" style="font-size:100px;padding-top:70px;" aria-hidden="true"></span><h2 style="padding:20px 0;font-size:3em;">{{ type.name }}</h2></center>
<div class="row">
<div class="client-{{ type.slug }}">
<div class="row">
@@ -20,7 +32,7 @@ permalink: /clients/
<img class="card-img-top" src="{{ site.url }}/assets/img/clients/{{ client.img }}"/>
{% endif %}
<div class="card-body">
- <h3 class="card-title">{{ client.name }}</h3>
+ <center><h3 class="card-title">{{ client.name }}</h3></center>
<ul class="list-group-flush card-text" style="padding-left:unset;">
<li class="list-group-item"><b>Platform:</b> {{ client.platform }}</li>
<li class="list-group-item"><b>Encryption:</b> {{ client.encryption }}</li>
diff --git a/index.html b/index.html
index 7d0d183..b319f3d 100644
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@ permalink: /
protocol developed by an independent standards organization.</p>
<p>This service requires the use of a client to connect to the server with. Please see the
- <a href="{{ site.url }}/help/clients/">client list</a> for a small list of available clients that
+ <a href="{{ site.url }}/clients/">client list</a> for a small list of available clients that
may be used. My personal preferred clients are <a href="https://gajim.org/">Gajim</a> or
<a href="https://swift.im/">Swift</a> for desktop/laptops and <a href="https://conversations.im/">Conversations</a>
or <a href="https://chatsecure.org/">ChatSecure</a> for mobile.</p>