From 34c15b52214b259b5cc2876ebf32a48a5ca11b19 Mon Sep 17 00:00:00 2001 From: Sorunome Date: Mon, 5 Oct 2020 09:50:19 +0200 Subject: [PATCH] fix img tags not always being rendered correctly --- src/HtmlUtils.tsx | 2 +- src/components/views/elements/ReplyThread.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx index f991d2df5d..c503247bf7 100644 --- a/src/HtmlUtils.tsx +++ b/src/HtmlUtils.tsx @@ -53,7 +53,7 @@ const BIGEMOJI_REGEX = new RegExp(`^(${EMOJIBASE_REGEX.source})+$`, 'i'); const COLOR_REGEX = /^#[0-9a-fA-F]{6}$/; -const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet']; +export const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet']; /* * Return true if the given string contains emoji diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js index 2d17c858a2..c663832a15 100644 --- a/src/components/views/elements/ReplyThread.js +++ b/src/components/views/elements/ReplyThread.js @@ -29,6 +29,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext"; import {Action} from "../../../dispatcher/actions"; import sanitizeHtml from "sanitize-html"; import {UIFeature} from "../../../settings/UIFeature"; +import {PERMITTED_URL_SCHEMES} from "../../../HtmlUtils"; // This component does no cycle detection, simply because the only way to make such a cycle would be to // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would @@ -106,6 +107,9 @@ export default class ReplyThread extends React.Component { { allowedTags: false, // false means allow everything allowedAttributes: false, + // we somehow can't allow all schemes, so we allow all that we + // know of and mxc (for img tags) + allowedSchemes: [...PERMITTED_URL_SCHEMES, 'mxc'], exclusiveFilter: (frame) => frame.tag === "mx-reply", }, );