Merge branch 'master' into ad/version

Libera-Chat · Apr 15, 2024 · d4c7a91 · d4c7a91
2 parents bfe909d + 901b26b
commit d4c7a91
Show file tree

Hide file tree

Showing 98 changed files with 2,703 additions and 1,081 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,5 +13,4 @@ members = [
 
 # Incremental builds break inventory
 [profile.dev]
-incremental = false
 panic = "abort"
diff --git a/client_listener/src/connection.rs b/client_listener/src/connection.rs
@@ -6,6 +6,7 @@ use std::net::IpAddr;
 use tokio::sync::mpsc::UnboundedSender;
 
 /// A connection being managed by the worker process.
+#[derive(Debug)]
 pub struct Connection {
     pub id: ConnectionId,
     pub tls_info: Option<TlsInfo>,

diff --git a/configs/mgmt.pem b/configs/mgmt.pem
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 4110 (0x100e)
+        Serial Number: 4115 (0x1013)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=GB, ST= , O= , CN=Test CA
         Validity
-            Not Before: May 17 21:36:25 2023 GMT
-            Not After : May 15 21:36:25 2028 GMT
+            Not Before: Feb  4 06:55:13 2024 GMT
+            Not After : Feb  2 06:55:13 2029 GMT
         Subject: O=test, CN=user1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -44,39 +44,39 @@ Certificate:
                 keyid:59:7A:09:B8:DA:B7:DB:E4:09:82:F5:79:2A:54:B8:C6:E6:7B:1B:0A
 
     Signature Algorithm: sha256WithRSAEncryption
-         68:76:cd:fc:59:f1:93:f2:58:62:e0:fd:83:16:8d:ce:39:5c:
-         b5:8f:38:5e:83:ce:04:7f:ae:ec:f9:5e:4a:e8:25:77:82:5b:
-         b3:a5:82:c8:bf:f9:5e:99:ba:75:86:b4:52:20:21:e3:45:71:
-         6d:80:99:37:77:8e:f9:50:9c:2e:04:19:10:e8:e8:03:6d:4a:
-         62:8a:df:52:37:84:e9:8d:34:42:c1:17:a3:b6:be:84:3a:97:
-         ea:ed:ab:31:8a:78:da:bf:ac:6d:49:3c:4c:be:ea:18:63:d5:
-         2d:35:bd:11:81:bf:ae:0e:75:51:2a:86:d9:e8:1e:61:aa:cb:
-         85:0f:88:88:ff:8f:55:61:c8:d6:97:eb:2a:f1:e7:74:9c:7f:
-         3e:e0:6b:21:fb:8f:5a:15:d3:d0:11:6b:6a:55:77:c1:a5:7d:
-         43:cd:24:62:25:49:e2:f9:c4:8e:2e:13:8e:76:54:f1:c9:68:
-         71:41:6a:26:ea:bf:5c:f8:e3:cf:6d:11:4d:d5:92:e9:c4:4f:
-         f7:60:2f:a7:b5:30:56:f5:39:9a:4c:9c:1a:03:c1:28:2e:3d:
-         95:1a:59:83:54:fb:8f:b8:30:45:95:35:4a:e1:9d:79:c9:fb:
-         df:d1:44:1b:cb:3d:25:1b:85:e5:38:25:a5:19:83:23:18:80:
-         87:a1:ae:d5:02:01:23:0d:84:69:91:78:35:84:d2:f2:da:3c:
-         6e:a2:55:3b:f1:3e:ae:0b:ec:62:e8:e7:2c:72:de:bd:b0:b1:
-         9a:c1:73:81:e8:42:17:1e:32:5c:d2:49:70:ce:07:cd:bc:24:
-         05:10:f9:e4:64:1f:7a:89:ce:66:94:5d:f9:ef:75:34:76:c5:
-         ab:3d:86:7f:f8:52:0d:75:30:37:29:cb:2b:3a:5f:a2:e3:b3:
-         9a:bd:b6:c5:2e:de:3f:47:79:28:7b:e4:86:ec:07:6b:d8:7b:
-         cd:74:e2:23:e9:95:3d:d5:b4:39:f6:c2:f6:f5:0f:0c:8e:25:
-         b6:14:0f:08:2f:5c:4b:5b:a5:af:73:39:49:47:8b:7a:77:cc:
-         73:8c:2e:65:b3:3c:29:20:11:62:1c:c0:d5:a5:c5:5a:dc:83:
-         39:d8:24:b6:be:b2:d8:52:ee:40:d3:07:4c:5f:53:7e:34:85:
-         ad:8d:a1:62:88:4a:99:35:c3:ff:cc:de:71:38:5c:b7:4e:52:
-         81:19:9d:8f:db:81:93:c9:4b:2e:76:4d:9f:97:7d:5f:24:bf:
-         3e:6c:73:aa:68:a5:9a:e9:43:4c:1d:0d:20:2f:b4:30:d3:1b:
-         28:c8:d1:43:78:26:71:88:1d:97:42:a8:72:1e:ec:db:5a:32:
-         d9:4b:80:1e:dc:b0:b0:b3
+         81:98:30:47:62:54:c6:97:b6:c6:fd:90:76:71:a1:52:30:7c:
+         ff:82:f6:3d:17:b0:2a:10:75:4f:2b:bf:55:a6:2c:c7:ff:b1:
+         60:56:c6:b2:3c:2d:d9:b0:09:9b:f1:f4:b9:1e:0b:13:31:b2:
+         01:5b:56:3a:b1:9d:ca:76:ec:f7:00:fb:7c:09:b0:7c:fe:b3:
+         ab:3d:f1:7a:8f:da:88:eb:3e:42:5d:3b:9e:80:53:35:cb:99:
+         2e:aa:e8:c4:16:52:dd:79:b5:54:61:37:ae:01:33:d1:13:e9:
+         54:0f:18:6a:10:53:96:f2:cf:cd:d4:f3:2e:73:89:d7:32:4c:
+         c4:26:ee:3c:cf:45:0a:93:5f:6c:98:24:14:97:ef:8b:f2:d4:
+         68:f1:f7:3c:8d:f9:c9:95:02:28:74:e1:e7:7e:66:d6:a4:02:
+         f4:bc:e9:c2:81:c2:ff:9e:28:2a:fd:32:14:72:95:c8:3f:d5:
+         6e:da:06:c9:e5:20:a6:34:ff:d7:59:b8:6b:3d:7b:e1:ef:a2:
+         49:be:33:99:50:5d:66:04:28:5f:b7:e8:97:a4:58:4f:f5:49:
+         6d:0d:06:b6:73:74:23:6d:c5:ca:9f:64:9b:2e:9f:8b:9b:fd:
+         30:8b:bf:cb:1c:99:59:40:d3:46:5a:26:81:89:0f:ab:20:85:
+         b3:11:63:46:6f:78:a3:a6:46:ba:b6:67:78:d9:53:f6:7a:67:
+         45:0c:dc:3c:9d:ba:8b:eb:bf:2f:5b:04:61:bb:37:af:98:24:
+         39:ba:df:01:b2:c0:4d:bc:1b:6a:7c:db:2b:31:5a:69:ee:c4:
+         db:04:fa:11:16:12:bf:5c:06:a9:f3:01:5f:f5:e1:f4:13:af:
+         fe:4e:21:6e:2d:31:44:0a:66:93:7d:77:8a:10:5f:53:5e:87:
+         84:35:28:54:ee:bb:d5:97:2c:b9:de:eb:78:b9:f3:70:55:6e:
+         f9:12:38:a0:f9:f3:a4:5b:35:e0:ea:54:e2:4b:32:d9:92:a2:
+         d8:97:30:c2:25:23:70:f6:9e:40:c4:bb:7b:e4:e6:73:49:85:
+         8c:41:f6:b7:ce:01:64:7c:f3:90:3e:33:32:e0:c4:b2:e2:e8:
+         8d:ae:6b:cf:07:d1:a3:a8:24:47:b3:df:1c:7d:45:83:08:18:
+         15:9c:82:f2:05:0e:70:1a:50:5d:5b:f1:29:43:cd:fe:19:e1:
+         ea:e2:e0:c0:37:54:b1:28:63:e4:c5:a1:70:d6:c3:52:5c:2d:
+         2e:63:af:ba:49:80:6b:4b:5c:e3:3a:1f:c0:70:30:6b:24:e0:
+         2e:ca:17:b2:f0:ec:bd:0f:fd:d3:1c:b1:65:56:41:50:6f:c0:
+         50:f4:43:20:f0:b2:5c:f5
 -----BEGIN CERTIFICATE-----
-MIIEYjCCAkqgAwIBAgICEA4wDQYJKoZIhvcNAQELBQAwNzELMAkGA1UEBhMCR0Ix
-CjAIBgNVBAgMASAxCjAIBgNVBAoMASAxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjMw
-NTE3MjEzNjI1WhcNMjgwNTE1MjEzNjI1WjAfMQ0wCwYDVQQKDAR0ZXN0MQ4wDAYD
+MIIEYjCCAkqgAwIBAgICEBMwDQYJKoZIhvcNAQELBQAwNzELMAkGA1UEBhMCR0Ix
+CjAIBgNVBAgMASAxCjAIBgNVBAoMASAxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjQw
+MjA0MDY1NTEzWhcNMjkwMjAyMDY1NTEzWjAfMQ0wCwYDVQQKDAR0ZXN0MQ4wDAYD
 VQQDDAV1c2VyMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGatH7Q
 +oZbnWHTfjxihtyXjo1WbzR30lsKhVMnERR7+R+E92YUQ793wsKO20dc5ZRTovUu
 fa7VrEuV/0fDgsrUmUPczoLSNh5XhIg0A/qviJuiCymOo43eGJ9GKAoTFvoidM5O
@@ -86,16 +86,16 @@ n3/ciU7eK8iVGgXz/MNLgTX4iQ3QOxZNHmBqyD+Ja0Q7g9SA6+xzlTb2TcYWo7oQ
 9j0SrisRn3p1o4cCAwEAAaOBjzCBjDAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQE
 AwIGwDAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
 dGUwHQYDVR0OBBYEFIRMS/uKpUYeaXbIIy3IG6BwxD88MB8GA1UdIwQYMBaAFFl6
-Cbjat9vkCYL1eSpUuMbmexsKMA0GCSqGSIb3DQEBCwUAA4ICAQBods38WfGT8lhi
-4P2DFo3OOVy1jzheg84Ef67s+V5K6CV3gluzpYLIv/lembp1hrRSICHjRXFtgJk3
-d475UJwuBBkQ6OgDbUpiit9SN4TpjTRCwRejtr6EOpfq7asxinjav6xtSTxMvuoY
-Y9UtNb0Rgb+uDnVRKobZ6B5hqsuFD4iI/49VYcjWl+sq8ed0nH8+4Gsh+49aFdPQ
-EWtqVXfBpX1DzSRiJUni+cSOLhOOdlTxyWhxQWom6r9c+OPPbRFN1ZLpxE/3YC+n
-tTBW9TmaTJwaA8EoLj2VGlmDVPuPuDBFlTVK4Z15yfvf0UQbyz0lG4XlOCWlGYMj
-GICHoa7VAgEjDYRpkXg1hNLy2jxuolU78T6uC+xi6Ocsct69sLGawXOB6EIXHjJc
-0klwzgfNvCQFEPnkZB96ic5mlF3573U0dsWrPYZ/+FINdTA3KcsrOl+i47OavbbF
-Lt4/R3koe+SG7Adr2HvNdOIj6ZU91bQ59sL29Q8MjiW2FA8IL1xLW6WvczlJR4t6
-d8xzjC5lszwpIBFiHMDVpcVa3IM52CS2vrLYUu5A0wdMX1N+NIWtjaFiiEqZNcP/
-zN5xOFy3TlKBGZ2P24GTyUsudk2fl31fJL8+bHOqaKWa6UNMHQ0gL7Qw0xsoyNFD
-eCZxiB2XQqhyHuzbWjLZS4Ae3LCwsw==
+Cbjat9vkCYL1eSpUuMbmexsKMA0GCSqGSIb3DQEBCwUAA4ICAQCBmDBHYlTGl7bG
+/ZB2caFSMHz/gvY9F7AqEHVPK79VpizH/7FgVsayPC3ZsAmb8fS5HgsTMbIBW1Y6
+sZ3Kduz3APt8CbB8/rOrPfF6j9qI6z5CXTuegFM1y5kuqujEFlLdebVUYTeuATPR
+E+lUDxhqEFOW8s/N1PMuc4nXMkzEJu48z0UKk19smCQUl++L8tRo8fc8jfnJlQIo
+dOHnfmbWpAL0vOnCgcL/nigq/TIUcpXIP9Vu2gbJ5SCmNP/XWbhrPXvh76JJvjOZ
+UF1mBChft+iXpFhP9UltDQa2c3QjbcXKn2SbLp+Lm/0wi7/LHJlZQNNGWiaBiQ+r
+IIWzEWNGb3ijpka6tmd42VP2emdFDNw8nbqL678vWwRhuzevmCQ5ut8BssBNvBtq
+fNsrMVpp7sTbBPoRFhK/XAap8wFf9eH0E6/+TiFuLTFECmaTfXeKEF9TXoeENShU
+7rvVlyy53ut4ufNwVW75Ejig+fOkWzXg6lTiSzLZkqLYlzDCJSNw9p5AxLt75OZz
+SYWMQfa3zgFkfPOQPjMy4MSy4uiNrmvPB9GjqCRHs98cfUWDCBgVnILyBQ5wGlBd
+W/EpQ83+GeHq4uDAN1SxKGPkxaFw1sNSXC0uY6+6SYBrS1zjOh/AcDBrJOAuyhey
+8Oy9D/3THLFlVkFQb8BQ9EMg8LJc9Q==
 -----END CERTIFICATE-----
diff --git a/configs/network.conf b/configs/network.conf
@@ -3,8 +3,8 @@
     "ca_file": "configs/ca_cert.pem",
 
     "peers": [
-        { "name": "server1.test", "address": "127.0.1.2:6668", "fingerprint": "961090b178e037be12a77c0a83876740e3222abd" },
-        { "name": "server2.test", "address": "127.0.1.3:6668", "fingerprint": "000fd90df3da5619563eb49228229ac410acc09c" },
-        { "name": "services.test", "address": "127.0.1.4:6668", "fingerprint": "95806a3b9b14d0bf47521368d9d1f13a5df89cde" },
+        { "name": "server1.test", "address": "127.0.1.2:6668", "fingerprint": "1e73e460163a89fcadfd9acbc8fc115d6e4f3a81" },
+        { "name": "server2.test", "address": "127.0.1.3:6668", "fingerprint": "8bd6fbb218ddb36ec5f649f4243ece12777b572a" },
+        { "name": "services.test", "address": "127.0.1.4:6668", "fingerprint": "e42729000055e11e51056bacc34aa4c45d8defcc" },
     ]
 }
diff --git a/configs/server1.conf b/configs/server1.conf
@@ -6,7 +6,7 @@
         "address": "127.0.1.2:8888",
         "client_ca": "configs/ca_cert.pem",
         "authorised_fingerprints": [
-            { "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" },
+            { "name": "user1", "fingerprint": "3ff8bb5419e2a3461cf53bf5679db4d05ef09c36" },
         ],
     },
 
