Some WAF errors now result in 500 errors instead of crashing the server.
This commit is contained in:
parent
577078bee1
commit
9dcdaffba5
1 changed files with 33 additions and 21 deletions
20
index.js
20
index.js
|
@ -102,7 +102,7 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
|
|||
logm[req.socket.remoteAddress] = serverconsole;
|
||||
if(!logm[req.socket.remoteAddress].locwarnmessage) logm[req.socket.remoteAddress].locwarnmessage = logm[req.socket.remoteAddress].errmessage;
|
||||
|
||||
//REQ.BODY
|
||||
//req.body
|
||||
function readableHandler() {
|
||||
try {
|
||||
if(req._readableState.buffer.head !== null) {
|
||||
|
@ -113,11 +113,12 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
|
|||
} catch (ex) {
|
||||
}
|
||||
|
||||
//EASYWAF
|
||||
//EasyWaf
|
||||
try {
|
||||
easyWaf(req, res, function() {
|
||||
if (((href == "/easywaf-config.json" || (os.platform() == "win32" && href.toLowerCase() == "/easywaf-config.json")) || (href == "/easywaf-hooks.js" || (os.platform() == "win32" && href.toLowerCase() == "/easywaf-hooks.js"))) && __dirname == process.cwd()) {
|
||||
if (callServerError) {
|
||||
callServerError(403, "easy-waf-integration/1.2.1");
|
||||
callServerError(403, "easy-waf-integration/1.2.2");
|
||||
} else {
|
||||
res.writeHead(403, "Forbidden", {
|
||||
"Server": "SVR.JS",
|
||||
|
@ -130,7 +131,7 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
|
|||
elseCallback();
|
||||
} catch (ex) {
|
||||
if (callServerError) {
|
||||
callServerError(500, "easy-waf-integration/1.2.1", ex);
|
||||
callServerError(500, "easy-waf-integration/1.2.2", ex);
|
||||
} else {
|
||||
res.writeHead(500, "Internal Server Error", {
|
||||
"Server": "SVR.JS",
|
||||
|
@ -141,6 +142,17 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
|
|||
}
|
||||
}
|
||||
});
|
||||
} catch(ex) {
|
||||
if (callServerError) {
|
||||
callServerError(500, "easy-waf-integration/1.2.2", ex);
|
||||
} else {
|
||||
res.writeHead(500, "Internal Server Error", {
|
||||
"Server": "SVR.JS",
|
||||
"Content-Type": "text/plain"
|
||||
});
|
||||
res.end(ex.stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(req._readableState.length > 0 || req._readableState.ended) {
|
||||
readableHandler();
|
||||
|
|
Loading…
Reference in a new issue