svrjs/easywaf-integration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Improved error handling of code executed behind the WAF.

Browse source
This commit is contained in:
Dorian Niemiec 2023-10-11 21:05:17 +02:00
parent 336d7c0c8c
commit 577078bee1
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
index.js
View file

@ -1,12 +1,12 @@
var EasyWaf = require('easy-waf'); var EasyWaf = require('easy-waf');
if(EasyWaf.default) { if(EasyWaf.default) {
EasyWaf = EasyWaf.default; EasyWaf = EasyWaf.default;
} }
var nodemailer = undefined; var nodemailer = undefined;
try { try {
var nodemailer = require('nodemailer'); var nodemailer = require('nodemailer');
} catch(ex) { } catch(ex) {
} }
var fs = require("fs"); var fs = require("fs");
var os = require("os"); var os = require("os");
@ -56,7 +56,7 @@ easywafconfig.preBlockHook = function(req, moduleInfo, ip) {
try { try {
logm[ip].errmessage("Request blocked by EasyWAF. Module: " + moduleInfo.name); logm[ip].errmessage("Request blocked by EasyWAF. Module: " + moduleInfo.name);
} catch (ex) { } catch (ex) {
} }
} }
return returnvalue; return returnvalue;
@ -101,7 +101,7 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
return function() { return function() {
logm[req.socket.remoteAddress] = serverconsole; logm[req.socket.remoteAddress] = serverconsole;
if(!logm[req.socket.remoteAddress].locwarnmessage) logm[req.socket.remoteAddress].locwarnmessage = logm[req.socket.remoteAddress].errmessage; if(!logm[req.socket.remoteAddress].locwarnmessage) logm[req.socket.remoteAddress].locwarnmessage = logm[req.socket.remoteAddress].errmessage;
//REQ.BODY //REQ.BODY
function readableHandler() { function readableHandler() {
try { try {
@ -117,15 +117,28 @@ Mod.prototype.callback = function callback(req, res, serverconsole, responseEnd,
easyWaf(req, res, function() { 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 (((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) { if (callServerError) {
callServerError(403, "easy-waf-integration/1.2.0"); callServerError(403, "easy-waf-integration/1.2.1");
} else { } else {
res.writeHead(403, "Forbidden", { res.writeHead(403, "Forbidden", {
"Server": "SVR.JS" "Server": "SVR.JS",
"Content-Type": "text/plain"
}); });
res.end("403 Forbidden!"); res.end("403 Forbidden!");
} }
} else { } else {
elseCallback(); try {
elseCallback();
} catch (ex) {
if (callServerError) {
callServerError(500, "easy-waf-integration/1.2.1", ex);
} else {
res.writeHead(500, "Internal Server Error", {
"Server": "SVR.JS",
"Content-Type": "text/plain"
});
res.end(ex.stack);
}
}
} }
}); });
} }