@@ -61,7 +61,7 @@
         "targets": [
             {
                 "target": "stdout",
-                "level": "trace",
+                "level": "debug",
                 "modules": [ "sable", "audit" ],
             },
             {

diff --git a/configs/server1.pem b/configs/server1.pem
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 4107 (0x100b)
+        Serial Number: 4119 (0x1017)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=GB, ST= , O= , CN=Test CA
         Validity
-            Not Before: Dec  1 15:12:43 2022 GMT
-            Not After : Dec  1 15:12:43 2023 GMT
+            Not Before: Feb  4 06:59:31 2024 GMT
+            Not After : Feb  2 06:59:31 2029 GMT
         Subject: C=GB, ST= , O= , OU= , CN=server1.test
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -52,39 +52,39 @@ Certificate:
             X509v3 Subject Alternative Name: 
                 DNS:server1.test
     Signature Algorithm: sha256WithRSAEncryption
-         10:23:e6:d1:a6:5c:0f:82:9e:26:53:24:b6:21:a6:b4:9d:e6:
-         6d:6d:6b:88:fb:5a:25:ef:c9:46:9d:7e:96:cb:7d:bb:f1:79:
-         38:5f:98:ae:09:9f:78:a3:20:4f:2a:8e:68:38:f0:e9:38:d2:
-         21:2e:49:ec:92:cc:de:4f:5d:ac:bc:3c:bf:0b:d7:62:28:3c:
-         98:a6:06:1b:fc:88:05:f1:25:e4:50:2b:a4:f0:d0:02:ce:1c:
-         75:d7:a1:8e:68:a1:a3:1c:85:b4:cf:de:db:59:83:fd:e9:54:
-         4a:1e:97:b3:e8:1a:78:13:5d:22:84:92:22:9a:1e:fb:d2:49:
-         6d:5d:a5:a4:10:4b:f8:51:aa:38:59:37:38:6a:09:01:20:f8:
-         68:03:e9:1d:5e:8f:84:65:20:4b:e5:02:c6:24:cd:28:5d:c9:
-         a9:dc:87:db:f7:83:c9:34:ec:ef:f5:27:72:23:21:4f:03:dd:
-         a9:38:5a:be:08:86:bc:2a:29:bc:27:46:60:dd:a3:cf:98:d4:
-         16:0f:df:9b:42:ea:8e:97:10:53:9b:1c:28:f3:ba:5e:87:81:
-         ce:3f:2e:01:2c:17:13:55:ca:d0:85:20:e7:71:19:18:0b:37:
-         ba:f8:26:56:ce:40:3d:19:43:bd:6e:19:34:26:5c:d6:c8:52:
-         19:56:ee:ec:96:49:a8:3a:3f:c8:fc:2f:6f:85:1f:aa:71:0a:
-         fa:13:e9:17:2e:4d:bc:9c:c2:75:b9:7e:d4:b2:92:2b:3d:35:
-         94:92:54:fd:e9:40:7c:bd:1c:bb:2f:6e:d0:31:d6:d1:ec:13:
-         16:d4:53:70:15:a5:d9:86:10:e5:50:0e:84:97:03:d8:0b:f4:
-         b6:a0:f4:b0:0e:0c:54:92:11:88:28:4e:b0:89:fa:43:06:22:
-         18:93:81:5c:4e:9d:84:a3:b9:4b:fb:05:86:e5:24:d8:0b:ae:
-         49:1f:ca:89:d0:c4:9d:0c:d0:08:af:88:dc:e0:5b:00:54:bc:
-         59:7d:21:97:f4:02:b6:2d:5f:57:b9:b7:e3:b5:0a:b2:dd:90:
-         e6:3f:47:f8:38:83:09:09:a4:7e:f2:3b:7c:9f:09:a5:b9:d1:
-         03:aa:17:73:b1:ca:76:0b:fd:f7:04:c3:5a:a6:00:85:1a:fe:
-         7f:97:b5:1f:a4:c6:cf:3d:7c:07:18:73:18:0c:6f:77:4b:51:
-         28:b5:b9:19:67:1f:98:7f:9e:1c:09:60:db:80:33:53:14:24:
-         d7:39:01:fb:db:9a:06:82:b2:d1:7c:38:39:62:64:b7:d0:d8:
-         35:de:75:30:01:98:44:ca:69:86:4e:39:64:29:68:83:50:10:
-         1c:4e:f5:d1:53:c3:63:7d
+         b9:5c:4d:24:7e:d2:f5:aa:cb:7c:f3:7c:d8:9c:73:6a:9a:9b:
+         67:b7:10:1e:50:15:17:1d:29:85:41:5f:f5:d6:d5:60:20:7e:
+         de:20:f6:49:56:e4:07:f9:9f:c5:44:e3:fa:e8:d9:14:e1:f3:
+         a4:be:9f:66:89:28:40:98:fb:30:9c:5a:52:d0:5a:8c:30:3f:
+         6a:a8:8b:47:37:21:f0:13:c7:77:5c:2f:a4:21:e7:63:87:c5:
+         00:b6:9d:c6:43:6c:92:97:db:3e:05:d5:51:77:a0:a4:ba:8d:
+         bb:03:85:a7:f0:3b:bd:f4:0f:57:f8:63:9e:b5:de:87:86:4d:
+         54:74:62:f0:6c:8c:8e:1d:a6:7a:9d:01:39:b0:e1:79:2a:77:
+         33:fb:75:0c:43:4d:b6:7f:a7:f8:e5:2e:b0:04:0c:05:fc:64:
+         a1:2c:de:fd:c9:03:21:bb:ad:77:9a:a1:bc:dc:21:33:46:88:
+         15:4c:58:13:81:44:52:56:c3:02:f7:6d:6d:31:46:3b:48:ed:
+         c3:48:88:20:92:39:51:b6:92:89:35:d5:f5:8d:e6:f3:1e:7d:
+         c7:17:48:77:c8:d0:03:29:8f:19:3b:6d:f7:15:30:f7:90:1e:
+         8a:1b:f3:44:d6:7b:2d:97:83:71:4f:c5:79:23:aa:c6:94:b0:
+         40:d3:9f:6a:d1:9f:57:49:f6:40:c5:d2:cf:ea:0a:7a:d8:1d:
+         5f:0a:32:39:4c:f0:3c:62:76:ce:6a:aa:f6:d9:64:35:d1:fd:
+         58:1a:5f:f6:41:cd:a5:12:58:c3:56:2a:c6:5b:a7:54:1b:66:
+         31:88:0b:5d:3b:f2:69:9f:44:65:99:97:0e:34:94:ec:26:cc:
+         e4:85:ac:1a:5c:a5:50:2d:90:b8:e9:81:96:6b:a5:35:6f:f1:
+         5c:ce:42:62:98:62:5f:8b:ac:01:46:c8:1c:f1:86:36:df:a1:
+         17:4a:7d:2b:9a:8d:60:b2:12:b8:96:17:80:59:72:d4:d7:a7:
+         0c:e9:ec:d8:d6:c2:cd:99:a9:b0:d3:32:16:a2:ff:29:88:e3:
+         41:21:38:03:82:59:8b:05:68:5c:77:ae:28:80:bb:1b:6b:27:
+         aa:07:c4:62:67:36:72:81:eb:b2:cb:9a:83:6b:62:d0:3d:2a:
+         b0:81:f1:e1:5d:5e:49:bc:31:fc:6c:dc:ba:55:fd:0b:70:ab:
+         03:86:a9:1e:f3:9b:44:27:fa:57:a4:fb:80:db:c5:53:2c:a1:
+         71:77:93:38:0b:6f:33:17:1b:fd:b2:b6:77:34:b6:39:fa:6e:
+         bf:35:ad:7a:69:59:9b:4e:6b:b7:79:02:c1:e9:1a:cf:fc:16:
+         36:b7:61:4d:84:97:83:00
 -----BEGIN CERTIFICATE-----
-MIIFFjCCAv6gAwIBAgICEAswDQYJKoZIhvcNAQELBQAwNzELMAkGA1UEBhMCR0Ix
-CjAIBgNVBAgMASAxCjAIBgNVBAoMASAxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjIx
-MjAxMTUxMjQzWhcNMjMxMjAxMTUxMjQzWjBIMQswCQYDVQQGEwJHQjEKMAgGA1UE
+MIIFFjCCAv6gAwIBAgICEBcwDQYJKoZIhvcNAQELBQAwNzELMAkGA1UEBhMCR0Ix
+CjAIBgNVBAgMASAxCjAIBgNVBAoMASAxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjQw
+MjA0MDY1OTMxWhcNMjkwMjAyMDY1OTMxWjBIMQswCQYDVQQGEwJHQjEKMAgGA1UE
 CAwBIDEKMAgGA1UECgwBIDEKMAgGA1UECwwBIDEVMBMGA1UEAwwMc2VydmVyMS50
 ZXN0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwQ2J3F7sRNYnuypW
 mOkCUCBX9xpj9xIZptCFPuGdhUCBoe06tz5nBP6tPJphw0rVTaH9g6nWXg3Z+Q3a
@@ -98,16 +98,16 @@ zdLj4aYirYDUijEfVS4lftMbfpVJS7ysW1Elr/C6qyATVmP4p/jLRXzcuB7iCTJR
 CsBZiPyC21ECer+J3CftU9Z2gXzDA8hxhu8bGLw2Em+r5nFivl6J2S2dw6A7YKG9
 x1i14KF+gqj8o1FLRArXfEIie4GRH6ak57PPgkmvxa222p6Orl7j7t0RBP9XEOj+
 /+sVUV/N+DAOncY7/AbWxstyQxMCAwEAAaMbMBkwFwYDVR0RBBAwDoIMc2VydmVy
-MS50ZXN0MA0GCSqGSIb3DQEBCwUAA4ICAQAQI+bRplwPgp4mUyS2Iaa0neZtbWuI
-+1ol78lGnX6Wy3278Xk4X5iuCZ94oyBPKo5oOPDpONIhLknskszeT12svDy/C9di
-KDyYpgYb/IgF8SXkUCuk8NACzhx116GOaKGjHIW0z97bWYP96VRKHpez6Bp4E10i
-hJIimh770kltXaWkEEv4Uao4WTc4agkBIPhoA+kdXo+EZSBL5QLGJM0oXcmp3Ifb
-94PJNOzv9SdyIyFPA92pOFq+CIa8Kim8J0Zg3aPPmNQWD9+bQuqOlxBTmxwo87pe
-h4HOPy4BLBcTVcrQhSDncRkYCze6+CZWzkA9GUO9bhk0JlzWyFIZVu7slkmoOj/I
-/C9vhR+qcQr6E+kXLk28nMJ1uX7UspIrPTWUklT96UB8vRy7L27QMdbR7BMW1FNw
-FaXZhhDlUA6ElwPYC/S2oPSwDgxUkhGIKE6wifpDBiIYk4FcTp2Eo7lL+wWG5STY
-C65JH8qJ0MSdDNAIr4jc4FsAVLxZfSGX9AK2LV9XubfjtQqy3ZDmP0f4OIMJCaR+
-8jt8nwmludEDqhdzscp2C/33BMNapgCFGv5/l7UfpMbPPXwHGHMYDG93S1EotbkZ
-Zx+Yf54cCWDbgDNTFCTXOQH725oGgrLRfDg5YmS30Ng13nUwAZhEymmGTjlkKWiD
-UBAcTvXRU8NjfQ==
+MS50ZXN0MA0GCSqGSIb3DQEBCwUAA4ICAQC5XE0kftL1qst883zYnHNqmptntxAe
+UBUXHSmFQV/11tVgIH7eIPZJVuQH+Z/FROP66NkU4fOkvp9miShAmPswnFpS0FqM
+MD9qqItHNyHwE8d3XC+kIedjh8UAtp3GQ2ySl9s+BdVRd6Ckuo27A4Wn8Du99A9X
++GOetd6Hhk1UdGLwbIyOHaZ6nQE5sOF5Kncz+3UMQ022f6f45S6wBAwF/GShLN79
+yQMhu613mqG83CEzRogVTFgTgURSVsMC921tMUY7SO3DSIggkjlRtpKJNdX1jebz
+Hn3HF0h3yNADKY8ZO233FTD3kB6KG/NE1nstl4NxT8V5I6rGlLBA059q0Z9XSfZA
+xdLP6gp62B1fCjI5TPA8YnbOaqr22WQ10f1YGl/2Qc2lEljDVirGW6dUG2YxiAtd
+O/Jpn0RlmZcONJTsJszkhawaXKVQLZC46YGWa6U1b/FczkJimGJfi6wBRsgc8YY2
+36EXSn0rmo1gshK4lheAWXLU16cM6ezY1sLNmamw0zIWov8piONBITgDglmLBWhc
+d64ogLsbayeqB8RiZzZygeuyy5qDa2LQPSqwgfHhXV5JvDH8bNy6Vf0LcKsDhqke
+85tEJ/pXpPuA28VTLKFxd5M4C28zFxv9srZ3NLY5+m6/Na16aVmbTmu3eQLB6RrP
+/BY2t2FNhJeDAA==
 -----END CERTIFICATE-----
diff --git a/configs/server2.conf b/configs/server2.conf
@@ -6,7 +6,7 @@
         "address": "127.0.1.3:8888",
         "client_ca": "configs/ca_cert.pem",
         "authorised_fingerprints": [
-            { "name": "user1", "fingerprint": "435bc6db9f22e84ba5d9652432154617c9509370" },
+            { "name": "user1", "fingerprint": "3ff8bb5419e2a3461cf53bf5679db4d05ef09c36" },
         ],
     },