Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make use of trusted types #2438

Closed
wants to merge 1 commit into from
Closed

Make use of trusted types #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/template/templates/common/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * data:; media-src *; frame-src *; style-src 'self' 'nonce-{{ $stylesheetNonce }}'">
<style nonce="{{ $stylesheetNonce }}">{{ .user.Stylesheet | safeCSS }}</style>
{{ else }}
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * data:; media-src *; frame-src *">
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * data:; media-src *; frame-src *; require-trusted-types-for 'script'; trusted-types ttpolicy;">
{{ end }}

<script src="{{ route "javascript" "name" "app" "checksum" .app_js_checksum }}" defer></script>
Expand Down
47 changes: 35 additions & 12 deletions internal/ui/static/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function handleSubmitButtons() {
let button = element.querySelector("button");

if (button) {
button.innerHTML = button.dataset.labelLoading;
button.textContent = button.dataset.labelLoading;
button.disabled = true;
}
};
Expand Down Expand Up @@ -206,7 +206,7 @@ function toggleEntryStatus(element, toasting) {
let currentStatus = link.dataset.value;
let newStatus = currentStatus === "read" ? "unread" : "read";

link.querySelector("span").innerHTML = link.dataset.labelLoading;
link.querySelector("span").textContent = link.dataset.labelLoading;
updateEntriesStatus([entryID], newStatus, () => {
let iconElement, label;

Expand Down Expand Up @@ -284,6 +284,14 @@ function handleSaveEntry(element) {
}
}

// Set the span-child of `element` to contain `label`.
function changeSpanLabel(element, label) {
let span = document.createElement('span');
span.classList.add('icon-label');
span.textContent = label;
element.appendChild(span);
}

// Send the Ajax request to save an entry.
function saveEntry(element, toasting) {
if (!element) {
Expand All @@ -294,11 +302,14 @@ function saveEntry(element, toasting) {
return;
}

element.innerHTML = '<span class="icon-label">' + element.dataset.labelLoading + '</span>';

element.textContent = ''
changeSpanLabel(element, element.dataset.labelLoading);

let request = new RequestBuilder(element.dataset.saveUrl);
request.withCallback(() => {
element.innerHTML = '<span class="icon-label">' + element.dataset.labelDone + '</span>';
element.textContent = ''
changeSpanLabel(element, element.dataset.labelDone);
element.dataset.completed = true;
if (toasting) {
let iconElement = document.querySelector("template#icon-save");
Expand All @@ -324,7 +335,8 @@ function toggleBookmark(parentElement, toasting) {
return;
}

element.innerHTML = '<span class="icon-label">' + element.dataset.labelLoading + '</span>';
element.textContent = ''
changeSpanLabel(element, element.dataset.labelLoading);

let request = new RequestBuilder(element.dataset.bookmarkUrl);
request.withCallback(() => {
Expand All @@ -348,8 +360,12 @@ function toggleBookmark(parentElement, toasting) {
}
}

element.innerHTML = iconElement.innerHTML + '<span class="icon-label">' + label + '</span>';
element.textContent = '';
let newIcon = iconElement.content.cloneNode(true);
element.appendChild(newIcon);
changeSpanLabel(element, label);
element.dataset.value = newStarStatus;
//debugger;
});
request.execute();
}
Expand All @@ -365,19 +381,23 @@ function handleFetchOriginalContent() {
return;
}

let previousInnerHTML = element.innerHTML;
element.innerHTML = '<span class="icon-label">' + element.dataset.labelLoading + '</span>';
//let previousInnerHTML = element.innerHTML;
let previousElement = element.cloneNode(true)
element.textContent = ''
changeSpanLabel(element, element.dataset.labelLoading);

let request = new RequestBuilder(element.dataset.fetchContentUrl);
request.withCallback((response) => {
element.innerHTML = previousInnerHTML;
//element.innerHTML = previousInnerHTML;
element.textContent = '';
element.appendChild(previousElement);

response.json().then((data) => {
if (data.hasOwnProperty("content") && data.hasOwnProperty("reading_time")) {
document.querySelector(".entry-content").innerHTML = data.content;
document.querySelector(".entry-content").innerHTML = ttpolicy.createHTML(data.content);
let entryReadingtimeElement = document.querySelector(".entry-reading-time");
if (entryReadingtimeElement) {
entryReadingtimeElement.innerHTML = data.reading_time;
entryReadingtimeElement.innerHTML = ttpolicy.createHTML(data.reading_time);
}
}
});
Expand Down Expand Up @@ -654,7 +674,10 @@ function showToast(label, iconElement) {

const toastMsgElement = document.getElementById("toast-msg");
if (toastMsgElement) {
toastMsgElement.innerHTML = iconElement.innerHTML + '<span class="icon-label">' + label + '</span>';
toastMsgElement.textContent = ''
let newIcon = iconElement.content.cloneNode(true);
element.appendChild(newIcon);
changeSpanLabel(toastMsgElement, label);

const toastElementWrapper = document.getElementById("toast-wrapper");
if (toastElementWrapper) {
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/static/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ document.addEventListener("DOMContentLoaded", () => {
if ("serviceWorker" in navigator) {
let scriptElement = document.getElementById("service-worker-script");
if (scriptElement) {
navigator.serviceWorker.register(scriptElement.src);
navigator.serviceWorker.register(ttpolicy.createScriptURL(''));
}
}

Expand Down
5 changes: 5 additions & 0 deletions internal/ui/static/js/trusted_types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//TODO: this is catastrophic
const ttpolicy = trustedTypes.createPolicy("ttpolicy", {
createScriptURL: () => document.getElementById("service-worker-script").src,
createHTML : (data) => data,
});
1 change: 1 addition & 0 deletions internal/ui/static/static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ func GenerateStylesheetsBundles() error {
func GenerateJavascriptBundles() error {
var bundles = map[string][]string{
"app": {
"js/trusted_types.js",
"js/dom_helper.js",
"js/touch_handler.js",
"js/keyboard_handler.js",
Expand Down
Loading