rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always store room passwords with the right room ID

Browse Source 
Take the room ID from the URL rather than just assuming it's still
the one that was in URL params before: if only the hash changes,
the app won't reload.

Fixes https://github.com/vector-im/element-call/issues/1708
This commit is contained in:
David Baker
2023-10-09 17:43:50 +01:00
parent e2abeba194
commit d7b33ee959
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/e2ee/sharedKeyManagement.ts
View File

@@ -17,7 +17,7 @@ limitations under the License.
import { useEffect, useMemo } from "react"; import { useEffect, useMemo } from "react";
import { useEnableE2EE } from "../settings/useSetting"; import { useEnableE2EE } from "../settings/useSetting";
import { useLocalStorage } from "../useLocalStorage"; import { setLocalStorageItem, useLocalStorage } from "../useLocalStorage";
import { useClient } from "../ClientContext"; import { useClient } from "../ClientContext";
import { useUrlParams } from "../UrlParams"; import { useUrlParams } from "../UrlParams";
import { widget } from "../widget"; import { widget } from "../widget";
@@ -25,27 +25,29 @@ import { widget } from "../widget";
export const getRoomSharedKeyLocalStorageKey = (roomId: string): string => export const getRoomSharedKeyLocalStorageKey = (roomId: string): string =>
`room-shared-key-${roomId}`; `room-shared-key-${roomId}`;
const useInternalRoomSharedKey = ( const useInternalRoomSharedKey = (roomId: string): string | null => {
roomId: string
): [string | null, (value: string) => void] => {
const key = useMemo(() => getRoomSharedKeyLocalStorageKey(roomId), [roomId]); const key = useMemo(() => getRoomSharedKeyLocalStorageKey(roomId), [roomId]);
const [e2eeEnabled] = useEnableE2EE(); const [e2eeEnabled] = useEnableE2EE();
const [roomSharedKey, setRoomSharedKey] = useLocalStorage(key); const roomSharedKey = useLocalStorage(key)[0];
return [e2eeEnabled ? roomSharedKey : null, setRoomSharedKey]; return e2eeEnabled ? roomSharedKey : null;
}; };
const useKeyFromUrl = (roomId: string): string | null => { const useKeyFromUrl = (roomId: string): string | null => {
const urlParams = useUrlParams(); const urlParams = useUrlParams();
const [e2eeSharedKey, setE2EESharedKey] = useInternalRoomSharedKey(roomId); const e2eeSharedKey = useInternalRoomSharedKey(roomId);
useEffect(() => { useEffect(() => {
if (!urlParams.password) return; if (!urlParams.password) return;
if (urlParams.password === "") return; if (urlParams.password === "") return;
if (urlParams.password === e2eeSharedKey) return; if (urlParams.password === e2eeSharedKey) return;
if (!urlParams.roomId) return;
setE2EESharedKey(urlParams.password); setLocalStorageItem(
}, [urlParams, e2eeSharedKey, setE2EESharedKey]); getRoomSharedKeyLocalStorageKey(urlParams.roomId),
urlParams.password
);
}, [urlParams, e2eeSharedKey]);
return urlParams.password ?? null; return urlParams.password ?? null;
}; };
@@ -57,7 +59,7 @@ export const useRoomSharedKey = (roomId: string): string | null => {
// time for us to read it out again). // time for us to read it out again).
const passwordFormUrl = useKeyFromUrl(roomId); const passwordFormUrl = useKeyFromUrl(roomId);
return useInternalRoomSharedKey(roomId)[0] ?? passwordFormUrl; return useInternalRoomSharedKey(roomId) ?? passwordFormUrl;
}; };
export const useIsRoomE2EE = (roomId: string): boolean | null => { export const useIsRoomE2EE = (roomId: string): boolean | null => {