Update to RedBrick 2.4.1

This commit is contained in:
Dorian Niemiec 2023-08-30 18:42:53 +02:00
parent 0ad6dcaf20
commit 5bda39449f
2 changed files with 33 additions and 22 deletions

View file

@ -56,14 +56,15 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
".sh": ["bash"],
".ksh": ["ksh"],
".csh": ["csh"],
".bat": ["cmd", "/c"],
".cmd": ["cmd", "/c"],
".vbs": ["cscript"],
".jar": ["java"],
".pyw": ["python"],
".rb": ["ruby"],
".php": ["php-cgi"]
};
if(os.platform() == "win32") {
exttointerpreter[".exe"] = [];
exttointerpreter[".bat"] = ["cmd", "/c"];
exttointerpreter[".cmd"] = ["cmd", "/c"];
exttointerpreter[".vbs"] = ["cscript"];
}
var exttointerpreteruser = {};
fs.readFile(__dirname + "/../../../redbrick-interpreters.json", function (err, data) {
if (!err) {
@ -115,7 +116,7 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
return arg.replace(/"/g, "");
});
afterShebangCallback(args);
} else if (line.substr(0, 2) == "MZ" || line.substr(0, 4) == "\x7fELF") {
} else if (os.platform() != "win32" && line.substr(0, 4) == "\x7fELF") {
afterShebangCallback("binary");
} else {
afterShebangCallback(false);
@ -146,7 +147,10 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
}
} else {
args = exttointerpreteruser[ext];
if (!args) {
if (args === null) {
elseCallback();
return;
} else if (!args) {
args = exttointerpreter[ext];
if (!args) {
elseCallback();
@ -189,26 +193,33 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
if (dh) bheaderso = dh;
var code = 200;
var msg = "OK";
if (bheaders[0].indexOf("HTTP/") == 0) {
var heada = bheaders.shift();
var hso = heada.split(" ");
code = hso[1];
if (hso[2] !== undefined) msg = heada.split(" ").splice(2).join(" ");
var httpMatch = bheaders[0].match(/^HTTP\/[^ ]+ ([0-9]{3})(?: (.*))?$/);
if (httpMatch) {
bheaders.shift();
code = parseInt(httpMatch[1]);
if (httpMatch[2]) msg = httpMatch[2];
else msg = http.STATUS_CODES[code];
} else if (bheaders[0].indexOf(":") == -1) {
var heada = bheaders.shift();
var hso = heada.split(" ");
if (hso[0].match(/^[0-9]{3}$/)) {
code = hso[0];
if (hso[1] !== undefined) msg = heada.split(" ").splice(1).join(" ");
var hso = heada.match(/^([0-9]{3})(?: (.*))?$/);
if (hso) {
code = parseInt(hso[1]);
if (hso[2]) msg = hso[2];
else msg = http.STATUS_CODES[code];
}
}
for (var i = 0; i < bheaders.length; i++) {
var headerp = bheaders[i].split(": ");
var headern = headerp.shift();
var headerv = headerp.join(": ");
var headerp = bheaders[i].match(/^([^:]*)(?:: (.*))?/);
if(!headerp) headerp = [];
var headern = headerp[1];
var headerv = headerp[2];
if (headern.toLowerCase() == "status") {
code = headerv.split(" ")[0];
if (headerv.split(" ")[1] !== undefined) msg = headerv.split(" ").splice(1).join(" ");
var httpMatch = headerv.match(/^([0-9]{3})(?: (.*))?$/);
if(httpMatch) {
code = parseInt(httpMatch[1]);
if (httpMatch[2]) msg = httpMatch[2];
else msg = http.STATUS_CODES[code];
}
} else if (headern.toLowerCase() == "set-cookie") {
if (!bheaderso["Set-Cookie"]) bheaderso["Set-Cookie"] = [];
bheaderso["Set-Cookie"].push(headerv);

View file

@ -1,4 +1,4 @@
{
"name": "DorianTech RedBrick CGI engine for SVR.JS",
"version": "2.4.0"
"version": "2.4.1"
}