minor adjustments

2 files changed, 16 insertions, 11 deletions

diff --git a/client-web/source/index.ts b/client-web/source/index.ts
index e8bbc0b..7dfdb59 100644
--- a/client-web/source/index.ts
+++ b/client-web/source/index.ts
@@ -36,7 +36,7 @@ export async function main() {
     if (!globalThis.isSecureContext) log({ scope: "*", warn: true }, "This page is not in a 'Secure Context'")
     if (!globalThis.crypto.subtle) return log({ scope: "crypto", error: true }, "SubtleCrypto not availible")
     if (room_name.length < 8) log({ scope: "crypto", warn: true }, "Room name is very short. e2ee is insecure!")
-    if (room_name.length == 0) window.location.href = "/" // send them back to the start page
+    if (room_name.length == 0) return window.location.href = "/" // send them back to the start page
     if (PREFS.warn_redirect) log({ scope: "crypto", warn: true }, "You were redirected from the old URL format. The server knows you room name now - e2ee is insecure!")
 
     const conn = await (new SignalingConnection().connect(room_name))
diff --git a/client-web/source/protocol/crypto.ts b/client-web/source/protocol/crypto.ts
index 79b7e1d..654e80b 100644
--- a/client-web/source/protocol/crypto.ts
+++ b/client-web/source/protocol/crypto.ts
@@ -56,16 +56,21 @@ export async function crypto_encrypt(key: CryptoKey, data: string): Promise<stri
 }
 
 export async function crypt_decrypt(key: CryptoKey, data: string): Promise<string> {
-    const buf = base64_to_buf(data);
-    const iv = buf.slice(0, IV_LENGTH);
-    const ciphertext = buf.slice(IV_LENGTH);
-    const decryptedContent = await window.crypto.subtle.decrypt(
-        { name: "AES-GCM", iv },
-        key,
-        ciphertext
-    );
-    const plain = new TextDecoder().decode(decryptedContent);
-    return plain
+    try {
+        const buf = base64_to_buf(data);
+        const iv = buf.slice(0, IV_LENGTH);
+        const ciphertext = buf.slice(IV_LENGTH);
+        const decryptedContent = await window.crypto.subtle.decrypt(
+            { name: "AES-GCM", iv },
+            key,
+            ciphertext
+        );
+        const plain = new TextDecoder().decode(decryptedContent);
+        return plain
+    } catch (_e) {
+        log({ scope: "crypto", warn: true }, "unable to decrypt")
+        return "{}" // :)
+    }
 }
 
 export function base64_to_buf(data: string): Uint8Array {