Work on ACP

lib/web/acp.js

@@ -0,0 +1,112 @@
+var path = require("path");
+var fs = require("fs");
+var webserver = require("./webserver");
+var sendJade = require("./jade").sendJade;
+var Logger = require("../logger");
+var db = require("../database");
+
+function checkAdmin(cb) {
+    return function (req, res) {
+        webserver.logRequest(req);
+        var auth = req.cookies.auth;
+        if (!auth) {
+            res.send(403);
+            return;
+        }
+        db.users.verifyAuth(auth, function (err, user) {
+            if (err) {
+                if (err === "Invalid auth string" ||
+                    err === "Auth string does not match an existing user") {
+                    res.send(403);
+                } else {
+                    res.send(500);
+                }
+                return;
+            }
+
+            if (user.global_rank < 255) {
+                res.send(403);
+                Logger.eventlog.log("[acp] Attempted GET /acp from non-admin " +
+                                    user.name + "@" + webserver.ipForRequest(req));
+                return;
+            }
+
+            cb(req, res, user);
+        });
+    };
+}
+
+/**
+ * Handles a request for the ACP
+ */
+function handleAcp(req, res, user) {
+    sendJade(res, "acp", {
+        loginName: user.name,
+        loggedIn: true
+    });
+}
+
+/**
+ * Streams the last length bytes of file to the given HTTP response
+ */
+function readLog(res, file, length) {
+    fs.stat(file, function (err, data) {
+        if (err) {
+            res.send(500);
+            return;
+        }
+
+        var start = Math.max(0, data.size - length);
+        if (isNaN(start)) {
+            res.send(500);
+        }
+        var end = Math.max(0, data.size - 1);
+        if (isNaN(end)) {
+            res.send(500);
+        }
+        fs.createReadStream(file, { start: start, end: end })
+            .pipe(res);
+    });
+}
+
+/**
+ * Handles a request to read the syslog
+ */
+function handleReadSyslog(req, res) {
+    readLog(res, path.join(__dirname, "..", "..", "sys.log"), 1048576);
+}
+
+/**
+ * Handles a request to read the error log
+ */
+function handleReadErrlog(req, res) {
+    readLog(res, path.join(__dirname, "..", "..", "error.log"), 1048576);
+}
+
+/**
+ * Handles a request to read the http log
+ */
+function handleReadHttplog(req, res) {
+    readLog(res, path.join(__dirname, "..", "..", "http.log"), 1048576);
+}
+
+/**
+ * Handles a request to read a channel log
+ */
+function handleReadChanlog(req, res) {
+    if (!req.params.name.match(/^[\w-]{1,30}$/)) {
+        res.send(400);
+        return;
+    }
+    readLog(res, path.join(__dirname, "..", "..", "chanlogs", req.params.name + ".log"), 1048576);
+}
+
+module.exports = {
+    init: function (app) {
+        app.get("/acp", checkAdmin(handleAcp));
+        app.get("/acp/syslog", checkAdmin(handleReadSyslog));
+        app.get("/acp/errlog", checkAdmin(handleReadErrlog));
+        app.get("/acp/httplog", checkAdmin(handleReadHttplog));
+        app.get("/acp/chanlog/:name", checkAdmin(handleReadChanlog));
+    }
+};

lib/web/webserver.js

@@ -153,38 +153,6 @@ function handleIndex(req, res) {
     });
 }
 
-/**
- * Handles a request for the ACP
- */
-function handleAcp(req, res) {
-    logRequest(req);
-
-    var auth = req.cookies.auth || "";
-    db.users.verifyAuth(auth, function (err, user) {
-        if (err) {
-            if (err === "Invalid auth string" ||
-                err === "Auth string does not match an existing user") {
-                res.send(403);
-            } else {
-                res.send(500);
-            }
-            return;
-        }
-
-        if (user.global_rank < 255) {
-            res.send(403);
-            Logger.eventlog.log("[acp] Attempted GET /acp from non-admin " + user.name +
-                                "@" + ipForRequest(req));
-            return;
-        }
-
-        sendJade(res, "acp", {
-            loginName: user.name,
-            loggedIn: true
-        });
-    });
-}
-
 /**
  * Handles a request for the socket.io information
  */
@@ -200,8 +168,7 @@ function handleSocketConfig(req, res) {
              "',ALLOW_SSL="+Config.get("https.enabled")+";" +
              (Config.get("https.enabled") ?
              "if(location.protocol=='https:'||USEROPTS.secure_connection){" +
-             "IO_URL=WEB_URL=SSL_URL;}" : ""));
-}
+             "IO_URL=WEB_URL=SSL_URL;}" : "")); }
 
 module.exports = {
     /**
@@ -220,9 +187,12 @@ module.exports = {
         app.get("/r/:channel", handleChannel);
         app.get("/", handleIndex);
         app.get("/sioconfig", handleSocketConfig);
-        app.get("/acp", handleAcp);
+        require("./auth").init(app);
+        require("./account").init(app);
+        require("./acp").init(app);
         app.all("*", function (req, res, next) {
             if (isSuspicious(req)) {
+                console.log("isSuspicious");
                 logRequest(req, 403);
                 res.status(403);
                 if (req.header("user-agent").toLowerCase() === "zmeu") {
@@ -238,8 +208,6 @@ module.exports = {
             next();
         });
         app.use(express.static("www"));
-        require("./auth").init(app);
-        require("./account").init(app);
     },
 
     logRequest: logRequest,