DorianNiemiecSVRJS/svrjs
Archived
1
0
Fork 0
forked from svrjs/svrjs
Code Pull requests Activity

Remove unneccesary whitespaces

Browse source
This commit is contained in:
Dorian Niemiec 2023-09-11 21:56:08 +02:00
parent f4641cd1bb
commit 1132ed539a
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
svr.js
View file

@ -2970,7 +2970,7 @@ if (!cluster.isPrimary) {
res.write(head + d + foot); res.write(head + d + foot);
res.end(); res.end();
} }
// Server error calling method // Server error calling method
function callServerError(errorCode, extName, stack, ch) { function callServerError(errorCode, extName, stack, ch) {
if (typeof errorCode !== "number") { if (typeof errorCode !== "number") {
@ -3006,7 +3006,7 @@ if (!cluster.isPrimary) {
if(err) { if(err) {
callback(errorCode.toString() + ".html"); callback(errorCode.toString() + ".html");
} else { } else {
callback("." + errorCode.toString()); callback("." + errorCode.toString());
} }
} catch(err2) { } catch(err2) {
callServerError(500, undefined, generateErrorStack(err2)); callServerError(500, undefined, generateErrorStack(err2));
@ -3026,7 +3026,7 @@ if (!cluster.isPrimary) {
if(err) { if(err) {
callback(errorCode.toString() + ".html"); callback(errorCode.toString() + ".html");
} else { } else {
callback("." + errorCode.toString()); callback("." + errorCode.toString());
} }
} catch(err2) { } catch(err2) {
callServerError(500, undefined, generateErrorStack(err2)); callServerError(500, undefined, generateErrorStack(err2));
@ -3050,7 +3050,7 @@ if (!cluster.isPrimary) {
if(err) { if(err) {
getErrorFileName(list, callback, _i+1); getErrorFileName(list, callback, _i+1);
} else { } else {
medCallback(list[_i].path); medCallback(list[_i].path);
} }
}); });
} }
@ -3276,7 +3276,7 @@ if (!cluster.isPrimary) {
// Prepare modFunction // Prepare modFunction
var modFunction = ffinals; var modFunction = ffinals;
var useMods = mods; var useMods = mods;
if(isProxy) { if(isProxy) {
// Get list of forward proxy mods // Get list of forward proxy mods
useMods = []; useMods = [];
@ -3284,7 +3284,7 @@ if (!cluster.isPrimary) {
if (mod.proxyCallback !== undefined) useMods.push(mod); if (mod.proxyCallback !== undefined) useMods.push(mod);
}); });
} }
useMods.reverse().forEach(function (modO) { useMods.reverse().forEach(function (modO) {
modFunction = modO.callback(req, res, serverconsole, responseEnd, href, ext, uobject, search, "index.html", users, page404, head, foot, fd, modFunction, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData); modFunction = modO.callback(req, res, serverconsole, responseEnd, href, ext, uobject, search, "index.html", users, page404, head, foot, fd, modFunction, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData);
}); });
@ -3316,7 +3316,7 @@ if (!cluster.isPrimary) {
serverconsole.errmessage("Client socket is null!!!"); serverconsole.errmessage("Client socket is null!!!");
return; return;
} }
// Function to check the level of a path relative to the web root // Function to check the level of a path relative to the web root
function checkPathLevel(path) { function checkPathLevel(path) {
// Split the path into an array of components based on "/" // Split the path into an array of components based on "/"
@ -4029,7 +4029,7 @@ if (!cluster.isPrimary) {
// Sanitize URL // Sanitize URL
var sanitizedHref = sanitizeURL(href); var sanitizedHref = sanitizeURL(href);
var preparedReqUrl = uobject.pathname + (uobject.search ? uobject.search : "") + (uobject.hash ? uobject.hash : ""); var preparedReqUrl = uobject.pathname + (uobject.search ? uobject.search : "") + (uobject.hash ? uobject.hash : "");
// Check if URL is "dirty" // Check if URL is "dirty"
if (href != sanitizedHref && !isProxy) { if (href != sanitizedHref && !isProxy) {
var sanitizedURL = uobject; var sanitizedURL = uobject;
@ -4071,7 +4071,7 @@ if (!cluster.isPrimary) {
return; return;
} }
} }
// Handle redirects to HTTPS // Handle redirects to HTTPS
if(secure && !fromMain && !disableNonEncryptedServer && !disableToHTTPSRedirect) { if(secure && !fromMain && !disableNonEncryptedServer && !disableToHTTPSRedirect) {
var hostx = req.headers.host; var hostx = req.headers.host;
@ -4201,7 +4201,7 @@ if (!cluster.isPrimary) {
var sHref = sanitizeURL(href); var sHref = sanitizeURL(href);
var preparedReqUrl2 = uobject.pathname + (uobject.search ? uobject.search : "") + (uobject.hash ? uobject.hash : ""); var preparedReqUrl2 = uobject.pathname + (uobject.search ? uobject.search : "") + (uobject.hash ? uobject.hash : "");
if (req.url != preparedReqUrl2 || sHref != href.replace(/\/\.(?=\/|$)/g, "/").replace(/\/+/g, "/")) { if (req.url != preparedReqUrl2 || sHref != href.replace(/\/\.(?=\/|$)/g, "/").replace(/\/+/g, "/")) {
callServerError(403); callServerError(403);
serverconsole.errmessage("Content blocked."); serverconsole.errmessage("Content blocked.");