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/chrome/loader.js b/chrome/loader.js
index 9516c08..89d2350 100644
--- a/chrome/loader.js
+++ b/chrome/loader.js
@@ -107,7 +107,7 @@
//Load jQuery
var s = document.createElement("script");
- s.src = "https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js";
+ s.src = "https://cdn.jottocraft.com/3rdparty/scripts/jquery.min.js";
s.async = false;
s.setAttribute("dtps", "true");
document.documentElement.appendChild(s);
diff --git a/scripts/assignments.js b/scripts/assignments.js
index e4169cd..1aa7498 100644
--- a/scripts/assignments.js
+++ b/scripts/assignments.js
@@ -38,7 +38,7 @@
<!-- Assignment title and points -->
<h4>
- <span>${assignment.title}</span>
+ <span>${DOMPurify.sanitize(assignment.title)}</span>
<!-- Points display -->
${scoreHTML ? `<div class="points">${scoreHTML}</div>` : ``}
@@ -50,8 +50,8 @@
${assignment.error ? `<div style="color: #f2392c;" class="infoChip weighted"><i class="fluid-icon">error</i> Error</div>` : ""}
${assignment.dueAt ? `<div ${highlightUnusualDate ? `style="font-weight: bold;color: var(--themeText);background-color: var(--theme);padding: 0px 8px;border-radius: 10px;"` : ""} class="infoChip"><i style="margin-top: -2px;" class="fluid-icon">alarm</i> Due ` + dtps.formatDate(assignment.dueAt) + `</div>` : ""}
${assignment.outcomes ? `<div class="infoChip weighted"><i class="fluid-icon">adjust</i>` + assignment.outcomes.length + `</div>` : ""}
- ${assignment.category ? `<div class="infoChip weighted"><i class="fluid-icon">category</i> ` + assignment.category + `</div>` : ""}
- ${childDisplay ? `<div class="infoChip weighted"><i class="fluid-icon">person</i> ` + childDisplay + `</div>` : ""}
+ ${assignment.category ? `<div class="infoChip weighted"><i class="fluid-icon">category</i> ` + DOMPurify.sanitize(assignment.category) + `</div>` : ""}
+ ${childDisplay ? `<div class="infoChip weighted"><i class="fluid-icon">person</i> ` + DOMPurify.sanitize(childDisplay) + `</div>` : ""}
</div>
<!-- Status icons -->
@@ -83,7 +83,7 @@
<div class="assignmentGrade">
<div class="grade">${Number(assignment.grade.toFixed(2))}</div>
<div class="value">/${Number(assignment.value.toFixed(2))}</div>
- ${assignment.letter ? `<div class="letter">${assignment.letter.replace("incomplete", `<i class="fluid-icon">cancel</i>`).replace("complete", `<i class="fluid-icon">done</i>`)}</div>` : ""}
+ ${assignment.letter ? `<div class="letter">${DOMPurify.sanitize(assignment.letter).replace("incomplete", `<i class="fluid-icon">cancel</i>`).replace("complete", `<i class="fluid-icon">done</i>`)}</div>` : ""}
<div class="percentage">${Math.round((assignment.grade / assignment.value) * 100)}%</div>
</div>
`;
@@ -353,8 +353,8 @@
if (update.type == "announcement") {
updatesHTML += /*html*/`
<div onclick="$(this).toggleClass('open');" style="cursor: pointer; padding: 20px; --classColor: ${dtps.classes[update.class].color};" class="announcement card">
- <div class="className">${update.title}</div>
- ${update.body}
+ <div class="className">${DOMPurify.sanitize(update.title)}</div>
+ ${dtps.sanitizeContent(update.body)}
</div>
`;
} else if (update.type == "assignment") {
@@ -362,13 +362,13 @@
updatesHTML += /*html*/`
<div onclick="dtps.assignment('${update.id}', ${update.class})" style="--classColor: ${dtps.classes[update.class].color};" class="card recentGrade">
<h5>
- <span>${update.title}</span>
+ <span>${DOMPurify.sanitize(update.title)}</span>
<!-- Points display -->
${scoreHTML ? `<div class="points">${scoreHTML}</div>` : ``}
</h5>
- <p>${dtps.user.parent ? "Graded for " + dtps.user.children.find(c => c.id == dtps.classes[update.class].userID).name : "Graded"} at ${dtps.formatDate(update.gradedAt)}</p>
+ <p>${dtps.user.parent ? "Graded for " + DOMPurify.sanitize(dtps.user.children.find(c => c.id == dtps.classes[update.class].userID).name) : "Graded"} at ${dtps.formatDate(update.gradedAt)}</p>
</div>
`;
}
@@ -436,7 +436,7 @@
<div class='fc-event-title-container'>
<div class='fc-event-title fc-sticky'>
${missing ? `<i title="Assignment is missing" class="fluid-icon statusIcon">remove_circle_outline</i>` : ``}
- <span style="vertical-align: middle;">${info.event.title}</span>
+ <span style="vertical-align: middle;">${DOMPurify.sanitize(info.event.title)}</span>
</div>
</div>
</div>
@@ -620,9 +620,9 @@
var computedBackgroundColor = getComputedStyle($(".card.details")[0]).getPropertyValue("--cards");
var computedTextColor = getComputedStyle($(".card.details")[0]).getPropertyValue("--text");
- var body = assignment.body;
+ var body = dtps.sanitizeContent(assignment.body);
if ($("body").hasClass("dark")) {
- body = dtps.brightenTextForDarkMode(assignment.body, computedBackgroundColor);
+ body = dtps.brightenTextForDarkMode(body, computedBackgroundColor);
}
//Generate a blob with the assignment body and get its data URL
@@ -632,7 +632,7 @@
<style>body {background-color: ${computedBackgroundColor}; color: ${computedTextColor};}</style>
${body}
`], { type: 'text/html' });
- assignmentBodyHTML = `<iframe id="assignmentIframe" onload="dtps.iframeLoad('assignmentIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${window.URL.createObjectURL(blob)}" />`;
+ assignmentBodyHTML = `<iframe id="assignmentIframe" onload="dtps.iframeLoad('assignmentIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${window.URL.createObjectURL(blob)}"></iframe>`;
}
@@ -642,10 +642,10 @@
var assignmentRubricHTML = assignment.rubric.map(function (rubricItem) {
return /*html*/`
<div class="dtpsAssignmentRubricItem">
- <h5>${rubricItem.title}</h5>
+ <h5>${DOMPurify.sanitize(rubricItem.title)}</h5>
<div class="score">
- <p style="color: ${(!generic && rubricItem.color) ? rubricItem.color : "var(--secText)"};" class="scoreName">
- ${generic ? "" : (rubricItem.score !== undefined ? rubricItem.scoreName || "" : "Not assessed")}
+ <p style="color: var(--secText);" class="scoreName">
+ ${generic ? "" : (rubricItem.score !== undefined ? DOMPurify.sanitize(rubricItem.scoreName || "") : "Not assessed")}
<div class="points">
<p class="earned">${generic || (rubricItem.score == undefined) ? "" : rubricItem.score}</p>
@@ -665,11 +665,11 @@
return /*html*/`
<div class="dtpsSubmissionComment">
${feedback.author ? /*html*/`
- <img src="${feedback.author.photoURL}" />
- <h5>${feedback.author.name}</h5>
+ <img src="${dtps.escapeAttr(feedback.author.photoURL)}" />
+ <h5>${DOMPurify.sanitize(feedback.author.name)}</h5>
` : ``}
- <p>${feedback.comment}</p>
+ <p>${DOMPurify.sanitize(feedback.comment)}</p>
</div>
`
}).join("");
@@ -682,7 +682,7 @@
$(".card.details").html(/*html*/`
<i onclick="fluid.cards.close('.card.details'); $('.card.details').html('');" class="fluid-icon close">close</i>
- <h4 style="font-weight: bold;">${assignment.title}</h4>
+ <h4 style="font-weight: bold;">${DOMPurify.sanitize(assignment.title)}</h4>
<div>
${assignment.dueAt ? `<div class="assignmentChip"><i class="fluid-icon">alarm</i><span>Due ${dtps.formatDate(assignment.dueAt)}</span></div>` : ""}
@@ -690,7 +690,7 @@
${assignment.missing && !generic ? `<div title="Assignment is missing" class="assignmentChip" style="color: #c44848"><i class="fluid-icon">remove_circle_outline</i></div>` : ""}
${assignment.late && !generic ? `<div title="Assignment is late" class="assignmentChip" style="color: #c44848"><i class="fluid-icon">assignment_late</i></div>` : ""}
${assignment.locked && !generic ? `<div title="Assignment submissions are locked" class="assignmentChip" style="color: var(--secText, gray);"><i class="fluid-icon">lock_outline</i></div>` : ""}
- ${(dtps.user.parent && !generic) ? `<div class="assignmentChip"><i class="fluid-icon">person</i><span>${dtps.user.children.find(c => c.id == dtps.classes[assignment.class].userID).name}</span></div>` : ""}
+ ${(dtps.user.parent && !generic) ? `<div class="assignmentChip"><i class="fluid-icon">person</i><span>${DOMPurify.sanitize(dtps.user.children.find(c => c.id == dtps.classes[assignment.class].userID).name)}</span></div>` : ""}
${generic ? "" : scoreHTML}
</div>
@@ -701,7 +701,7 @@
<h5><i class="fluid-icon">error</i> Assignment Error</h5>
</div>
- <p>${assignment.error}</p>
+ <p>${DOMPurify.sanitize(assignment.error)}</p>
</div>
</div>
` : ``}
@@ -717,15 +717,15 @@
${assignment.dueAt ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">alarm</i> Due: ${dtps.formatDate(assignment.dueAt)}</p>` : ""}
${assignment.value ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">bar_chart</i> Point value: ${assignment.value}</p>` : ""}
${(assignment.grade || (assignment.grade == 0)) && !generic ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">assessment</i> Points earned: ${assignment.grade}</p>` : ""}
- ${assignment.letter && !generic ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">font_download</i> Letter grade: ${assignment.letter}</p>` : ""}
- ${assignment.category ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">category</i> Category: ${assignment.category}</p>` : ""}
- ${assignment.rubric ? assignment.rubric.map(function (rubricItem) { return `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">adjust</i> ${rubricItem.title}</p>`; }).join("") : ""}
- <p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">class</i> Class: ${dtps.classes[assignment.class].subject}</p>
+ ${assignment.letter && !generic ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">font_download</i> Letter grade: ${DOMPurify.sanitize(assignment.letter)}</p>` : ""}
+ ${assignment.category ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">category</i> Category: ${DOMPurify.sanitize(assignment.category)}</p>` : ""}
+ ${assignment.rubric ? assignment.rubric.map(function (rubricItem) { return `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">adjust</i> ${DOMPurify.sanitize(rubricItem.title)}</p>`; }).join("") : ""}
+ <p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">class</i> Class: ${DOMPurify.sanitize(dtps.classes[assignment.class].subject)}</p>
${dtps.env == "dev" ? `<p style="color: var(--secText); margin: 5px 0px;"><i style="vertical-align: middle;" class="fluid-icon">code</i> Assignment ID: ${assignment.id}</p>` : ""}
<br />
<div class="row">
- ${assignment.url ? `<button class="btn small outline" onclick="window.open('${assignment.url}')"><i class="fluid-icon">open_in_new</i> Open in ${dtpsLMS.shortName || dtpsLMS.name}</button>` : ``}
+ ${assignment.url ? `<button class="btn small outline" onclick="window.open(${dtps.escapeAttr(JSON.stringify(dtps.safeURL(assignment.url)))})"><i class="fluid-icon">open_in_new</i> Open in ${dtpsLMS.shortName || dtpsLMS.name}</button>` : ``}
</div>
</div>
@@ -829,23 +829,23 @@
var action = "";
if (item.type == "assignment") action = "dtps.assignment('" + item.id + "', " + classNum + ")";
if (item.type == "page") {
- action = "fluid.screen('pages', '" + classID + "|" + item.id + "|true')";
+ action = "fluid.screen('pages', " + JSON.stringify(classID + "|" + item.id + "|true") + ")";
}
if (item.type == "discussion") {
action = "fluid.screen('discussions', '" + classID + "|" + item.id + "|true')";
}
- if (item.type == "url") action = "window.open('" + item.url + "')";
+ if (item.type == "url") action = "window.open(" + JSON.stringify(dtps.safeURL(item.url)) + ")";
if (item.type == "header") action = "";
- if (item.type == "embed") action = "dtps.showIFrameCard('" + item.url + "')";
+ if (item.type == "embed") action = "dtps.showIFrameCard(" + JSON.stringify(dtps.safeURL(item.url)) + ")";
//Get module HTML
if (item.type == "header") {
- moduleItemHTML += `<h5 style="font-size: 16px;padding: 0px 10px; text-decoration: underline;">${item.title}</h5>`;
+ moduleItemHTML += `<h5 style="font-size: 16px;padding: 0px 10px; text-decoration: underline;">${DOMPurify.sanitize(item.title)}</h5>`;
} else {
moduleItemHTML += `
- <div class="moduleItem" onclick="${action}" style="margin-left: ${item.indent * 15}px;">
+ <div class="moduleItem" onclick="${dtps.escapeAttr(action)}" style="margin-left: ${item.indent * 15}px;">
<i ${item.completed ? `style="color: #27ba3c"` : ""} class="fluid-icon">${item.completed ? "check" : icon}</i>
- ${item.title}
+ ${DOMPurify.sanitize(item.title)}
</div>
`;
}
@@ -857,7 +857,7 @@
<h4>
<i onclick="dtps.moduleCollapse(this, '${dtps.classes[classNum].id}', '${module.id}');"
class="fluid-icon collapseIcon">${module.collapsed ? "keyboard_arrow_right" : "keyboard_arrow_down"}</i>
- ${module.title}
+ ${DOMPurify.sanitize(module.title)}
</h4>
<div class="moduleContents" style="padding-top: 10px;">
@@ -1018,10 +1018,10 @@
assignmentHTML += /*html*/`
<div onclick="dtps.assignment('${assignment.id}', ${classNum})" class="gradebookAssignment">
<h5>
- ${assignment.title}
+ ${DOMPurify.sanitize(assignment.title)}
<div class="stats">
- ${assignment.letter ? `<div class="gradebookLetter">${assignment.letter}</div>` : ""}
+ ${assignment.letter ? `<div class="gradebookLetter">${DOMPurify.sanitize(assignment.letter)}</div>` : ""}
<div class="gradebookScore">${Math.round(assignment.grade * 100) / 100}</div>
<div class="gradebookValue">/${Math.round(assignment.value * 100) / 100}</div>
<div class="gradebookPercentage">${Math.round((assignment.grade / assignment.value) * 100)}%</div>
@@ -1047,7 +1047,7 @@
Grade Summary
<div class="classGradeCircle">
${dtps.classes[classNum].grade ? `<div class="percentage">${dtps.classes[classNum].grade}%</div>` : ``}
- ${dtps.classes[classNum].letter ? `<div class="letter">${dtps.classes[classNum].letter}</div>` : ""}
+ ${dtps.classes[classNum].letter ? `<div class="letter">${DOMPurify.sanitize(dtps.classes[classNum].letter)}</div>` : ""}
</div>
</h3>
diff --git a/scripts/core.js b/scripts/core.js
index 38bc218..f528850 100644
--- a/scripts/core.js
+++ b/scripts/core.js
@@ -75,7 +75,7 @@
};
//Load jQuery ASAP
-jQuery.getScript("https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js");
+jQuery.getScript("https://cdn.jottocraft.com/3rdparty/scripts/jquery.min.js");
/**
* Debugging shortcut for getting the selected class. This should only be used in the web inspector and not in actual code.
@@ -110,20 +110,20 @@
<div style="margin: 40px 0px;">
<h5>User</h5>
- <pre><code class="prettyprint">${JSON.stringify(dtps.user, null, '\t')}</code></pre>
+ <pre><code class="prettyprint">${DOMPurify.sanitize(JSON.stringify(dtps.user, null, '\t'))}</code></pre>
</div>
${dtps.classes[dtps.selectedClass] ? /*html*/`
<div style="margin: 40px 0px;">
<h5>Selected class</h5>
- <pre><code class="prettyprint">${JSON.stringify(dtps.classes[dtps.selectedClass], replacer, '\t')}</code></pre>
+ <pre><code class="prettyprint">${DOMPurify.sanitize(JSON.stringify(dtps.classes[dtps.selectedClass], replacer, '\t'))}</code></pre>
</div>
` : ``
}
`);
if (!window.PR) {
- $.getScript("https://cdn.jsdelivr.net/gh/google/code-prettify@master/loader/run_prettify.js?lang=json");
+ $.getScript("https://cdn.jottocraft.com/3rdparty/scripts/run_prettify.js");
} else {
PR.prettyPrint();
}
@@ -143,6 +143,59 @@
console.log("[DTPS]", ...arguments);
}
+/**
+ * Escapes a string for use inside a quoted HTML attribute value.
+ * DOMPurify.sanitize does not escape quotes, so it can't be used for attribute values.
+ *
+ * @param {*} str The value to escape
+ * @return {string} Escaped string
+ */
+dtps.escapeAttr = function (str) {
+ return String(str).replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'").replace(/</g, "<").replace(/>/g, ">");
+}
+
+/**
+ * Sanitizes rich HTML content from the LMS (assignment bodies, pages, posts, etc.).
+ * Embedded iframes (e.g. videos) and link targets are allowed.
+ *
+ * @param {string} html The HTML to sanitize
+ * @return {string} Sanitized HTML
+ */
+dtps.sanitizeContent = function (html) {
+ return DOMPurify.sanitize(html, { ADD_TAGS: ["iframe"], ADD_ATTR: ["allow", "allowfullscreen", "frameborder", "scrolling", "target"] });
+}
+
+/**
+ * Ensures that a URL is safe
+ *
+ * @param {string} url The URL to check
+ * @returns {string} The URL if it is safe, otherwise "about:blank"
+ */
+dtps.safeURL = function (url) {
+ try {
+ var protocol = new URL(url, window.location.href).protocol;
+ if (["http:", "https:", "mailto:", "tel:"].includes(protocol)) return url;
+ } catch (e) { }
+ return "about:blank";
+}
+
+/**
+ * Shows an error message alert and logs to console, WITHOUT SANITIZING INPUT
+ *
+ * @param {string} msg The error to display
+ * @param {string} [devNotes] Technical error details displayed in a smaller font
+ * @param {Error} [err] An error object to log to the console. If this is null, DTPS will assume the error has been handled elsewhere.
+ */
+dtps.unsafeError = function (msg, devNotes, err) {
+ if (err !== null) {
+ var formattedDevNotes = "";
+ if (devNotes) {
+ formattedDevNotes = '<div style="font-size: 12px; color: var(--secText, gray); margin-top: 10px;">' + devNotes + '</div>';
+ }
+ console.error("[DTPS !!ERROR!!]", devNotes + ": ", err);
+ fluid.alert("Error", msg + formattedDevNotes, "error");
+ }
+}
/**
* Shows an error message alert and logs to console
@@ -152,14 +205,11 @@
* @param {Error} [err] An error object to log to the console. If this is null, DTPS will assume the error has been handled elsewhere.
*/
dtps.error = function (msg, devNotes, err) {
- if (err !== null) {
- var formattedDevNotes = "";
- if (devNotes) {
- formattedDevNotes = '<div style="font-size: 12px; color: var(--secText, gray); margin-top: 10px;">' + devNotes + '</div>';
- }
- console.error("[DTPS !!ERROR!!]", devNotes + ": ", err);
- fluid.alert("Error", msg + formattedDevNotes, "error");
- }
+ dtps.unsafeError(
+ DOMPurify.sanitize(msg),
+ DOMPurify.sanitize(devNotes),
+ err
+ );
}
/**
@@ -242,15 +292,15 @@
dtps.JS = function () {
return new Promise((resolve, reject) => {
//Moment & Fullcalendar are used for the calendar on the dashboard
- jQuery.getScript("https://cdn.jsdelivr.net/npm/[email protected]/main.min.js", function () {
- jQuery.getScript("https://cdn.jsdelivr.net/npm/[email protected]/locales-all.min.js");
+ jQuery.getScript("https://cdn.jottocraft.com/3rdparty/scripts/fullcalendar_main.min.js", function () {
+ jQuery.getScript("https://cdn.jottocraft.com/3rdparty/scripts/fullcalendar_locales-all.min.js");
});
//Lunr is used for search
- jQuery.getScript('https://unpkg.com/[email protected]/lunr.min.js');
+ jQuery.getScript('https://cdn.jottocraft.com/3rdparty/scripts/lunr.min.js');
//jQuery UI for dashboard settings page
- jQuery.getScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js');
+ jQuery.getScript('https://cdn.jottocraft.com/3rdparty/scripts/jquery-ui.min.js');
//Tinycolor used for better dark mode support
jQuery.getScript("https://cdn.jottocraft.com/tinycolor.js");
@@ -258,7 +308,9 @@
//dtao/nearest-color is used for finding the nearest class color
jQuery.getScript("https://cdn.jottocraft.com/nearest-color.dtao.js", () => {
//Fluid UI for core UI elements
- jQuery.getScript(dtps.baseURL + "/fluid/fluid.js", resolve);
+ jQuery.getScript(dtps.baseURL + "/fluid/fluid.js", () => {
+ jQuery.getScript("https://cdn.jottocraft.com/3rdparty/scripts/purify.min.js", resolve);
+ });
});
});
}
@@ -593,9 +645,9 @@
//Check for login redirect
if ((err.action == "login") && err.redirectURL) {
//Redirect to login page
- window.location.href = err.redirectURL;
+ window.location.href = dtps.safeURL(err.redirectURL);
} else {
- dtps.error("Failed to get user and/or course data", "Exception in promise @ dtps.init");
+ dtps.unsafeError("Failed to get user and/or course data", "Exception in promise @ dtps.init");
}
});
@@ -653,7 +705,7 @@
for (var i = 0; i < dtps.classes.length; i++) {
//Determine letter grade HTML
var letterGradeHTML = "";
- if (dtps.classes[i].letter) letterGradeHTML = dtps.classes[i].letter;
+ if (dtps.classes[i].letter) letterGradeHTML = DOMPurify.sanitize(dtps.classes[i].letter);
if (dtps.classes[i].letter == null) letterGradeHTML = "--";
if (dtps.classes[i].letter == "...") letterGradeHTML = `<div class="shimmer" style="vertical-align:middle;display: inline-block;width: 22px;height: 22px;border-radius: 8px;"></div>`; //Show loading indicator for ...
if (dtps.classes[i].letter == "ERROR") letterGradeHTML = `<i class="fluid-icon">error</i>`;
@@ -661,9 +713,9 @@
if (dtps.classes[i].group && (dtps.classes[i].group !== previousClassGroup)) {
if (previousClassGroup) dtps.classlist.push(`</div></div>`);
dtps.classlist.push(/*html*/`
- <div id="dtpsClassListGroup-${dtps.classes[i].group}" class="group open">
+ <div id="dtpsClassListGroup-${dtps.escapeAttr(dtps.classes[i].group)}" class="group open">
<div class="name item">
- <i class="fluid-icon"></i> <span class="label">${dtps.classes[i].group}</span>
+ <i class="fluid-icon"></i> <span class="label">${DOMPurify.sanitize(dtps.classes[i].group)}</span>
</div>
<div class="items">
@@ -677,7 +729,7 @@
<div
onclick="${'dtps.selectedClass = ' + i}"
class="${'class item ' + i + ' ' + (dtps.selectedClass == i ? " active" : "")}"
- style="${'--classColor: ' + dtps.classes[i].color}"
+ style="${'--classColor: ' + dtps.escapeAttr(dtps.classes[i].color)}"
>
${dtps.classes[i].grade && dtps.classes[i].letter ? /*html*/`
<i class="fluid-icon grade">
@@ -694,7 +746,7 @@
</i>
`}
- <span class="label">${dtps.classes[i].subject}</span>
+ <span class="label">${DOMPurify.sanitize(dtps.classes[i].subject)}</span>
</div>
`);
@@ -874,32 +926,6 @@
} else {
$("#classInfo .homepage").hide();
}
-
- if (dtps.classes[classNum].videoMeetingURL) {
- $("#classInfo .videoMeeting").attr("onclick", "window.open('" + dtps.classes[classNum].videoMeetingURL + "');");
- $("#classInfo .videoMeeting").removeClass("shimmerParent");
- $("#classInfo .videoMeeting").show();
- } else if ((dtps.classes[classNum].videoMeetingURL !== null) && dtpsLMS.fetchMeetingURL) {
- $("#classInfo .videoMeeting").attr("onclick", "");
- $("#classInfo .videoMeeting").addClass("shimmerParent");
- $("#classInfo .videoMeeting").show();
-
- dtpsLMS.fetchMeetingURL(dtps.classes[classNum].lmsID).then(url => {
- dtps.classes[classNum].videoMeetingURL = url;
-
- if (dtps.selectedClass == classNum) {
- if (url) {
- $("#classInfo .videoMeeting").attr("onclick", "window.open('" + dtps.classes[classNum].videoMeetingURL + "');");
- $("#classInfo .videoMeeting").removeClass("shimmerParent");
- $("#classInfo .videoMeeting").show();
- } else {
- $("#classInfo .videoMeeting").hide();
- }
- }
- });
- } else {
- $("#classInfo .videoMeeting").hide();
- }
}
if (dtps.selectedContent !== "grades") $(".classContent").removeClass("fixedGradeSummary");
@@ -914,7 +940,7 @@
//Render loading screen
$(".card.details").html(/*html*/`
<i onclick="fluid.cards.close('.card.details')" class="fluid-icon close">close</i>
- <h3 style="font-weight: bold;">${dtps.classes[num].subject} Homepage</h3>
+ <h3 style="font-weight: bold;">${DOMPurify.sanitize(dtps.classes[num].subject)} Homepage</h3>
<br />
<p>Loading...</p>
@@ -923,6 +949,8 @@
//Fetch homepage from the LMS
dtpsLMS.fetchHomepage(dtps.classes[num].lmsID).then(homepage => {
if (homepage) {
+ homepage = dtps.sanitizeContent(homepage);
+
//Get computed background and text color to style the iFrame with
var computedBackgroundColor = getComputedStyle($(".card.details")[0]).getPropertyValue("--cards");
var computedTextColor = getComputedStyle($(".card.details")[0]).getPropertyValue("--text");
@@ -943,11 +971,11 @@
$(".card.details").html(/*html*/`
<i onclick="fluid.cards.close('.card.details')" class="fluid-icon close">close</i>
- <h4 style="font-weight: bold;">${dtps.classes[num].subject} Homepage</h4>
+ <h4 style="font-weight: bold;">${DOMPurify.sanitize(dtps.classes[num].subject)} Homepage</h4>
<br />
<div style="margin-top: 20px;" class="homepageBody">
- <iframe id="homepageIframe" onload="dtps.iframeLoad('homepageIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${homepageURL}" />
+ <iframe id="homepageIframe" onload="dtps.iframeLoad('homepageIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${homepageURL}"></iframe>
</div>
`);
@@ -974,7 +1002,7 @@
fluid.cards('.card.iFrameCard');
//Load new URL
- $('#CardIFrame').attr('src', url);
+ $('#CardIFrame').attr('src', dtps.safeURL(url));
}
/**
@@ -1248,9 +1276,6 @@
<p onclick="dtps.classHome(dtps.selectedClass);" class="homepage" style="cursor: pointer; display: none;">
<i class="fluid-icon">home</i> <span>Homepage</span>
</p>
- <p class="videoMeeting" style="cursor: pointer; display: none;">
- <i class="fluid-icon">videocam</i> <span>Meeting</span>
- </p>
<p class="contentLabel" style="display: none;">
<i class="fluid-icon"></i> <span></span>
</p>
@@ -1422,13 +1447,13 @@
$("#dtpsMainSearchBox").attr("data-search-type", type);
} else if (error) {
$("#dtpsSearchStatus i").text("error");
- $("#dtpsSearchStatus span").html(`Cannot search for ${type} in <b style="color: ${course.color};">${course.subject}</b>`);
+ $("#dtpsSearchStatus span").html(`Cannot search for ${DOMPurify.sanitize(type)} in <b style="color: ${dtps.escapeAttr(course.color)};">${DOMPurify.sanitize(course.subject)}</b>`);
$("#dtpsMainSearchBox").attr("placeholder", "Cannot search for " + type + " in " + course.subject);
$("#dtpsMainSearchBox").attr("data-dtps-course", "");
$("#dtpsMainSearchBox").attr("data-search-type", "");
} else if (course || true) {
$("#dtpsSearchStatus i").text(icon);
- $("#dtpsSearchStatus span").html(`Search ${type} in <b style="color: ${course.color};">${course.subject}</b>`);
+ $("#dtpsSearchStatus span").html(`Search ${DOMPurify.sanitize(type)} in <b style="color: ${dtps.escapeAttr(course.color)};">${DOMPurify.sanitize(course.subject)}</b>`);
$("#dtpsMainSearchBox").attr("placeholder", "Search " + type + " in " + course.subject);
$("#dtpsMainSearchBox").attr("data-dtps-course", course.num);
$("#dtpsMainSearchBox").attr("data-search-type", type);
@@ -1612,7 +1637,7 @@
<br /><br />
<div>
- <input id="dtpsLMSOverride" value="${window.localStorage.dtpsLMSOverride || ""}" placeholder="LMS override" />
+ <input id="dtpsLMSOverride" value="${dtps.escapeAttr(window.localStorage.dtpsLMSOverride || "")}" placeholder="LMS override" />
<button class="btn small" onclick="window.localStorage.setItem('dtpsLMSOverride', $('#dtpsLMSOverride').val())"><i class="fluid-icon">save</i> Save</button>
</div>
</div>
@@ -1639,10 +1664,10 @@
<div class="card" style="padding: 10px 20px; box-shadow: none !important; border: 2px solid var(--elements); margin-top: 20px;">
<div style="margin-top: 12px;">
- <img src="${dtps.user.photoURL}" style="height: 50px; margin-right: 10px; vertical-align: middle; border-radius: 50%;" />
+ <img src="${dtps.escapeAttr(dtps.user.photoURL)}" style="height: 50px; margin-right: 10px; vertical-align: middle; border-radius: 50%;" />
<div style="display: inline-block; vertical-align: middle;">
- <h4 style="font-weight: bold; font-size: 32px; margin: 0px;">${dtps.user.name} <span style="font-size: 12px; line-height: 0px;">${dtps.user.id}</span></h4>
+ <h4 style="font-weight: bold; font-size: 32px; margin: 0px;">${DOMPurify.sanitize(dtps.user.name)} <span style="font-size: 12px; line-height: 0px;">${DOMPurify.sanitize(dtps.user.id)}</span></h4>
</div>
</div>
@@ -1652,17 +1677,17 @@
</div>
<div class="card" style="padding: 10px 20px; box-shadow: none !important; border: 2px solid var(--elements); margin-top: 20px;">
- <img src="${dtpsLMS.logo}" style="height: 50px; margin-right: 10px; vertical-align: middle; margin-top: 20px; border-radius: 50%;" />
+ <img src="${dtps.escapeAttr(dtpsLMS.logo)}" style="height: 50px; margin-right: 10px; vertical-align: middle; margin-top: 20px; border-radius: 50%;" />
<div style="display: inline-block; vertical-align: middle;">
- <h4 style="font-weight: bold; font-size: 32px; margin-bottom: 0px;">${dtpsLMS.name}</h4>
+ <h4 style="font-weight: bold; font-size: 32px; margin-bottom: 0px;">${DOMPurify.sanitize(dtpsLMS.name)}</h4>
${dtpsLMS.description ? `
- <div style="font-size: 16px; margin-top: 5px;">${dtpsLMS.description}</div>
+ <div style="font-size: 16px; margin-top: 5px;">${DOMPurify.sanitize(dtpsLMS.description)}</div>
` : ``}
</div>
<div style="margin-top: 15px; margin-bottom: 7px;">
- <a style="color: var(--lightText); margin: 0px 5px;" href="${dtpsLMS.source}"><i class="fluid-icon" style="vertical-align: middle">code</i> LMS integration source code</a>
+ <a style="color: var(--lightText); margin: 0px 5px;" href="${dtps.escapeAttr(dtpsLMS.source)}"><i class="fluid-icon" style="vertical-align: middle">code</i> LMS integration source code</a>
</div>
</div>
@@ -1800,14 +1825,6 @@
*/
/**
-* @name dtpsLMS.fetchMeetingURL
-* @description [OPTIONAL] Fetches the videoMeetingURL for a class
-* @kind function
-* @param {string} classID The class ID to get the videoMeetingURL for
-* @return {Promise<string>} A promise which resolves to the videoMeetingURL for the class, or null if the class does not have a videoMeetingURL
-*/
-
-/**
* @name dtpsLMS.fetchHomepage
* @description [OPTIONAL] Fetches homepage HTML for a course from the LMS
* @kind function
@@ -1931,5 +1948,4 @@
* @property {string} [image] URL to the class background image
* @property {User} [teacher] Class teacher. If the class has multiple teachers, this is the primary teacher.
* @property {boolean} [hasGradebook] Automatically managed by DTPS. True if the class should show the gradebook tab.
-* @property {string} [videoMeetingURL] The URL used to join this class' online meeting. If dtpsLMS.fetchMeetingURL is implemented, DTPS will use it to get the meeting URL if this property is undefined. If this property is null, DTPS will not call dtpsLMS.fetchMeeting URL for the class.
*/
diff --git a/scripts/pages-discussions.js b/scripts/pages-discussions.js
index 7ed3592..436b7e3 100644
--- a/scripts/pages-discussions.js
+++ b/scripts/pages-discussions.js
@@ -97,7 +97,7 @@
return /*html*/`
<div data-threadID="${discussionThread.id}" class="item">
<i class="fluid-icon">${discussionThread.locked ? "lock_outline" : "chat_bubble_outline"}</i>
- <span class="label">${discussionThread.title}</span>
+ <span class="label">${DOMPurify.sanitize(discussionThread.title)}</span>
</div>
`;
}).join("");
@@ -111,7 +111,7 @@
${
dtps.classes[classNum].newDiscussionThreadURL ? (/*html*/`
- <div onclick="window.open('${dtps.classes[classNum].newDiscussionThreadURL}')" class="item back">
+ <div onclick="window.open(${dtps.escapeAttr(JSON.stringify(dtps.safeURL(dtps.classes[classNum].newDiscussionThreadURL)))})" class="item back">
<i class="fluid-icon">add</i>
<span class="label">New discussion</span>
</div>
@@ -194,7 +194,7 @@
<base target="_blank" />
<link type="text/css" rel="stylesheet" href="https://cdn.jottocraft.com/CanvasCSS.css" media="screen,projection"/>
<style>body {background-color: ${computedBackgroundColor}; color: ${computedTextColor};</style>
- ${post.body}
+ ${dtps.sanitizeContent(post.body)}
`], { type: 'text/html' });
var discussionPostContentURL = window.URL.createObjectURL(blob);
@@ -210,17 +210,17 @@
<div data-post-id="${reply.id}" style="margin-left: ${(reply.depth || 0) * 50}px;" class="discussionReply">
<div class="discussionHeader">
${post.author ? /*html*/`
- <img src="${reply.author.photoURL}" />
- <h5>${reply.author.name}</h5>
+ <img src="${dtps.escapeAttr(reply.author.photoURL)}" />
+ <h5>${DOMPurify.sanitize(reply.author.name)}</h5>
` : ``}
- <span style="cursor: pointer;" onclick="window.open('${reply.replyURL}');">
+ <span style="cursor: pointer;" onclick="window.open(${dtps.escapeAttr(JSON.stringify(dtps.safeURL(reply.replyURL)))});">
<i class="fluid-icon">reply</i>
<span>Reply</span>
</span>
</div>
- ${reply.body}
+ ${dtps.sanitizeContent(reply.body)}
</div>
`)
});
@@ -232,17 +232,17 @@
//Create HTML for this post
//Note that index == 0 is the initial post
postHTML.push(/*html*/`
- <div class="card" data-post-id="${post.id}" style="margin-top: 20px;${index == 0 ? "margin-bottom: 75px;" : "padding: 20px 30px;"}">
+ <div class="card" data-post-id="${dtps.escapeAttr(post.id)}" style="margin-top: 20px;${index == 0 ? "margin-bottom: 75px;" : "padding: 20px 30px;"}">
<!-- Thread title (Initial post) -->
${index == 0 ? /*html*/`
- <h4 style="font-weight: bold">${thread.title}</h4>
+ <h4 style="font-weight: bold">${DOMPurify.sanitize(thread.title)}</h4>
` : ''}
<!-- Author header -->
<div ${index == 0 ? `style="margin-bottom: 32px;"` : ""} class="discussionHeader">
${post.author ? /*html*/`
- <img src="${post.author.photoURL}" />
- <h5>${post.author.name}</h5>
+ <img src="${dtps.escapeAttr(post.author.photoURL)}" />
+ <h5>${DOMPurify.sanitize(post.author.name)}</h5>
` : ``}
<i class="fluid-icon">calendar_today</i>
@@ -259,8 +259,8 @@
</div>
${index == 0 ? /*html*/`
- <iframe id="classThreadIframe" onload="dtps.iframeLoad('classThreadIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${discussionPostContentURL}" />
- ` : post.body}
+ <iframe id="classThreadIframe" onload="dtps.iframeLoad('classThreadIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${discussionPostContentURL}"></iframe>
+ ` : dtps.sanitizeContent(post.body)}
${replyHTML.join("")}
@@ -268,9 +268,9 @@
${post.replyURL ? /*html*/`
<div ${index == 0 ? `style="margin-top: 32px;"` : ""} class="discussionFooter">
${index == 0 ? /*html*/`
- <button onclick="window.open('${post.replyURL}');" class="btn small"><i class="fluid-icon">post_add</i> Add Post</button>
+ <button onclick="window.open(${dtps.escapeAttr(JSON.stringify(dtps.safeURL(post.replyURL)))});" class="btn small"><i class="fluid-icon">post_add</i> Add Post</button>
` : /*html*/`
- <button onclick="window.open('${post.replyURL}');" class="btn small"><i class="fluid-icon">reply</i> Reply</button>
+ <button onclick="window.open(${dtps.escapeAttr(JSON.stringify(dtps.safeURL(post.replyURL)))});" class="btn small"><i class="fluid-icon">reply</i> Reply</button>
`}
</div>
` : ""}
@@ -383,9 +383,9 @@
//Loop over discusson threads array to create discussion thread HTML for the sidebar
var pageHTML = dtps.classes[classNum].pages.map(page => {
return /*html*/`
- <div data-pageID="${page.id}" class="item ${(defaultPage && (page.id == defaultPage)) ? "active" : ""}">
+ <div data-pageID="${dtps.escapeAttr(page.id)}" class="item ${(defaultPage && (page.id == defaultPage)) ? "active" : ""}">
<i class="fluid-icon">insert_drive_file</i>
- <span class="label">${page.title}</span>
+ <span class="label">${DOMPurify.sanitize(page.title)}</span>
</div>
`;
}).join("");
@@ -467,7 +467,7 @@
<base target="_blank" />
<link type="text/css" rel="stylesheet" href="https://cdn.jottocraft.com/CanvasCSS.css" media="screen,projection"/>
<style>body {background-color: ${computedBackgroundColor}; color: ${computedTextColor};</style>
- ${page.content}
+ ${dtps.sanitizeContent(page.content)}
`], { type: 'text/html' });
//Get URL from blob
@@ -482,13 +482,13 @@
` : ""}
<div style="margin: 20px; padding: 20px;">
<!-- Page title -->
- <h4 style="font-weight: bold;">${page.title}</h4>
+ <h4 style="font-weight: bold;">${DOMPurify.sanitize(page.title)}</h4>
<!-- Page header -->
<div style="margin-bottom: 32px;" class="discussionHeader">
${page.author ? /*html*/`
- <img src="${page.author.photoURL}" />
- <h5>${page.author.name}</h5>
+ <img src="${dtps.escapeAttr(page.author.photoURL)}" />
+ <h5>${DOMPurify.sanitize(page.author.name)}</h5>
` : ``}
<i class="fluid-icon">calendar_today</i>
@@ -497,7 +497,7 @@
<!-- Page content -->
<br />
- <iframe id="classPageIframe" onload="dtps.iframeLoad('classPageIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${pageContentURL}" />
+ <iframe id="classPageIframe" onload="dtps.iframeLoad('classPageIframe')" style="margin: 10px 0px; width: 100%; border: none; outline: none;" src="${pageContentURL}"></iframe>
</div>
`);
}
diff --git a/scripts/people.js b/scripts/people.js
index 09d4591..992f3f5 100644
--- a/scripts/people.js
+++ b/scripts/people.js
@@ -106,7 +106,7 @@
jQuery(".classContent").html(/*html*/`
<div style="--size: 250px; margin: 0px 20px;" class="grid flex">
<div class="block status card">
- <h2 style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="main">${currentSection || "--"}</h2>
+ <h2 style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="main">${DOMPurify.sanitize(currentSection || "--")}</h2>
<h5 class="bottom"><i class="fluid-icon">contact_page</i> Your section</h5>
</div>
<div class="block status">
@@ -121,13 +121,13 @@
` + sections.map(section => (
/*html*/`
<div class="card">
- <h5><b>${section.title}</b> (${section.users.length} ${section.users.length == 1 ? "person" : "people"})</h5>
+ <h5><b>${DOMPurify.sanitize(section.title)}</b> (${section.users.length} ${section.users.length == 1 ? "person" : "people"})</h5>
${section.users.map(user => (
/*html*/`
<div>
<p>
- <img style="width: 30px; border-radius: 50%; vertical-align: middle; margin-right: 5px;" src="${user.photoURL}" />
- <a href="${user.url}" style="color: var(--text); vertical-align: middle;">${user.name}</a>
+ <img style="width: 30px; border-radius: 50%; vertical-align: middle; margin-right: 5px;" src="${dtps.escapeAttr(user.photoURL)}" />
+ <a href="${dtps.escapeAttr(dtps.safeURL(user.url))}" style="color: var(--text); vertical-align: middle;">${DOMPurify.sanitize(user.name)}</a>
</p>
</div>
`
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>` : ""}
diff --git a/www/demo/index.html b/www/demo/index.html
index 35fb931..d0075e8 100644
--- a/www/demo/index.html
+++ b/www/demo/index.html
@@ -9,7 +9,7 @@
<meta name="description" content="Power+ demonstration website">
<meta name="author" content="jottocraft">
<script>window.dtpsPreLoader = true; window.dtpsBaseURL = window.location.origin;</script>
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://cdn.jottocraft.com/3rdparty/scripts/jquery.min.js"></script>
<script src="/scripts/lms/demo.js"></script>
</head>