Enforce DOM integrity, move 3rd party scripts to cdn.jottocraft.com, remove more dead code
Change-Id: I60aedea97116b50e0b1b7cfe3071d9eb3ea80499
Reviewed-on: https://src.jottocraft.com/c/dtps/+/138
Reviewed-by: spike <[email protected]>
diff --git a/scripts/search.js b/scripts/search.js
index 3fd4d79..b4a6b16 100644
--- a/scripts/search.js
+++ b/scripts/search.js
@@ -55,7 +55,7 @@
resolve(course.assignments.map(assignment => ({
title: assignment.title,
class: course.num,
- body: $('<div>' + assignment.body + '</div>').text(),
+ body: $(DOMPurify.sanitize('<div>' + assignment.body + '</div>')).text(),
onclick: "dtps.assignment('" + assignment.id + "', " + assignment.class + ")",
locatedIn: assignment.category ? assignment.category : "Assignment",
icon: "assignment",
@@ -179,7 +179,7 @@
onclick: "dtps.classHome(" + course.num + ");",
locatedIn: course.subject,
icon: "home",
- body: $('<div>' + data + '</div>').text(),
+ body: $(DOMPurify.sanitize('<div>' + data + '</div>')).text(),
icons: []
}]);
}).catch(() => resolve([]));
@@ -196,8 +196,8 @@
resolve(pages.map(page => ({
title: page.title,
class: course.num,
- onclick: "fluid.screen('pages', '" + course.id + "|" + page.id + "');",
- body: $('<div>' + page.content + '</div>').text(),
+ onclick: "fluid.screen('pages', " + JSON.stringify(course.id + "|" + page.id) + ");",
+ body: $(DOMPurify.sanitize('<div>' + page.content + '</div>')).text(),
locatedIn: "Page",
icon: "insert_drive_file",
infoIcons: [
@@ -237,7 +237,7 @@
})
});
resolve(res.map(post => ({
- body: $('<div>' + post.body + '</div>').text(),
+ body: $(DOMPurify.sanitize('<div>' + post.body + '</div>')).text(),
class: course.num,
onclick: "fluid.screen('discussions', '" + course.id + "|" + post.threadID + "|false|" + post.id + "');",
locatedIn: post.locatedIn,
@@ -295,7 +295,7 @@
class: course.num,
locatedIn: course.subject,
icon: "announcement",
- body: $('<div>' + announcement.body + '</div>').text(),
+ body: $(DOMPurify.sanitize('<div>' + announcement.body + '</div>')).text(),
infoIcons: [
"calendar_today"
].filter(i => i),
@@ -517,24 +517,24 @@
<div
class="card searchResult ${mixedClasses ? "mixedClasses" : ""}"
style="${'--classColor: ' + dtps.classes[result.class].color}"
- onclick="${result.onclick || (result.url && "window.open('" + result.url + "')")}"
+ onclick="${dtps.escapeAttr(result.onclick || (result.url && "window.open(" + JSON.stringify(dtps.safeURL(result.url)) + ")"))}"
>
<!-- Color bar for the dashboard -->
<div class="colorBar"></div>
<!-- Assignment title and points -->
- ${result.title ? `<h4>${result.title}</h4>` : ""}
+ ${result.title ? `<h4>${DOMPurify.sanitize(result.title)}</h4>` : ""}
<h5>
- <div class="infoChip"><i style="margin-top: -2px;" class="fluid-icon">${result.icon}</i> ${result.locatedIn}</div>
+ <div class="infoChip"><i style="margin-top: -2px;" class="fluid-icon">${result.icon}</i> ${DOMPurify.sanitize(result.locatedIn)}</div>
${result.info ? result.info.map(info => (
- `<div class="infoChip"><i style="margin-top: -2px;" class="fluid-icon">${info.icon}</i> ${info.info}</div>`
+ `<div class="infoChip"><i style="margin-top: -2px;" class="fluid-icon">${info.icon}</i> ${DOMPurify.sanitize(info.info)}</div>`
)).join("") : ""}
</h5>
${result.bodyParts.map(part => (
- `<p><span style="color: var(--secText);">...</span>${part}<span style="color: var(--secText);">...</span></p>`
+ `<p><span style="color: var(--secText);">...</span>${DOMPurify.sanitize(part)}<span style="color: var(--secText);">...</span></p>`
)).join("")}
${result.bodyOverflow ? `<p style="color: var(--secText);">+${result.bodyOverflow} more matches</p>` : ""}