Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-08-29 21:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup

Browse Source
This commit is contained in:
Half-Shot
2025-07-21 11:41:18 +01:00
parent b722d7bdab
commit 99c4686689
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/UrlParams.test.ts
View File

@@ -82,14 +82,11 @@ describe("UrlParams", () => {
getRoomIdentifierFromUrl("", `?roomId=${ROOM_ID}`, "").roomId, getRoomIdentifierFromUrl("", `?roomId=${ROOM_ID}`, "").roomId,
).toBe(ROOM_ID); ).toBe(ROOM_ID);
}); });
it("(roomId with unprintable chatacters)", () => { it("handles params with unprintable characters", () => {
const invisibleChar = "\u2066"; const invisibleChar = "\u2066";
expect( expect(
getRoomIdentifierFromUrl( getRoomIdentifierFromUrl("", `?roomId=${ROOM_ID}${invisibleChar}`, "")
"", .roomId,
`?roomId=${invisibleChar}${ROOM_ID}${invisibleChar}`,
"",
).roomId,
).toBe(ROOM_ID); ).toBe(ROOM_ID);
}); });
}); });

16
src/UrlParams.ts
View File

@@ -220,6 +220,8 @@ class ParamParser {
private queryParams: URLSearchParams; private queryParams: URLSearchParams;
public constructor(search: string, hash: string) { public constructor(search: string, hash: string) {
// Replace any non-printable characters that another client may have inserted.
search = search.replaceAll(/^[^ -~]+|[^ -~]+$/g, "");
this.queryParams = new URLSearchParams(search); this.queryParams = new URLSearchParams(search);
const fragmentQueryStart = hash.indexOf("?"); const fragmentQueryStart = hash.indexOf("?");
@@ -258,6 +260,8 @@ export const getUrlParams = (
search = window.location.search, search = window.location.search,
hash = window.location.hash, hash = window.location.hash,
): UrlParams => { ): UrlParams => {
// Replace any non-printable characters that another client may have inserted.
search = search.replaceAll(/^[^ -~]+|[^ -~]+$/g, "");
const parser = new ParamParser(search, hash); const parser = new ParamParser(search, hash);
const fontScale = parseFloat(parser.getParam("fontScale") ?? ""); const fontScale = parseFloat(parser.getParam("fontScale") ?? "");
@@ -387,14 +391,10 @@ export function getRoomIdentifierFromUrl(
// Make sure roomId is valid // Make sure roomId is valid
let roomId: string | null = parser.getParam("roomId"); let roomId: string | null = parser.getParam("roomId");
if (roomId !== null) { if (!roomId?.startsWith("!")) {
// Replace any non-printable characters that another client may have inserted. roomId = null;
roomId = roomId.replaceAll(/^[^ -~]+|[^ -~]+$/g, ""); } else if (!roomId.includes("")) {
if (!roomId.startsWith("!")) { roomId = null;
roomId = null;
} else if (!roomId.includes("")) {
roomId = null;
}
} }
return { return {