Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TextNode characters are re-escaped in htmlWidgets now. Fixes #1533

This commit is contained in:
n1474335 2023-03-23 12:42:22 +00:00
parent c2171a08f2
commit a4d6e1f92c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/web/utils/htmlWidget.mjs
View File

@ -7,6 +7,7 @@
import {WidgetType, Decoration, ViewPlugin} from "@codemirror/view";
import {escapeControlChars} from "./editorUtils.mjs";
import {htmlCopyOverride} from "./copyOverride.mjs";
import Utils from "../../core/Utils.mjs";
/**
@ -64,7 +65,11 @@ class HTMLWidget extends WidgetType {
* @param {DOMNode} textNode
*/
replaceControlChars(textNode) {
const val = escapeControlChars(textNode.nodeValue, true, this.view.state.lineBreak);
// .nodeValue unencodes HTML encoding such as &lt; to "<"
// We must remember to escape any potential HTML in TextNodes as we do not
// want to render it.
const textValue = Utils.escapeHtml(textNode.nodeValue);
const val = escapeControlChars(textValue, true, this.view.state.lineBreak);
if (val.length !== textNode.nodeValue.length) {
const node = document.createElement("span");
node.innerHTML = val;