OSDN Git Service

グローバル変数の数を減らした
[webchat/WebChat.git] / chat.js
diff --git a/chat.js b/chat.js
index de151a2..dbdd35e 100644 (file)
--- a/chat.js
+++ b/chat.js
@@ -7,18 +7,6 @@ $system_name = "system";       //システム発言を表す名前
 $log_directory = "log";        //ログファイルを置くフォルダー\r
 $log_file_name = "logfile%d.txt";      //ログファイル名(%dはそのままにしておくこと)\r
 $splited_log_file_name = "logfile%d_%s.txt"    //分割後のファイル名(%dと%sはそのままにしておくこと)\r
-$pastlogfile_pattern = "logfile%d(_+.*)?\.txt";        //過去ログと判定する正規表現\r
-\r
-var resource = require("./resources.js");\r
-var config = require("./configure.js");\r
-var lazy = require("./lazy.js");\r
-var security = require("./security.js");\r
-var fs = require("fs");\r
-var async = require("async");\r
-var path = require("path");\r
-var util = require("util");\r
-var cookie = require("express/node_modules/cookie");\r
-var connectUtils = require("express/node_modules/connect/lib/utils");\r
 \r
 var clients = new Array();\r
 \r
@@ -29,17 +17,17 @@ module.exports = function(app,server,express,session){
        app.get("/chat", chat_proc);\r
        app.all("/log/*",express.basicAuth(auth_proc));\r
        app.get("/log/*",log_proc);\r
-       app.all("/admin_chat",express.basicAuth(auth_proc));\r
-       app.get("/admin_chat", adminchat_proc);\r
-       app.all("/admin",express.basicAuth(auth_proc));\r
-       app.get("/admin", admin_proc);\r
-       app.post("/admin",admin_postproc);\r
+       app.all("/chat/admin",express.basicAuth(auth_proc));\r
+       app.get("/chat/admin", admin_proc);\r
+       app.post("/chat/admin",admin_postproc);\r
 \r
+       var config = require("./configure.js");\r
        var io = require("socket.io").listen(server);\r
        io.configure("production", function(){\r
+               io.set("transports", config.transports);\r
                io.enable("browser client minification");  // minified されたクライアントファイルを送信する\r
-       io.enable("browser client etag");          // バージョンによって etag によるキャッシングを有効にする\r
-       io.set("log level", 1);                    // ログレベルを設定(デフォルトより下げている)\r
+               io.enable("browser client etag");          // バージョンによって etag によるキャッシングを有効にする\r
+               io.set("log level", 1);                    // ログレベルを設定(デフォルトより下げている)\r
        });\r
 \r
        for(var i = 0; i < config.max_room_number; i++)\r
@@ -52,16 +40,18 @@ module.exports = function(app,server,express,session){
 };\r
 \r
 function chat_proc(req, res){\r
+       var security = require("./security.js");\r
        var info = new security.SessionInfomation(false);\r
        req.session.items = info;\r
 \r
        var room_number = 0;\r
        if(typeof(req.query.rno) != "undefined")\r
                room_number = req.query.rno;\r
-       res.render("chat",{rno:room_number,token:info.token});\r
+       res.render("chat",{rno:room_number,token:req.session._csrf});\r
 }\r
 \r
 function auth_proc(user, pass) {\r
+       var config = require("./configure.js");\r
        return user === config.username && pass === config.password;\r
 }\r
 \r
@@ -69,55 +59,43 @@ function log_proc(req, res) {
        res.sendfile(__dirname + req.url);\r
 }\r
 \r
-function adminchat_proc(req, res){\r
-       var info = new security.SessionInfomation(true);\r
-       req.session.items = info;\r
-\r
-       var room_number = 0;\r
-       if(typeof(req.query.rno) != "undefined")\r
-               room_number = req.query.rno;\r
-       res.render("chat",{rno:room_number,token:info.token});\r
-}\r
-\r
 function admin_postproc(req,res){\r
-       if(req.session.items.token != req.body.token)\r
-       {\r
-               res.send(resource.invaild_token_message);\r
-               return;\r
-       }\r
        if(typeof(req.body.erase) != "undefined")\r
        {\r
                removeLog(req.body.file,function(){\r
-                       res.redirect("/admin");\r
+                       res.redirect("/chat/admin");\r
                });\r
        }\r
        if(typeof(req.body.registor) != "undefined")\r
        {\r
                ipbanlist.Update(req.body.newbanlist,function(){\r
-                       res.redirect("/admin");\r
+                       res.redirect("/chat/admin");\r
                });\r
        }\r
        if(typeof(req.body.updateroom) != "undefined")\r
        {\r
-               $rooms.Update(req.body.newroomlist,function(){\r
-                       res.redirect("/admin");\r
+               $rooms.Update(req.body,function(){\r
+                       res.redirect("/chat/admin");\r
                });\r
        }\r
 }\r
 \r
 function admin_proc(req,res)\r
 {\r
+       var security = require("./security.js");\r
        var info = new security.SessionInfomation(true);\r
        req.session.items = info;\r
        var iplist = ipbanlist.GetText();\r
+       var fs = require("fs");\r
 \r
        fs.readdir($log_directory,function(err,list){\r
+               res.setHeader("X-FRAME-OPTIONS","DENY");\r
                res.render("admin", {\r
                        files: list,\r
                        log_directory:$log_directory,\r
                        ipbanlist:iplist,\r
-                       token:info.token,\r
-                       roomlist:$rooms.GetString()\r
+                       token:req.session._csrf,\r
+                       roomlist:$rooms.GetMessage()\r
                });\r
        });\r
 }\r
@@ -130,9 +108,10 @@ function removeLog(files,callback)
                        callback();\r
                return;\r
        }\r
-\r
+       var async = require("async");\r
        async.map(files,\r
        function(item,callback){\r
+               var fs = require("fs");\r
                fs.unlink($log_directory + "/" + item,callback);\r
        },\r
        function(err,results){\r
@@ -144,12 +123,14 @@ function removeLog(files,callback)
 //RoomInfomationCollecionクラス\r
 function RoomInfomationCollection()\r
 {\r
+       var config = require("./configure.js");\r
        var MySQLPool = new require("./mysql_pool.js");\r
        var pool = new MySQLPool({\r
                                host     : config.db_host,\r
                                user     : config.db_user,\r
                                password : config.db_password,\r
-                               database : "webchat",\r
+                               port     : config.db_port,\r
+                               database : config.db_name,\r
                        });\r
        var collection = {};\r
        this.Get = function(rno){\r
@@ -158,17 +139,17 @@ function RoomInfomationCollection()
        this.IsContains = function(rno){\r
                return rno in collection;\r
        };\r
-       this.GetString = function(){\r
-               var retval = "";\r
+       this.GetMessage = function(){\r
+               var retval = new Array();\r
                for(var rno in collection)\r
                {\r
-                       if($rooms.Get(rno).IsVolatile())\r
-                               continue;\r
-                       var pass = collection[rno].password;\r
-                       if(pass == null)\r
-                               pass = "";\r
-                       var hiddenlog = collection[rno].hiddenlog;\r
-                       retval += rno + ":" + pass + ":" + hiddenlog + "\r\n";\r
+                       item={};\r
+                       item.applyflag = !$rooms.Get(rno).IsVolatile();\r
+                       item.password = collection[rno].password;\r
+                       if(item.password == null)\r
+                               item.password = "";\r
+                       item.hiddenlog = collection[rno].hiddenlog;\r
+                       retval.push(item);\r
                }\r
                return retval;\r
        };\r
@@ -180,46 +161,37 @@ function RoomInfomationCollection()
                }\r
                return retval;\r
        }\r
-       this.Update = function(text,callfunc){\r
+       this.Update = function(data,callfunc){\r
                Clear();\r
+               var async = require("async");\r
                async.waterfall([\r
                        function(next){\r
                                pool.query("TRUNCATE TABLE rooms",null,next);\r
                        },\r
                        function(result,next){\r
-                               lines = text.split("\r\n");\r
+                               var util = require("util");\r
+                               console.log(util.inspect(data));\r
                                var items = new Array();\r
-                               for(var i = 0; i < lines.length; i++)\r
+                               var config = data.config;\r
+                               for(var i = 0; i < config.length; i++)\r
                                {\r
-                                       if(lines[i] == "")\r
+                                       var rno = Number(config[i].applyflag);\r
+                                       if(isNaN(rno))\r
                                                continue;\r
-                                       var token = lines[i].split(":");\r
-                                       if(token.length == 1)\r
-                                       {\r
-                                               Add(token[0],null,false);\r
-                                               items.push(new Array(token[0],null,false));\r
-                                       }\r
-                                       else if(token.length == 2)\r
-                                       {\r
-                                               var rno = token[0];\r
-                                               var pass = token[1];\r
-                                               if(pass == "")\r
-                                                       pass = null;\r
-                                               Add(rno, pass,false);\r
-                                               items.push(new Array(token[0],pass,false));\r
-                                       }\r
-                                       else if(token.length == 3)\r
-                                       {\r
-                                               var rno = token[0];\r
-                                               var pass = token[1];\r
-                                               if(pass == "")\r
-                                                       pass = null;\r
-                                               var hiddenlog = false;\r
-                                               if(token[2] == "true")\r
-                                                       hiddenlog = true;\r
-                                               Add(rno, pass,hiddenlog);\r
-                                               items.push(new Array(token[0],pass,hiddenlog));\r
-                                       }\r
+                                       var password,romonly;\r
+                                       if(typeof(config[rno].password)=="undefined")\r
+                                               password = null;\r
+                                       else if(config[rno].password == "")\r
+                                               password = null;\r
+                                       else\r
+                                               password = config[rno].password;\r
+                                       if(typeof(config[rno].hiddenlog)=="undefined")\r
+                                               romonly = false;\r
+                                       else\r
+                                               romonly = config[rno].hiddenlog == "romonly";\r
+\r
+                                       Add(rno,password,romonly);\r
+                                       items.push(new Array(rno,password,romonly));\r
                                }\r
                                pool.query("INSERT INTO rooms VALUES ?",[items],callfunc);\r
                        }\r
@@ -227,6 +199,7 @@ function RoomInfomationCollection()
        }\r
        function GetRoomList(callback){\r
                Clear();\r
+               var async = require("async");\r
                async.waterfall([\r
                        function(next){\r
                                pool.query("SELECT * FROM rooms",null,next);\r
@@ -243,6 +216,7 @@ function RoomInfomationCollection()
        }\r
        function Clear(){\r
                collection = {};\r
+               var config = require("./configure.js");\r
                for(var i = 0; i < config.max_room_number; i++)\r
                        Add(i,null,null);\r
        };\r
@@ -371,12 +345,14 @@ function RoomInfomation(pass,hiddenlogflag)
 //IPBANクラス\r
 function IpBanCollecion()\r
 {\r
+       var config = require("./configure.js");\r
        var MySQLPool = new require("./mysql_pool.js");\r
        var pool = new MySQLPool({\r
                                host     : config.db_host,\r
                                user     : config.db_user,\r
                                password : config.db_password,\r
-                               database : "webchat",\r
+                               port     : config.db_port,\r
+                               database : config.db_name,\r
                        });\r
        var collection = {};\r
        this.IsBaned = function(ip){\r
@@ -398,6 +374,7 @@ function IpBanCollecion()
        }\r
        this.Update = function(text,callfunc){\r
                collection = {};\r
+               var async = require("async");\r
                async.waterfall([\r
                        function(next){\r
                                pool.query("TRUNCATE TABLE ipbanlist",null,next);\r
@@ -423,6 +400,7 @@ function IpBanCollecion()
        }\r
        function GetIpBanList(callfunc)\r
        {\r
+               var async = require("async");\r
                async.waterfall([\r
                        function(next){\r
                                pool.query("SELECT * FROM ipbanlist",null,next);\r
@@ -444,6 +422,7 @@ createLogDirectory();
 \r
 function createLogDirectory()\r
 {\r
+       var fs = require("fs");\r
        fs.exists($log_directory,function(exists){\r
                if(exists == false)\r
                        fs.mkdirSync($log_directory);\r
@@ -462,16 +441,12 @@ function ParseConnect(socket)
        room.AddRom(ip);\r
 \r
        var roomconfig = room.GetConfig();\r
-       roomconfig.admin = socket.handshake.admin;\r
        socket.json.emit("send roominfo",roomconfig);\r
 \r
        var romcount = room.GetRomCount();\r
        socket.json.emit("send romcount",romcount);\r
        socket.json.broadcast.emit("send romcount",romcount);\r
 \r
-       socket.on("get pastLogList", function (msg) {\r
-               ParseGetPastLogList(socket,msg);\r
-       });\r
        socket.on("get pastLog", function (msg) {\r
                ParseGetPastLog(socket,msg);\r
        });\r
@@ -494,7 +469,9 @@ function ParseConnect(socket)
 \r
 function ParseAuthorization(handshakeData, callback)\r
 {\r
+       var connectUtils = require("express/node_modules/connect/lib/utils");\r
        if(handshakeData.headers.cookie) {\r
+               var cookie = require("express/node_modules/cookie");\r
                var signedCookie = cookie.parse(handshakeData.headers.cookie);\r
                var sessionID = connectUtils.parseSignedCookies(signedCookie, $secret)["connect.sid"];\r
                sessionStore.get(sessionID, function (err, session) {\r
@@ -503,13 +480,12 @@ function ParseAuthorization(handshakeData, callback)
                                result = "failed get from session store";\r
                        else if(err)\r
                                result = err;\r
-                       else if(handshakeData.query.token != session.items.token)\r
+                       else if(typeof(session) == "undefined" || typeof(session._csrf) == "undefined")\r
+                               result = "session is undefined";\r
+                       else if(handshakeData.query.token != session._csrf)\r
                                result = "invaild token";\r
-                       if(typeof(session) != "undefined" && result == null)\r
-                       {\r
-                               handshakeData.admin = session.items.admin;\r
+                       if(result == null)\r
                                handshakeData.sessionID = sessionID;\r
-                       }\r
                        callback(result,result == null && !err);\r
                });\r
        } else {\r
@@ -537,6 +513,7 @@ function ParseSetPassword(socket,msg)
                name:$system_name,\r
                message:null,\r
        };\r
+       var resource = require("./resources.js");\r
        if($rooms.Get(rno).IsVolatile() == false && $rooms.Get(rno).SetPassword(msg.owner,msg.password))\r
                newMeg.message = resource.password_setted_message;\r
        else\r
@@ -550,6 +527,7 @@ function ParseJoin(socket,msg)
 \r
        if(ipbanlist.IsBlockedToWrite(ip))\r
        {\r
+               var resource = require("./resources.js");\r
                socket.emit("error",resource.block_message);\r
                return;\r
        }\r
@@ -562,6 +540,7 @@ function ParseJoin(socket,msg)
        socket.json.emit("send romcount",romcount);\r
        socket.json.broadcast.emit("send romcount",romcount);\r
 \r
+       var util = require("util");\r
        if($rooms.Get(rno).IsVolatile() == false)\r
        {\r
                if($rooms.Get(rno).IsTimeout() ||\r
@@ -576,6 +555,7 @@ function ParseJoin(socket,msg)
                }\r
                else\r
                {\r
+                       var resource = require("./resources.js");\r
                        socket.emit("error",resource.unmatch_password);\r
                        return;\r
                }\r
@@ -592,6 +572,7 @@ function ParseQuit(socket,msg)
 {\r
        var ip = GetClientIPAdress(socket);\r
 \r
+       var resource = require("./resources.js");\r
        if(ipbanlist.IsBlockedToWrite(ip))\r
        {\r
                socket.emit("error",resource.block_message);\r
@@ -625,6 +606,7 @@ function ParseQuit(socket,msg)
                        $rooms.Get(rno).RemoveAuth(msg.name);\r
        }\r
 \r
+       var util = require("util");\r
        newMeg.message = util.format("/quitedby %s",msg.name);\r
        ParseSendMsg(socket,newMeg);\r
 }\r
@@ -637,6 +619,7 @@ function ParseSendMsg(socket,msg)
 \r
        if(ip in ipbanlist)\r
        {\r
+               var resource = require("./resources.js");\r
                socket.emit("error",resource.block_message);\r
                return;\r
        }\r
@@ -662,6 +645,7 @@ function ParseSendMsg(socket,msg)
 \r
        socket.json.broadcast.emit("req msg", repacked_msg);\r
 \r
+       var util = require("util");\r
        var path = $log_directory + "/" + util.format($log_file_name,rno);\r
        var log = new ChatLog(path);\r
        log.Save(repacked_msg,ip,rno);\r
@@ -679,29 +663,14 @@ function GetRoomNumberFromName(name)
        throw "GetRoomNumberFromName error";\r
 }\r
 \r
-function ParseGetPastLogList(socket,msg)\r
-{\r
-       var list = fs.readdir($log_directory,function(err,files){\r
-               var text = "";\r
-               var rno = GetRoomNumberFromName(socket.namespace.name);\r
-               var pattern = $pastlogfile_pattern.replace("%d",rno);\r
-               for(var i = 0; i < files.length; i++)\r
-               {\r
-                       var logname = files[i];\r
-                       if(logname.match(pattern))\r
-                               text += files[i] + "\n";\r
-               }\r
-               socket.emit("req pastloglist",text);\r
-       });\r
-}\r
-\r
 function ParseGetPastLog(socket,file)\r
 {\r
        if(file == "")\r
                return;\r
        var path = $log_directory + "/" + file;\r
        var log = new ChatLog(path);\r
-       log.ToArray(socket.handshake.admin,function(array){\r
+       var config = require("./configure.js");\r
+       log.ToArray(config.showip,function(array){\r
                socket.json.emit("req pastlog",array);\r
        });\r
 }\r
@@ -710,13 +679,15 @@ function ChatLog(path)
 {\r
        this.ToArray = function(hasIp,callback)\r
        {\r
+               var fs = require("fs");\r
                var state = fs.stat(path,function(err,state){\r
                        if(err)\r
                                return;\r
                        var array = new Array();\r
                        var stream = fs.createReadStream(path);\r
+                       var lazy = require("lazy");\r
                        new lazy(stream)\r
-                               .spilt(";")\r
+                               .lines\r
                                .forEach(function(line){\r
                                        var msg = CreateMessageFromText(line.toString());\r
                                        if(hasIp == false)\r
@@ -743,12 +714,14 @@ function ChatLog(path)
                                msg.date + "<>" +\r
                                ip + "<>" +\r
                                msg.message +\r
-                               ";";\r
+                               "\n";\r
                return text;\r
        }\r
 \r
        function SplitLog(rno,callback)\r
        {\r
+               var util = require("util");\r
+               var fs = require("fs");\r
                var state = fs.stat(path,function(err,state){\r
                        if(err && typeof(callback) == "function")\r
                        {\r
@@ -772,6 +745,8 @@ function ChatLog(path)
 \r
        function WritePastLog(path,text)\r
        {\r
+               var fs = require("fs");\r
+               var async = require("async");\r
                async.waterfall([\r
                        function(callback){\r
                                fs.open(path,"a",callback);\r