specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Hopefully prevent more webserver crashes

Browse source
This commit is contained in:
calzoneman 2014-02-28 09:04:41 -06:00
parent 5b793710c3
commit d75c8dd230
1 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
lib/web/webserver.js
View file

@ -138,10 +138,10 @@ function handleIndex(req, res) {
var channels = Server.getServer().packChannelList(true);
channels.sort(function (a, b) {
if (a.usercount === b.usercount) {
return a.uniqueName > b.uniqueName ? 1 : -1;
return a.uniqueName > b.uniqueName ? -1 : 1;
}
return a.usercount - b.usercount;
return b.usercount - a.usercount;
});
sendJade(res, "index", {
@ -224,29 +224,34 @@ function handleContactPage(req, res) {
function static(dir) {
dir = path.join(__dirname, dir);
return function (req, res) {
if (isSuspicious(req)) {
logRequest(req, 403);
res.status(403);
if (typeof req.header("user-agent") === "string" &&
req.header("user-agent").toLowerCase() === "zmeu") {
res.send("This server disallows requests from ZmEu.");
} else {
res.send("The request " + req.method.toUpperCase() + " " +
req.path + " looks pretty fishy to me. Double check that " +
"you typed it correctly.");
try {
if (isSuspicious(req)) {
logRequest(req, 403);
res.status(403);
if (typeof req.header("user-agent") === "string" &&
req.header("user-agent").toLowerCase() === "zmeu") {
res.send("This server disallows requests from ZmEu.");
} else {
res.send("The request " + req.method.toUpperCase() + " " +
req.path + " looks pretty fishy to me. Double check that " +
"you typed it correctly.");
}
return;
}
return;
}
res.sendfile(req.path.replace(/^\//, ""), {
maxAge: Config.get("http.cache-ttl") * 1000,
root: dir
}, function (err) {
logRequest(req);
if (err) {
res.send(err.status);
}
});
res.sendfile(req.path.replace(/^\//, ""), {
maxAge: Config.get("http.cache-ttl") * 1000,
root: dir
}, function (err) {
logRequest(req);
if (err) {
res.send(err.status);
}
});
} catch (e) {
Logger.errlog.log(e);
Logger.errlog.log(e.trace);
}
};
}
@ -284,6 +289,15 @@ module.exports = {
require("./account").init(app);
require("./acp").init(app);
app.use(static(path.join("..", "..", "www")));
app.use(function (err, req, res, next) {
if (err) {
Logger.errlog.log(err);
Logger.errlog.log(err.stack);
res.send(500);
} else {
next();
}
});
},
logRequest: logRequest,