svrjs/yellowsquare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Update to YellowSquare 1.1.2

Browse source
This commit is contained in:
Dorian Niemiec 2024-02-07 01:34:09 +01:00
parent a5f51ee4d2
commit f339445ea5
2 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
index.js
View file

@ -56,12 +56,41 @@ class ErrorStream extends stream.Writable {
function Mod() {}
Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, ext, uobject, search, defaultpage, users, page404, head, foot, fd, elseCallback, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData) {
Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, ext, uobject, search, defaultpage, users, page404, head, foot, fd, elseCallback, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData, authUser) {
return function () {
if (!configJSON) {
configJSON = configJSONS;
}
function checkIfThereIsA401Rule() {
var actually401 = false;
function createRegex(regex) {
var regexObj = regex.split("/");
if (regexObj.length == 0) throw new Error("Invalid regex!");
var modifiers = regexObj.pop();
regexObj.shift();
var searchString = regexObj.join("/");
return new RegExp(searchString, modifiers);
}
if(configJSON.nonStandardCodes) {
configJSON.nonStandardCodes.every(function (nonscode) {
if (nonscode.scode == 401) {
if (nonscode.regex && (req.url.match(createRegex(nonscode.regex)) || href.match(createRegex(nonscode.regex)))) {
actually401 = true;
return true;
} else if (nonscode.url && (nonStandardCodes[i].url == href || (os.platform() == "win32" && nonStandardCodes[i].url.toLowerCase() == href.toLowerCase()))) {
actually401 = true;
return true;
}
}
return false;
});
}
return actually401;
}
if (!getCustomHeaders) {
var bheaders = JSON.parse(JSON.stringify(configJSON.customHeaders));
} else {
@ -141,7 +170,7 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
}
}
function executeJSGIWithReqObj(a, b, req, res, pubip, port, software, dh) {
function executeJSGIWithReqObj(a, b, req, res, pubip, port, software, dh, user) {
// Function to set up request object and execute JSGI scripts
var inputStream = new RequestBodyStream(req);
var errorStream = new ErrorStream();
@ -175,7 +204,12 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
jsgiRequestObject.remotePort = req.socket.remotePort;
}
if (req.headers.authorization) {
if (typeof user != "undefined") {
if (user !== null) {
if (req.headers.authorization) jsgiRequestObject.authType = req.headers.authorization.split(" ")[0];
jsgiRequestObject.remoteUser = user;
}
} else if (req.headers.authorization && (typeof checkIfThereIsA401Rule == "undefined" || checkIfThereIsA401Rule())) {
jsgiRequestObject.authType = req.headers.authorization.split(" ")[0];
if (jsgiRequestObject.authType == "Basic") {
var remoteCred = req.headers.authorization.split(" ")[1];
@ -226,7 +260,8 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
process.version +
") YellowSquare/" +
version,
bheaders
bheaders,
authUser
);
} catch (ex) {
if (!callServerError) {
@ -301,7 +336,8 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
process.version +
") YellowSquare/" +
version,
bheaders
bheaders,
authUser
);
} catch (ex) {
if (!callServerError) {

2
mod.info
View file

@ -1,4 +1,4 @@
{
"name": "YellowSquare JSGI engine for SVR.JS",
"version": "1.1.1"
"version": "1.1.2"
}