merge: branch 'master' into production

This commit is contained in:
Paul Makles 2022-09-18 10:24:23 +01:00
commit 7ba2388de4

View file

@ -13,6 +13,27 @@ const ALLOWED_ORIGINS = [
"local.revolt.chat", "local.revolt.chat",
]; ];
const PROTOCOL_WHITELIST = [
"https",
"ftp",
"ftps",
"mailto",
"news",
"irc",
"gopher",
"nntp",
"feed",
"telnet",
"mms",
"rtsp",
"svn",
"git",
"tel",
"fax",
"xmpp",
"magnet",
];
export function determineLink(href?: string): LinkType { export function determineLink(href?: string): LinkType {
let internal, let internal,
url: URL | null = null; url: URL | null = null;
@ -22,13 +43,13 @@ export function determineLink(href?: string): LinkType {
url = new URL(href, location.href); url = new URL(href, location.href);
if (ALLOWED_ORIGINS.includes(url.hostname)) { if (ALLOWED_ORIGINS.includes(url.hostname)) {
const path = url.pathname; const path = url.pathname.replace(/[^A-z0-9/]/g, "");
return { type: "navigate", path }; return { type: "navigate", path };
} }
} catch (err) {} } catch (err) {}
if (!internal && url) { if (!internal && url) {
if (!url.protocol.startsWith("javascript")) { if (PROTOCOL_WHITELIST.includes(url.protocol)) {
return { type: "external", href, url }; return { type: "external", href, url };
} }
} }