moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Banlist and recent login history

This commit is contained in:
Calvin Montgomery 2013-06-17 23:57:29 -04:00
parent 32af68a68e
commit 449d01180a
7 changed files with 222 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
channel.js
View File

@ -93,7 +93,9 @@ var Channel = function(name) {
}; };
this.ipbans = {}; this.ipbans = {};
this.namebans = {}; this.namebans = {};
this.logins = {}; this.ip_alias = {};
this.name_alias = {};
this.login_hist = [];
this.logger = new Logger.Logger("chanlogs/" + this.name + ".log"); this.logger = new Logger.Logger("chanlogs/" + this.name + ".log");
this.i = 0; this.i = 0;
this.time = new Date().getTime(); this.time = new Date().getTime();
@ -205,10 +207,6 @@ Channel.prototype.loadDump = function() {
this.motd = data.motd; this.motd = data.motd;
this.broadcastMotd(); this.broadcastMotd();
} }
data.logins = data.logins || {};
for(var ip in data.logins) {
this.logins[ip] = data.logins[ip];
}
this.setLock(!(data.openqueue || false)); this.setLock(!(data.openqueue || false));
this.chatbuffer = data.chatbuffer || []; this.chatbuffer = data.chatbuffer || [];
for(var i = 0; i < this.chatbuffer.length; i++) { for(var i = 0; i < this.chatbuffer.length; i++) {
@ -242,7 +240,6 @@ Channel.prototype.saveDump = function() {
permissions: this.permissions, permissions: this.permissions,
filters: filts, filters: filts,
motd: this.motd, motd: this.motd,
logins: this.logins,
openqueue: this.openqueue, openqueue: this.openqueue,
chatbuffer: this.chatbuffer, chatbuffer: this.chatbuffer,
css: this.css, css: this.css,
@ -323,11 +320,9 @@ Channel.prototype.saveRank = function(user) {
Channel.prototype.getIPRank = function(ip) { Channel.prototype.getIPRank = function(ip) {
var names = []; var names = [];
if(this.logins[ip] === undefined || this.logins[ip].length == 0) { if(!(ip in this.ip_alias))
return 0; this.ip_alias = Database.getAliases(ip);
} this.ip_alias[ip].forEach(function(name) {
this.logins[ip].forEach(function(name) {
names.push(name); names.push(name);
}); });
@ -339,16 +334,6 @@ Channel.prototype.getIPRank = function(ip) {
return rank; return rank;
} }
Channel.prototype.seen = function(ip, name) {
name = name.toLowerCase();
for(var i = 0; i < this.logins[ip].length; i++) {
if(this.logins[ip][i].toLowerCase() == name) {
return true;
}
}
return false;
}
Channel.prototype.cacheMedia = function(media) { Channel.prototype.cacheMedia = function(media) {
// Prevent the copy in the playlist from messing with this one // Prevent the copy in the playlist from messing with this one
media = media.dup(); media = media.dup();
@ -362,7 +347,7 @@ Channel.prototype.cacheMedia = function(media) {
return false; return false;
} }
Channel.prototype.banName = function(actor, name) { Channel.prototype.tryNameBan = function(actor, name) {
if(!this.hasPermission(actor, "ban")) { if(!this.hasPermission(actor, "ban")) {
return false; return false;
} }
@ -370,11 +355,6 @@ Channel.prototype.banName = function(actor, name) {
name = name.toLowerCase(); name = name.toLowerCase();
var rank = this.getRank(name); var rank = this.getRank(name);
if(rank < 1) {
actor.socket.emit("errorMsg", {msg: "You can't ban guest names. Use a kick or IP ban."});
return false;
}
if(rank >= actor.rank) { if(rank >= actor.rank) {
actor.socket.emit("errorMsg", {msg: "You don't have permission to ban this person."}); actor.socket.emit("errorMsg", {msg: "You don't have permission to ban this person."});
return false; return false;
@ -409,47 +389,47 @@ Channel.prototype.unbanName = function(actor, name) {
return Database.channelUnbanName(this.name, name); return Database.channelUnbanName(this.name, name);
} }
Channel.prototype.tryIPBan = function(actor, data) { Channel.prototype.tryIPBan = function(actor, name, range) {
if(!this.hasPermission(actor, "ban")) { if(!this.hasPermission(actor, "ban")) {
return false; return false;
} }
if(typeof data.id != "string") { if(typeof name != "string") {
return false; return false;
} }
if(typeof data.name != "string") { var ips = Database.ipForName(name);
return false; var chan = this;
} ips.forEach(function(ip) {
var ip = this.hideIP(data.id); if(chan.getIPRank(ip) >= actor.rank) {
if(this.getIPRank(ip) >= actor.rank) { actor.socket.emit("errorMsg", {msg: "You don't have permission to ban IP: x.x." + ip.replace(/\d+\.\d+\.(\d+\.\d+)/, "$1")});
actor.socket.emit("errorMsg", {msg: "You don't have permission to ban this IP"});
return false; return false;
} }
if(data.range) { if(range) {
ip = ip.replace(/(\d+)\.(\d+)\.(\d+)\.(\d+)/, "$1.$2.$3"); ip = ip.replace(/(\d+)\.(\d+)\.(\d+)\.(\d+)/, "$1.$2.$3");
for(var ip2 in this.logins) { for(var ip2 in chan.ip_alias) {
if(ip2.indexOf(ip) == 0 && this.getIPRank(ip2) >= actor.rank) { if(ip2.indexOf(ip) == 0 && chan.getIPRank(ip2) >= actor.rank) {
actor.socket.emit("errorMsg", {msg: "You don't have permission to ban this IP"}); actor.socket.emit("errorMsg", {msg: "You don't have permission to ban IP: x.x." + ip2.replace(/\d+\.\d+\.(\d+\.\d+)/, "$1")});
return false; return false;
} }
} }
} }
this.ipbans[ip] = [data.name, actor.name]; chan.ipbans[ip] = [name, actor.name];
this.broadcastBanlist(); chan.broadcastBanlist();
this.logger.log(ip + " (" + data.name + ") was banned by " + actor.name); chan.logger.log(ip + " (" + name + ") was banned by " + actor.name);
for(var i = 0; i < this.users.length; i++) { for(var i = 0; i < chan.users.length; i++) {
if(this.users[i].ip.indexOf(ip) == 0) { if(chan.users[i].ip.indexOf(ip) == 0) {
this.kick(this.users[i], "Your IP is banned!"); chan.kick(chan.users[i], "Your IP is banned!");
i--; i--;
} }
} }
if(!this.registered) if(!chan.registered)
return false; return false;
// Update database ban table // Update database ban table
return Database.channelBan(this.name, ip, data.name, actor.name); return Database.channelBan(chan.name, ip, name, actor.name);
});
} }
Channel.prototype.banIP = function(actor, receiver) { Channel.prototype.banIP = function(actor, receiver) {
@ -488,8 +468,8 @@ Channel.prototype.unbanIP = function(actor, ip) {
} }
Channel.prototype.tryUnban = function(actor, data) { Channel.prototype.tryUnban = function(actor, data) {
if(data.id) { if(data.ip_hidden) {
var ip = this.hideIP(data.id); var ip = this.hideIP(data.ip_hidden);
this.unbanIP(actor, ip); this.unbanIP(actor, ip);
} }
else if(data.name) { else if(data.name) {
@ -531,9 +511,6 @@ Channel.prototype.search = function(query, callback) {
/* REGION User interaction */ /* REGION User interaction */
Channel.prototype.userJoin = function(user) { Channel.prototype.userJoin = function(user) {
if(!(user.ip in this.logins)) {
this.logins[user.ip] = [];
}
var parts = user.ip.split("."); var parts = user.ip.split(".");
var slash24 = parts[0] + "." + parts[1] + "." + parts[2]; var slash24 = parts[0] + "." + parts[1] + "." + parts[2];
// GTFO // GTFO
@ -653,27 +630,29 @@ Channel.prototype.hideIP = function(ip) {
return chars.join(""); return chars.join("");
} }
Channel.prototype.sendLoginHistory = function(user) {
if(user.rank < 2)
return;
user.socket.emit("recentLogins", this.login_hist);
}
Channel.prototype.sendRankStuff = function(user) { Channel.prototype.sendRankStuff = function(user) {
if(this.hasPermission(user, "ban")) { if(this.hasPermission(user, "ban")) {
var ents = []; var ents = [];
for(var ip in this.ipbans) { for(var ip in this.ipbans) {
if(this.ipbans[ip] != null) { if(this.ipbans[ip] != null) {
var name; var name = this.ipbans[ip][0];
if(ip in this.logins) { var ip_hidden = this.hideIP(ip);
name = this.logins[ip].join(", ");
}
else {
name = this.ipbans[ip][0];
}
var id = this.hideIP(ip);
var disp = ip; var disp = ip;
if(user.rank < Rank.Siteadmin) { if(user.rank < Rank.Siteadmin) {
disp = "(Hidden)"; disp = "x.x." + ip.replace(/\d+\.\d+\.(\d+\.\d+)/, "$1");
} }
ents.push({ ents.push({
ip: disp, ip_displayed: disp,
id: id, ip_hidden: ip_hidden,
name: name, name: name,
aliases: this.ip_alias[ip] || [],
banner: this.ipbans[ip][1] banner: this.ipbans[ip][1]
}); });
} }
@ -681,17 +660,20 @@ Channel.prototype.sendRankStuff = function(user) {
for(var name in this.namebans) { for(var name in this.namebans) {
if(this.namebans[name] != null) { if(this.namebans[name] != null) {
ents.push({ ents.push({
ip: "*", ip_displayed: "*",
ip_hidden: false,
name: name, name: name,
aliases: this.name_alias[name] || [],
banner: this.namebans[name] banner: this.namebans[name]
}); });
} }
} }
user.socket.emit("banlist", {entries: ents}); user.socket.emit("banlist", ents);
} }
// TODO get rid of this
if(Rank.hasPermission(user, "seenlogins")) { if(Rank.hasPermission(user, "seenlogins")) {
var ents = []; var ents = [];
for(var ip in this.logins) { for(var ip in this.ip_alias) {
var disp = ip; var disp = ip;
if(user.rank < Rank.Siteadmin) { if(user.rank < Rank.Siteadmin) {
disp = "(Hidden)"; disp = "(Hidden)";
@ -702,7 +684,7 @@ Channel.prototype.sendRankStuff = function(user) {
ents.push({ ents.push({
ip: disp, ip: disp,
id: this.hideIP(ip), id: this.hideIP(ip),
names: this.logins[ip], names: this.ip_alias[ip],
banned: banned banned: banned
}); });
} }
@ -797,9 +779,21 @@ Channel.prototype.broadcastUsercount = function() {
} }
Channel.prototype.broadcastNewUser = function(user) { Channel.prototype.broadcastNewUser = function(user) {
if(!this.seen(user.ip, user.name)) { var aliases = Database.getAliases(user.ip);
this.logins[user.ip].push(user.name); var chan = this;
} this.ip_alias[user.ip] = aliases;
aliases.forEach(function(alias) {
chan.name_alias[alias] = aliases;
});
this.login_hist.unshift({
name: user.name,
aliases: this.ip_alias[user.ip],
time: Date.now()
});
if(this.login_hist.length > 20)
this.login_hist.pop();
if(user.name.toLowerCase() in this.namebans && if(user.name.toLowerCase() in this.namebans &&
this.namebans[user.name.toLowerCase()] != null) { this.namebans[user.name.toLowerCase()] != null) {
this.kick(user, "You're banned!"); this.kick(user, "You're banned!");
@ -850,24 +844,20 @@ Channel.prototype.broadcastBanlist = function() {
var adminents = []; var adminents = [];
for(var ip in this.ipbans) { for(var ip in this.ipbans) {
if(this.ipbans[ip] != null) { if(this.ipbans[ip] != null) {
var name; var name = this.ipbans[ip][0];
if(ip in this.logins) { var ip_hidden = this.hideIP(ip);
name = this.logins[ip].join(", ");
}
else {
name = this.ipbans[ip][0];
}
var id = this.hideIP(ip);
ents.push({ ents.push({
ip: "(Hidden)", ip_displayed: "x.x." + ip.replace(/\d+\.\d+\.(\d+\.\d+)/, "$1"),
id: id, ip_hidden: ip_hidden,
name: name, name: name,
aliases: this.ip_alias[ip] || [],
banner: this.ipbans[ip][1] banner: this.ipbans[ip][1]
}); });
adminents.push({ adminents.push({
ip: ip, ip_displayed: ip,
id: id, ip_hidden: ip_hidden,
name: name, name: name,
aliases: this.ip_alias[ip] || [],
banner: this.ipbans[ip][1] banner: this.ipbans[ip][1]
}); });
} }
@ -875,13 +865,17 @@ Channel.prototype.broadcastBanlist = function() {
for(var name in this.namebans) { for(var name in this.namebans) {
if(this.namebans[name] != null) { if(this.namebans[name] != null) {
ents.push({ ents.push({
ip: "*", ip_displayed: "*",
ip_hidden: false,
name: name, name: name,
aliases: this.name_alias[name] || [],
banner: this.namebans[name] banner: this.namebans[name]
}); });
adminents.push({ adminents.push({
ip: "*", ip_displayed: "*",
ip_hidden: false,
name: name, name: name,
aliases: this.name_alias[name] || [],
banner: this.namebans[name] banner: this.namebans[name]
}); });
} }
@ -889,10 +883,10 @@ Channel.prototype.broadcastBanlist = function() {
for(var i = 0; i < this.users.length; i++) { for(var i = 0; i < this.users.length; i++) {
if(this.hasPermission(this.users[i], "ban")) { if(this.hasPermission(this.users[i], "ban")) {
if(this.users[i].rank >= Rank.Siteadmin) { if(this.users[i].rank >= Rank.Siteadmin) {
this.users[i].socket.emit("banlist", {entries: adminents}); this.users[i].socket.emit("banlist", adminents);
} }
else { else {
this.users[i].socket.emit("banlist", {entries: ents}); this.users[i].socket.emit("banlist", ents);
} }
} }
} }

27
chatcommand.js
View File

@ -39,7 +39,7 @@ function handle(chan, user, msg, data) {
handleBan(chan, user, msg.substring(5).split(" ")); handleBan(chan, user, msg.substring(5).split(" "));
} }
else if(msg.indexOf("/ipban ") == 0) { else if(msg.indexOf("/ipban ") == 0) {
handleIPBan(chan, user, msg.substring(5).split(" ")); handleIPBan(chan, user, msg.substring(7).split(" "));
} }
else if(msg.indexOf("/unban ") == 0) { else if(msg.indexOf("/unban ") == 0) {
handleUnban(chan, user, msg.substring(7).split(" ")); handleUnban(chan, user, msg.substring(7).split(" "));
@ -77,30 +77,13 @@ function handleKick(chan, user, args) {
} }
function handleIPBan(chan, user, args) { function handleIPBan(chan, user, args) {
if(chan.hasPermission(user, "ban") && args.length > 0) { chan.tryIPBan(user, args[0], args[1]);
args[0] = args[0].toLowerCase(); // Ban the name too for good measure
var kickee; chan.tryNameBan(user, args[0]);
for(var i = 0; i < chan.users.length; i++) {
if(chan.users[i].name.toLowerCase() == args[0]) {
kickee = chan.users[i];
break;
}
}
if(kickee && kickee.rank < user.rank) {
chan.logger.log("*** " + user.name + " banned " + args[0]);
args[0] = "";
var reason = args.join(" ");
chan.kick(kickee, "(banned) " + reason);
chan.banIP(user, kickee);
}
}
} }
function handleBan(chan, user, args) { function handleBan(chan, user, args) {
if(chan.hasPermission(user, "ban") && args.length > 0) { chan.tryNameBan(user, args[0]);
args[0] = args[0].toLowerCase();
chan.banName(user, args[0]);
}
} }
function handleUnban(chan, user, args) { function handleUnban(chan, user, args) {

54
database.js
View File

@ -918,7 +918,6 @@ function recordVisit(ip, name) {
var results = db.querySync(query); var results = db.querySync(query);
if(!results) { if(!results) {
console.log(results);
Logger.errlog.log("! Failed to record visit"); Logger.errlog.log("! Failed to record visit");
} }
@ -931,11 +930,60 @@ function recordVisit(ip, name) {
");"].join(""), ");"].join(""),
[ip] [ip]
)); ));
console.log(results);
return results; return results;
} }
function getAliases(ip) {
var db = getConnection();
if(!db) {
return [];
}
var query = createQuery(
"SELECT name FROM aliases WHERE ip=?",
[ip]
);
var results = db.querySync(query);
if(!results) {
Logger.errlog.log("! Failed to retrieve aliases");
return [];
}
var names = [];
results.fetchAllSync().forEach(function(row) {
names.push(row.name);
});
return names;
}
function ipForName(name) {
var db = getConnection();
if(!db) {
return [];
}
var query = createQuery(
"SELECT ip FROM aliases WHERE name=?",
[name]
);
var results = db.querySync(query);
if(!results) {
Logger.errlog.log("! Failed to retrieve IP for name");
return [];
}
var ips = [];
results.fetchAllSync().forEach(function(row) {
ips.push(row.ip);
});
return ips;
}
exports.setup = setup; exports.setup = setup;
exports.getConnection = getConnection; exports.getConnection = getConnection;
exports.createQuery = createQuery; exports.createQuery = createQuery;
@ -966,3 +1014,5 @@ exports.loadUserPlaylist = loadUserPlaylist;
exports.saveUserPlaylist = saveUserPlaylist; exports.saveUserPlaylist = saveUserPlaylist;
exports.deleteUserPlaylist = deleteUserPlaylist; exports.deleteUserPlaylist = deleteUserPlaylist;
exports.recordVisit = recordVisit; exports.recordVisit = recordVisit;
exports.getAliases = getAliases;
exports.ipForName = ipForName;

6
user.js
View File

@ -379,6 +379,12 @@ User.prototype.initCallbacks = function() {
} }
}.bind(this)); }.bind(this));
this.socket.on("requestLoginHistory", function() {
if(this.channel != null) {
this.channel.sendLoginHistory(this);
}
}.bind(this));
this.socket.on("requestAcl", function() { this.socket.on("requestAcl", function() {
if(this.channel != null) { if(this.channel != null) {
this.channel.sendACL(this); this.channel.sendACL(this);

46
www/assets/js/callbacks.js
View File

@ -250,26 +250,60 @@ Callbacks = {
banlist: function(entries) { banlist: function(entries) {
var tbl = $("#banlist table"); var tbl = $("#banlist table");
// dumb hack because of jquery UI
// sortable turns tables and lists into a mess of race conditions
if(!tbl.hasClass("table")) {
setTimeout(function() {
Callbacks.banlist(entries);
}, 100);
return;
}
if(tbl.children().length > 1) { if(tbl.children().length > 1) {
$(tbl.children()[1]).remove(); $(tbl.children()[1]).remove();
} }
for(var i = 0; i < entries.length; i++) { for(var i = 0; i < entries.length; i++) {
var tr = $("<tr/>").appendTo(tbl); var tr = document.createElement("tr");
var remove = $("<button/>").addClass("btn btn-mini btn-danger") var remove = $("<button/>").addClass("btn btn-mini btn-danger")
.appendTo($("<td/>").appendTo(tr)); .appendTo($("<td/>").appendTo(tr));
$("<i/>").addClass("icon-remove-circle").appendTo(remove); $("<i/>").addClass("icon-remove-circle").appendTo(remove);
var ip = $("<td/>").text(entries[i].ip).appendTo(tr); var ip = $("<td/>").text(entries[i].ip_displayed).appendTo(tr);
var name = $("<td/>").text(entries[i].name).appendTo(tr); var name = $("<td/>").text(entries[i].name).appendTo(tr);
var aliases = $("<td/>").text(entries[i].aliases).appendTo(tr); var aliases = $("<td/>").text(entries[i].aliases.join(", ")).appendTo(tr);
var banner = $("<td/>").text(entries[i].banner).appendTo(tr); var banner = $("<td/>").text(entries[i].banner).appendTo(tr);
var callback = (function(id, name) { return function() { var callback = (function(ip, name) { return function() {
socket.emit("unban", { socket.emit("unban", {
id: id, ip: ip,
name: name name: name
}); });
} })(entries[i].id, entries[i].name); } })(entries[i].ip_hidden, entries[i].name);
remove.click(callback); remove.click(callback);
$(tr).appendTo(tbl);
}
},
recentLogins: function(entries) {
var tbl = $("#loginhistory table");
// dumb hack because of jquery UI
// sortable turns tables and lists into a mess of race conditions
if(!tbl.hasClass("table")) {
setTimeout(function() {
Callbacks.recentLogins(entries);
}, 100);
return;
}
if(tbl.children().length > 1) {
$(tbl.children()[1]).remove();
}
for(var i = 0; i < entries.length; i++) {
var tr = document.createElement("tr");
var name = $("<td/>").text(entries[i].name).appendTo(tr);
var aliases = $("<td/>").text(entries[i].aliases.join(", ")).appendTo(tr);
var time = new Date(entries[i].time).toTimeString();
$("<td/>").text(time).appendTo(tr);
$(tr).appendTo(tbl);
} }
}, },

5
www/assets/js/channelsettings.js
View File

@ -20,6 +20,11 @@
clickHandler("#show_filteredit", "#filteredit"); clickHandler("#show_filteredit", "#filteredit");
clickHandler("#show_cssedit", "#cssedit"); clickHandler("#show_cssedit", "#cssedit");
clickHandler("#show_jsedit", "#jsedit"); clickHandler("#show_jsedit", "#jsedit");
clickHandler("#show_banlist", "#banlist");
clickHandler("#show_loginhistory", "#loginhistory");
$("#show_loginhistory").click(function() {
socket.emit("requestLoginHistory");
});
genPermissionsEditor(); genPermissionsEditor();

26
www/channeloptions.html
View File

@ -12,7 +12,7 @@
<li id="cssedit_tab"><a href="javascript:void(0);" id="show_cssedit">CSS Editor</a></li> <li id="cssedit_tab"><a href="javascript:void(0);" id="show_cssedit">CSS Editor</a></li>
<li id="jsedit_tab"><a href="javascript:void(0);" id="show_jsedit">JS Editor</a></li> <li id="jsedit_tab"><a href="javascript:void(0);" id="show_jsedit">JS Editor</a></li>
<li id="banlist_tab"><a href="javascript:void(0);" id="show_banlist">Ban List</a></li> <li id="banlist_tab"><a href="javascript:void(0);" id="show_banlist">Ban List</a></li>
<li id="recentconn_tab"><a href="javascript:void(0);" id="show_recentconn">Recent Connections</a></li> <li id="loginhistory_tab"><a href="javascript:void(0);" id="show_loginhistory">Recent Connections</a></li>
</ul> </ul>
</div> </div>
<hr> <hr>
@ -102,3 +102,27 @@ Filters Here
<textarea rows="10" id="jstext"></textarea> <textarea rows="10" id="jstext"></textarea>
<button class="btn btn-primary" id="save_js">Save</button> <button class="btn btn-primary" id="save_js">Save</button>
</div> </div>
<div id="banlist" class="span12">
<table class="table table-striped">
<thead>
<tr>
<th>Unban</th>
<th>IP</th>
<th>Name</th>
<th>Aliases</th>
<th>Banned By</th>
</tr>
</thead>
</table>
</div>
<div id="loginhistory" class="span12">
<table class="table table-striped">
<thead>
<tr>
<th>Name</th>
<th>Aliases</th>
<th>Time</th>
</tr>
</thead>
</table>
</div>