system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWebView: Properly decode Base64-encoded strings as UTF-8

Browse source 
In the UI process, we encode generated HTML as Base64 to avoid having to
deal with things like arbitrarily nested quotes. The HTML is encoded as
UTF-8, and the raw bytes of that encoding are transcoded to Base64.

In the Inspector process, we are decoding the Base64 string using atob,
which has awkward non-Unicode limitations. The resulting string is only
a byte string. We must further decode the bytes as UTF-8, which we do
using TextDecoder.
This commit is contained in:
Timothy Flynn 2024-01-02 12:17:49 -05:00 committed by Andreas Kling
parent 0a05be69cf
commit d11c7a19da
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Base/res/ladybird/inspector.js
View file

@ -13,6 +13,10 @@ let consoleGroupNextID = 0;
let consoleHistory = [];
let consoleHistoryIndex = 0;
const decodeBase64 = encoded => {
return new TextDecoder().decode(Uint8Array.from(atob(encoded), c => c.charCodeAt(0)));
};
const beginSplitViewDrag = () => {
let inspectorTop = document.getElementById("inspector-top");
let inspectorBottom = document.getElementById("inspector-bottom");
@ -100,7 +104,7 @@ inspector.reset = () => {
inspector.loadDOMTree = tree => {
let domTree = document.getElementById("dom-tree");
domTree.innerHTML = atob(tree);
domTree.innerHTML = decodeBase64(tree);
let domNodes = domTree.querySelectorAll(".hoverable");
@ -123,7 +127,7 @@ inspector.loadDOMTree = tree => {
inspector.loadAccessibilityTree = tree => {
let accessibilityTree = document.getElementById("accessibility-tree");
accessibilityTree.innerHTML = atob(tree);
accessibilityTree.innerHTML = decodeBase64(tree);
};
inspector.inspectDOMNodeID = nodeID => {
@ -450,7 +454,7 @@ inspector.appendConsoleOutput = output => {
let parent = consoleParentGroup();
let element = document.createElement("p");
element.innerHTML = atob(output);
element.innerHTML = decodeBase64(output);
parent.appendChild(element);
scrollConsoleToBottom();
@ -477,7 +481,7 @@ inspector.beginConsoleGroup = (label, startExpanded) => {
details.open = startExpanded;
let summary = document.createElement("summary");
summary.innerHTML = atob(label);
summary.innerHTML = decodeBase64(label);
details.appendChild(summary);
parent.appendChild(details);