From 3730ae006655c3ade82b40c3a9be43731ca5b63b Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sun, 28 Apr 2013 01:30:18 -0500
Subject: [PATCH] Add global bans

---
 database.js  | 38 ++++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 server.js    | 16 +++++++++++-----
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/database.js b/database.js
index fcf4a199..e10d5f95 100644
--- a/database.js
+++ b/database.js
@@ -74,11 +74,49 @@ exports.init = function() {
         return false;
     }
 
+    var query = "CREATE TABLE IF NOT EXISTS `global_bans` \
+                    (`ip` VARCHAR( 15 ) NOT NULL ,\
+                    `note` VARCHAR( 255 ) NOT NULL ,\
+                    PRIMARY KEY (`ip`)\
+                    ) ENGINE = MYISAM";
+    var results = db.querySync(query);
+    if(!results) {
+        Logger.errlog.log("database.init: global ban table init failed!");
+        return false;
+    }
+
     initialized = true;
     db.closeSync();
     return true;
 }
 
+var gbanTime = 0;
+var gbans = {};
+exports.checkGlobalBan = function(ip) {
+    // Check database at most once per 5 minutes
+    if(new Date().getTime() > gbanTime + 300000) {
+        var db = exports.getConnection();
+        if(!db) {
+            return [];
+        }
+        // Check if channel exists
+        var query = "SELECT * FROM global_bans WHERE 1";
+        var results = db.querySync(query);
+        if(!results) {
+            Logger.errlog.log("loadGlobalBans: query failed");
+            return [];
+        }
+        var rows = results.fetchAllSync();
+        gbans = {};
+        for(var i = 0; i < rows.length; i++) {
+            gbans[rows[i].ip] = true;
+        }
+        db.closeSync();
+        gbanTime = new Date().getTime();
+    }
+    return (ip in gbans);
+}
+
 exports.loadChannel = function(chan) {
     var db = exports.getConnection();
     if(!db) {
diff --git a/package.json b/package.json
index 29e14d2f..5280a960 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.3.6",
+    "version": "1.4.0",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index edd1d8b7..f4ab79f9 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.3.6";
+const VERSION = "1.4.0";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
@@ -79,6 +79,16 @@ fs.exists("chanlogs", function(exists) {
 
 exports.io.sockets.on("connection", function(socket) {
     var ip = socket.handshake.address.address;
+    if(Database.checkGlobalBan(ip)) {
+        socket.emit("kick", {
+            reason: "You're globally banned!"
+        });
+        socket.disconnect(true);
+        return;
+    }
+    socket.on("disconnect", function() {
+        exports.clients[ip]--;
+    });
     if(!(ip in exports.clients)) {
         exports.clients[ip] = 1;
     }
@@ -89,13 +99,9 @@ exports.io.sockets.on("connection", function(socket) {
         socket.emit("kick", {
             reason: "Too many connections from your IP address"
         });
-        exports.clients[ip]--;
         socket.disconnect(true);
         return;
     }
-    socket.on("disconnect", function() {
-        exports.clients[ip]--;
-    });
     var user = new User(socket, ip);
     Logger.syslog.log("Accepted connection from /" + user.ip);
 });