rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Copy CSS URL validation for JS

Browse source
This commit is contained in:
Calvin Montgomery 2016-12-13 22:22:25 -08:00
parent 453ed607ba
commit 53d385f53e
1 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/channel/opts.js
View file

@ -176,8 +176,11 @@ OptionsModule.prototype.handleSetOptions = function (user, data) {
var link = data.externalcss.substring(0, 255).trim(); var link = data.externalcss.substring(0, 255).trim();
if (!link) { if (!link) {
sendUpdate = (this.opts.externalcss !== "");
this.opts.externalcss = ""; this.opts.externalcss = "";
sendUpdate = true; user.socket.emit("validationPassed", {
target: "#cs-externalcss"
});
} else { } else {
var data = url.parse(link); var data = url.parse(link);
if (!data.protocol || data.protocol !== 'https:') { if (!data.protocol || data.protocol !== 'https:') {
@ -201,31 +204,41 @@ OptionsModule.prototype.handleSetOptions = function (user, data) {
} }
if ("externaljs" in data && user.account.effectiveRank >= 3) { if ("externaljs" in data && user.account.effectiveRank >= 3) {
var link = (""+data.externaljs).substring(0, 255); var prefix = "Invalid URL for external JS: ";
if (typeof data.externaljs !== "string") {
user.socket.emit("validationError", {
target: "#cs-externaljs",
message: prefix + "URL must be a string, not "
+ realTypeOf(data.externaljs)
});
}
var link = data.externaljs.substring(0, 255).trim();
if (!link) { if (!link) {
sendUpdate = (this.opts.externaljs !== "");
this.opts.externaljs = ""; this.opts.externaljs = "";
sendUpdate = true; user.socket.emit("validationPassed", {
target: "#cs-externaljs"
});
} else { } else {
var data = url.parse(link);
try { if (!data.protocol || data.protocol !== 'https:') {
var data = url.parse(link); user.socket.emit("validationError", {
if (!data.protocol || !data.protocol.match(/^(https?|ftp):/)) { target: "#cs-externaljs",
throw "Unacceptable protocol " + data.protocol; message: prefix + " URL must begin with 'https://'"
} else if (!data.host) {
throw "URL is missing host";
} else {
link = data.href;
}
} catch (e) {
user.socket.emit("errorMsg", {
msg: "Invalid URL for external JS: " + e,
alert: true
}); });
return; } else if (!data.host) {
user.socket.emit("validationError", {
target: "#cs-externaljs",
message: prefix + "missing hostname"
});
} else {
user.socket.emit("validationPassed", {
target: "#cs-externaljs"
});
this.opts.externaljs = data.href;
sendUpdate = true;
} }
this.opts.externaljs = link;
sendUpdate = true;
} }
} }