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

Fix kick behavior

This commit is contained in:
calzoneman 2014-10-25 22:49:22 -05:00
parent 5d74559278
commit 575b762ba1
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/channel/channel.js
View File

@ -334,7 +334,6 @@ Channel.prototype.acceptUser = function (user) {
if (user.socket._isUsingTor) { if (user.socket._isUsingTor) {
if (this.modules.options && this.modules.options.get("torbanned")) { if (this.modules.options && this.modules.options.get("torbanned")) {
user.kick("This channel has banned connections from Tor."); user.kick("This channel has banned connections from Tor.");
user.socket.disconnect(true);
this.logger.log("[login] Blocked connection from Tor exit at " + this.logger.log("[login] Blocked connection from Tor exit at " +
user.displayip); user.displayip);
return; return;

4
lib/io/ioserver.js
View File

@ -87,7 +87,7 @@ function ipLimitReached(sock) {
sock.emit("kick", { sock.emit("kick", {
reason: "Too many connections from your IP address" reason: "Too many connections from your IP address"
}); });
sock.disconnect(true); sock.disconnect();
return; return;
} }
} }
@ -154,7 +154,7 @@ function handleConnection(sock) {
if (db.isGlobalIPBanned(ip)) { if (db.isGlobalIPBanned(ip)) {
Logger.syslog.log("Rejecting " + ip + " - global banned"); Logger.syslog.log("Rejecting " + ip + " - global banned");
sock.emit("kick", { reason: "Your IP is globally banned." }); sock.emit("kick", { reason: "Your IP is globally banned." });
sock.disconnect(true); sock.disconnect();
return; return;
} }

2
lib/user.js
View File

@ -219,7 +219,7 @@ User.prototype.autoAFK = function () {
User.prototype.kick = function (reason) { User.prototype.kick = function (reason) {
this.socket.emit("kick", { reason: reason }); this.socket.emit("kick", { reason: reason });
this.socket.disconnect(true); this.socket.disconnect();
}; };
User.prototype.initAdminCallbacks = function () { User.prototype.initAdminCallbacks = function () {