encrpyted rooms work

Author: AtHeartEngineer

package-lock.json

@@ -72,7 +72,7 @@
 		"date-fns": "^2.30.0",
 		"discreetly-interfaces": "^0.1.42",
 		"dompurify": "^3.0.5",
-		"idc-nullifier": "^0.0.6",
+		"idc-nullifier": "^0.0.8",
 		"libsodium-wrappers": "^0.7.11",
 		"marked": "^7.0.5",
 		"minidenticons": "^4.2.0",
@@ -86,4 +86,4 @@
 		"wagmi": "^1.4.3",
 		"zuauth": "^0.3.0"
 	}
-}
+}

package.json

@@ -63,7 +63,6 @@
 				loadingRooms = true;
 				getEthAddressRoomNames($selectedServer, address)
 					.then((groupNames) => {
-						console.log(groupNames);
 						loadingRooms = false;
 						groups = groupNames;
 					})
@@ -84,8 +83,7 @@
 		<h3 class="h4 mb-2"><span class="text-success-500">Step 1:</span> Connect your wallet</h3>
 		<button
 			bind:this={btnEl}
-			class="btn variant-outline-tertiary">Connect</button
-		>
+			class="btn variant-outline-tertiary">Connect</button>
 	</div>
 	{#if isConnected}
 		<div>
@@ -106,8 +104,7 @@
 				<button
 					on:click={proveOwnership}
 					id="btn"
-					class="btn variant-outline-success">Sign</button
-				>
+					class="btn variant-outline-success">Sign</button>
 			</div>
 		{:else if loadingRooms}
 			<p>Loading rooms...</p>

src/lib/components/Gateways/EthereumGroup.svelte

@@ -20,7 +20,7 @@
 				}
 			})
 			.catch((err) => {
-				console.log(err);
+				console.warn(err);
 				alertQueue.enqueue(`Unexpected error: ${err.message}`, 'error');
 			})
 			.finally(() => {
@@ -90,26 +90,23 @@
 {#if !hideInput}
 	<label
 		class="label"
-		for="inviteCode"
-	>
+		for="inviteCode">
 		<span class="h5">Enter Invite Code:</span>
 		<input
 			class="input"
 			type="text"
 			placeholder="Invite Code"
 			id="inviteCode"
 			bind:value={code}
-			on:keydown={(event) => inviteCodeKeyPress(event)}
-		/>
+			on:keydown={(event) => inviteCodeKeyPress(event)} />
 	</label>
 {/if}
 {#if !loading}
 	<button
 		class="btn variant-ghost-success mt-3"
 		type="button"
 		disabled={!code}
-		on:click={() => addCode(code)}>{buttonText}</button
-	>
+		on:click={() => addCode(code)}>{buttonText}</button>
 {:else}
 	<div class="text-primary">Going Anon, please wait...</div>
 	<Loading />
@@ -120,8 +117,7 @@
 		<div>
 			If you are having trouble and would like help, please message us on <a
 				href="https://discord.gg/brJQ36KVxk"
-				class="underline link">Discord</a
-			>
+				class="underline link">Discord</a>
 		</div>
 	</aside>
 {/if}

src/lib/components/Gateways/InviteCode.svelte

@@ -16,7 +16,7 @@
 				}
 			})
 			.catch((err) => {
-				console.log(err);
+				console.warn(err);
 				alertQueue.enqueue(`Unexpected error: ${err.message}`, 'error');
 			})
 			.finally(() => {
@@ -55,9 +55,7 @@
 				class="px-2"
 				name="the-word-proof.json"
 				bind:files
-				on:change={onChangeHandler}
-			/></label
-		>
+				on:change={onChangeHandler} /></label>
 	</section>
 	{#if loading}
 		<Loading />

src/lib/components/Gateways/TheWord.svelte

@@ -132,7 +132,7 @@ async function genProof(
 	);
 
 	const proof = prover.generateProof(proofInputs).then((proof: RLNFullProof) => {
-		console.log('Proof generated!');
+		console.info('Proof generated!');
 		const msg: MessageI = {
 			messageId: proof.snarkProof.publicSignals.nullifier.toString(),
 			message: message,

src/lib/crypto/rlnProver.ts

@@ -128,3 +128,23 @@ export async function getAuth(
 		throw new Error(`Failed to post to ${url}`);
 	}
 }
+
+/**
+ * @description - makes a get request to the api
+ * @param {string[] | string} urlParts - the url parts to be joined to form the url
+ * @param {object} data - the data to be sent to the api
+ * @returns {object} - the response from the api
+ * @throws {Error} - if the request fails
+ */
+export async function postRaw(urlParts: string[] | string, data: object): Promise<Response> {
+	const url = cleanURL(urlParts);
+	const res = await fetch(url, {
+		method: 'POST',
+		headers: {
+			'Access-Control-Allow-Origin': '*',
+			'Content-Type': 'application/json'
+		},
+		body: JSON.stringify(data)
+	});
+	return res;
+}

src/lib/services/api.ts

@@ -2,7 +2,7 @@ import type { MessageI, ServerI } from 'discreetly-interfaces';
 import type { IdentityStoreI, Invites, JoinResponseI, JubmojiProofI, RoomI } from '$lib/types';
 import { Prover } from 'idc-nullifier';
 import type { Identity } from '@semaphore-protocol/identity';
-import { get, getAuth, post, postAuth } from './api';
+import { get, getAuth, post, postAuth, postRaw } from './api';
 import { getIdentity } from '$lib/utils';
 import { alertQueue } from '$lib/stores';
 
@@ -193,6 +193,22 @@ export async function postCheckRoomPassword(
 	return Boolean(response.success);
 }
 
+export async function postDoesRoomPasswordExist(
+	serverUrl: string,
+	roomId: string
+): Promise<boolean> {
+	const response = await postRaw([serverUrl, `room/checkpasswordhash/${roomId}`], {
+		passwordHash: 'passwordHash'
+	});
+	if (response.status == 200 && (response.json() as unknown as CheckResponse).success == false) {
+		return false;
+	} else if (response.status == 400) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
 export async function postSetRoomPassword(
 	serverUrl: string,
 	roomId: string,
@@ -207,7 +223,6 @@ export async function postSetRoomPassword(
 		idForProof.nullifier = id._nullifier;
 		idForProof.secret = id._secret;
 		idForProof.commitment = id._commitment;
-
 		// Proves you know the identity secret with a timestamp so this proof can't be replayed
 		prover
 			.generateProof({

src/lib/services/server.ts

@@ -65,7 +65,7 @@ export const pixelStore = sessionable({} as pixelStoreI, 'pixelmaps');
 /**
  * @description Stores the encrypted key for each room keyed by the roomId
  */
-export const roomPassStore = encryptable({} as roomPassStoreI, 'roomKey');
+export const roomPassStore = encryptable({} as roomPassStoreI, 'roomPasses');
 
 /**
  * @description Derived Store: The messages of the currently selected room

src/lib/stores/index.ts

@@ -32,7 +32,7 @@ export function createIdentity(
 							alertQueue.enqueue('Identity Created! Congrats on your new journey', 'success');
 							return 'created';
 						} else {
-							console.log(get(identityExists));
+							console.warn(get(identityExists));
 							alertQueue.enqueue('Error creating identity!!!', 'error');
 							return 'error';
 						}

src/lib/utils/identity.ts

@@ -8,7 +8,8 @@ import {
 	identityExists,
 	alertQueue,
 	roomPassStore,
-	selectedServer
+	selectedServer,
+	roomKeyStore
 } from '$lib/stores';
 import { encryptIdentity } from './identity';
 import type { IdentityStoreI } from '$lib/types';
@@ -75,6 +76,17 @@ export async function unlockPadlock(password: string) {
 			identityKeyStore.read();
 			roomPassStore.read();
 			updateRooms();
+			console.debug('Unlocking rooms');
+			setTimeout(() => {
+				const roomPasses = get(roomPassStore);
+				Object.keys(roomPasses).forEach(async (roomId) => {
+					const roomKey = await deriveKey(roomPasses[roomId].password);
+					roomKeyStore.update((roomKeys) => {
+						roomKeys[roomId] = roomKey;
+						return roomKeys;
+					});
+				});
+			}, 50);
 		});
 	} else {
 		alertQueue.enqueue('Incorrect Password', 'warning');
@@ -85,12 +97,17 @@ export async function unlockPadlock(password: string) {
 export async function enterRoomPassword(password: string, roomId: string): Promise<boolean> {
 	const hashedSaltedPassword = await hashPassword(password + roomId);
 	if (hashedSaltedPassword) {
-		postCheckRoomPassword(get(selectedServer), roomId, hashedSaltedPassword).then((res) => {
+		postCheckRoomPassword(get(selectedServer), roomId, hashedSaltedPassword).then(async (res) => {
 			if (res) {
 				roomPassStore.update((roomPass) => {
 					roomPass[roomId] = { password, hashedSaltedPassword };
 					return roomPass;
 				});
+				const key = await deriveKey(password);
+				roomKeyStore.update((roomKeys) => {
+					roomKeys[roomId] = key;
+					return roomKeys;
+				});
 				return true;
 			} else {
 				return false;
@@ -103,12 +120,17 @@ export async function enterRoomPassword(password: string, roomId: string): Promi
 export async function setRoomPassword(password: string, roomId: string): Promise<boolean> {
 	const hashedSaltedPassword = await hashPassword(password + roomId);
 	if (hashedSaltedPassword) {
-		postSetRoomPassword(get(selectedServer), roomId, hashedSaltedPassword).then((res) => {
+		postSetRoomPassword(get(selectedServer), roomId, hashedSaltedPassword).then(async (res) => {
 			if (res) {
 				roomPassStore.update((roomPass) => {
 					roomPass[roomId] = { password, hashedSaltedPassword };
 					return roomPass;
 				});
+				const key = await deriveKey(password);
+				roomKeyStore.update((roomKeys) => {
+					roomKeys[roomId] = key;
+					return roomKeys;
+				});
 				return true;
 			} else {
 				return false;

src/lib/utils/password.ts

@@ -30,7 +30,7 @@
 	storePopup.set({ computePosition, autoUpdate, offset, shift, flip, arrow });
 
 	onMount(async () => {
-		console.log('Starting Up Application');
+		console.info('Starting Up Application');
 		if (getServerList().length === 0) {
 			setDefaultServers();
 		}
@@ -45,7 +45,7 @@
 						drawerStore.close();
 					}
 				} else {
-					console.log('Input field focused, not opening console');
+					console.debug('Input field focused, not opening console');
 				}
 			}
 		});

src/routes/+layout.svelte

@@ -34,6 +34,9 @@
 	<a
 		class="btn variant-filled-primary"
 		href="/admin/addAdmin">Add Room Admin</a>
+	<a
+		class="btn variant-filled-warning"
+		href="/settings/debug">Debug</a>
 </div>
 
 <style>