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

Merge master into dev

Browse source
This commit is contained in:
calzoneman 2013-07-03 16:06:13 -04:00
parent d34301e2e2 91a2fcb61d
commit 860d81afbc
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
channel.js
View file

@ -26,6 +26,7 @@ var ChatCommand = require("./chatcommand.js");
var Filter = require("./filter.js").Filter; var Filter = require("./filter.js").Filter;
var ActionLog = require("./actionlog"); var ActionLog = require("./actionlog");
var Playlist = require("./playlist"); var Playlist = require("./playlist");
var sanitize = require("validator").sanitize;
var Channel = function(name) { var Channel = function(name) {
Logger.syslog.log("Opening channel " + name); Logger.syslog.log("Opening channel " + name);
@ -1574,6 +1575,7 @@ Channel.prototype.tryUpdateFilter = function(user, f) {
var re = f.source; var re = f.source;
var flags = f.flags; var flags = f.flags;
f.replace = sanitize(f.replace).xss();
try { try {
new RegExp(re, flags); new RegExp(re, flags);
} }
@ -1676,6 +1678,7 @@ Channel.prototype.trySetJS = function(user, data) {
Channel.prototype.updateMotd = function(motd) { Channel.prototype.updateMotd = function(motd) {
var html = motd.replace(/\n/g, "<br>"); var html = motd.replace(/\n/g, "<br>");
html = sanitize(html).xss();
//html = this.filterMessage(html); //html = this.filterMessage(html);
this.motd = { this.motd = {
motd: motd, motd: motd,
@ -1762,8 +1765,7 @@ Channel.prototype.filterMessage = function(msg) {
Channel.prototype.sendMessage = function(username, msg, msgclass, data) { Channel.prototype.sendMessage = function(username, msg, msgclass, data) {
// I don't want HTML from strangers // I don't want HTML from strangers
msg = msg.replace(/&/g, "&amp;"); msg = sanitize(msg).escape();
msg = msg.replace(/</g, "&lt;").replace(/>/g, "&gt;");
msg = this.filterMessage(msg); msg = this.filterMessage(msg);
var msgobj = { var msgobj = {
username: username, username: username,

3
package.json
View file

@ -12,6 +12,7 @@
"mysql-libmysqlclient": "*", "mysql-libmysqlclient": "*",
"node_hash": "*", "node_hash": "*",
"bcrypt": "*", "bcrypt": "*",
"nodemailer": "*" "nodemailer": "*",
"validator": "*"
} }
} }

3
www/assets/js/callbacks.js
View file

@ -106,8 +106,9 @@ Callbacks = {
setMotd: function(data) { setMotd: function(data) {
CHANNEL.motd = data.html; CHANNEL.motd = data.html;
CHANNEL.motd_text = data.motd;
$("#motd").html(data.html); $("#motd").html(data.html);
$("#motdtext").val(CHANNEL.motd); $("#motdtext").val(CHANNEL.motd_text);
if(data.motd != "") if(data.motd != "")
$("#motd").show(); $("#motd").show();
else else

1
www/assets/js/data.js
View file

@ -29,6 +29,7 @@ var CHANNEL = {
css: "", css: "",
js: "", js: "",
motd: "", motd: "",
motd_text: "",
name: false name: false
}; };

2
www/assets/js/util.js
View file

@ -788,7 +788,7 @@ function handleModPermissions() {
$("#opt_voteskip_ratio").val(CHANNEL.opts.voteskip_ratio); $("#opt_voteskip_ratio").val(CHANNEL.opts.voteskip_ratio);
$("#csstext").val(CHANNEL.css); $("#csstext").val(CHANNEL.css);
$("#jstext").val(CHANNEL.js); $("#jstext").val(CHANNEL.js);
$("#motdtext").val(CHANNEL.motd); $("#motdtext").val(CHANNEL.motd_text);
setVisible("#permedit_tab", CLIENT.rank >= 3); setVisible("#permedit_tab", CLIENT.rank >= 3);
setVisible("#banlist_tab", hasPermission("ban")); setVisible("#banlist_tab", hasPermission("ban"));
setVisible("#motdedit_tab", hasPermission("motdedit")); setVisible("#motdedit_tab", hasPermission("motdedit"));