License: MIT
diff --git a/svr.js b/svr.js
index 7053cd6..05cb8ad 100644
--- a/svr.js
+++ b/svr.js
@@ -69,7 +69,7 @@ function deleteFolderRecursive(path) {
}
var os = require("os");
-var version = "3.14.8";
+var version = "3.14.9";
var singlethreaded = false;
if (process.versions) process.versions.svrjs = version; // Inject SVR.JS into process.versions
@@ -448,21 +448,23 @@ try {
crypto = require("crypto");
https = require("https");
} catch (err) {
- crypto = {};
- https = {};
- crypto.__disabled__ = null;
- https.createServer = function () {
- throw new Error("Crypto support is not present");
+ crypto = {
+ __disabled__: null
+ };
+ https = {
+ createServer: function () {
+ throw new Error("Crypto support is not present");
+ },
+ connect: function () {
+ throw new Error("Crypto support is not present");
+ },
+ get: function () {
+ throw new Error("Crypto support is not present");
+ }
};
http2.createSecureServer = function () {
throw new Error("Crypto support is not present");
};
- https.connect = function () {
- throw new Error("Crypto support is not present");
- };
- https.get = function () {
- throw new Error("Crypto support is not present");
- };
}
var mime = require("mime-types");
var pubip = "";
@@ -534,7 +536,6 @@ function createRegex(regex, isPath) {
// Function to check if IPs are equal
function ipMatch(IP1, IP2) {
-
if (!IP1) return true;
if (!IP2) return false;
@@ -1161,7 +1162,7 @@ var stackHidden = false;
var exposeServerVersion = true;
var rewriteMap = [];
var allowStatus = true;
-var dontCompress = [];
+var dontCompress = ["/.*\\.ipxe$/", "/.*\\.(?:jpe?g|png|bmp|tiff|jfif|gif|webp)$/", "/.*\\.(?:[id]mg|iso|flp)$/", "/.*\\.(?:zip|rar|bz2|[gb7x]z|lzma|tar)$/", "/.*\\.(?:mp[34]|mov|wm[av]|avi|webm|og[gv]|mk[va])$/"];
var enableIPSpoofing = false;
var sni = {};
var disableNonEncryptedServer = false;
@@ -1909,8 +1910,8 @@ forbiddenPaths.serverSideScriptDirectories.push(getInitializePath("./mods"));
forbiddenPaths.temp = getInitializePath("./temp");
forbiddenPaths.log = getInitializePath("./log");
-// Error descriptions
-var serverErrorDescs = {
+// HTTP error descriptions
+var serverHTTPErrorDescs = {
200: "The request succeeded! :)",
201: "A new resource has been created.",
202: "The request has been accepted for processing, but the processing has not been completed.",
@@ -1960,6 +1961,29 @@ var serverErrorDescs = {
599: "The server couldn't connect in time while it was acting as a proxy."
};
+// Server error descriptions
+var serverErrorDescs = {
+ "EADDRINUSE": "Address is already in use by another process.",
+ "EADDRNOTAVAIL": "Address is not available on this machine.",
+ "EACCES": "Permission denied. You may not have sufficient privileges to access the requested address.",
+ "EAFNOSUPPORT": "Address family not supported. The address family (IPv4 or IPv6) of the requested address is not supported.",
+ "EALREADY": "Operation already in progress. The server is already in the process of establishing a connection on the requested address.",
+ "ECONNABORTED": "Connection aborted. The connection to the server was terminated abruptly.",
+ "ECONNREFUSED": "Connection refused. The server refused the connection attempt.",
+ "ECONNRESET": "Connection reset by peer. The connection to the server was reset by the remote host.",
+ "EDESTADDRREQ": "Destination address required. The destination address must be specified.",
+ "EINVAL": "Invalid argument (invalid IP address?).",
+ "ENETDOWN": "Network is down. The network interface used for the connection is not available.",
+ "ENETUNREACH": "Network is unreachable. The network destination is not reachable from this host.",
+ "ENOBUFS": "No buffer space available. Insufficient buffer space is available for the server to process the request.",
+ "ENOTFOUND": "Domain name doesn't exist (invalid IP address?).",
+ "ENOTSOCK": "Not a socket. The file descriptor provided is not a valid socket.",
+ "EPROTO": "Protocol error. An unspecified protocol error occurred.",
+ "EPROTONOSUPPORT": "Protocol not supported. The requested network protocol is not supported.",
+ "ETIMEDOUT": "Connection timed out. The server did not respond within the specified timeout period.",
+ "UNKNOWN": "There was an unknown error with the server."
+};
+
// Create server instances
if (!cluster.isPrimary) {
var reqcounter = 0;
@@ -2083,77 +2107,9 @@ if (!cluster.isPrimary) {
} else {
server2.on("connect", connhandler);
}
-
server2.on("error", function (err) {
- attmtsRedir--;
- if (cluster.isPrimary === undefined && attmtsRedir >= 0) {
- if (err.code == "EADDRINUSE") {
- serverconsole.locerrmessage("Address is already in use by another process.");
- } else if (err.code == "EADDRNOTAVAIL") {
- serverconsole.locerrmessage("Address is not available on this machine.");
- } else if (err.code == "EACCES") {
- serverconsole.locerrmessage("Permission denied. You may not have sufficient privileges to access the requested address.");
- } else if (err.code == "EAFNOSUPPORT") {
- serverconsole.locerrmessage("Address family not supported. The address family (IPv4 or IPv6) of the requested address is not supported.");
- } else if (err.code == "EALREADY") {
- serverconsole.locerrmessage("Operation already in progress. The server is already in the process of establishing a connection on the requested address.");
- } else if (err.code == "ECONNABORTED") {
- serverconsole.locerrmessage("Connection aborted. The connection to the server was terminated abruptly.");
- } else if (err.code == "ECONNREFUSED") {
- serverconsole.locerrmessage("Connection refused. The server refused the connection attempt.");
- } else if (err.code == "ECONNRESET") {
- serverconsole.locerrmessage("Connection reset by peer. The connection to the server was reset by the remote host.");
- } else if (err.code == "EDESTADDRREQ") {
- serverconsole.locerrmessage("Destination address required. The destination address must be specified.");
- } else if (err.code == "ENETDOWN") {
- serverconsole.locerrmessage("Network is down. The network interface used for the connection is not available.");
- } else if (err.code == "ENETUNREACH") {
- serverconsole.locerrmessage("Network is unreachable. The network destination is not reachable from this host.");
- } else if (err.code == "ENOBUFS") {
- serverconsole.locerrmessage("No buffer space available. Insufficient buffer space is available for the server to process the request.");
- } else if (err.code == "ENOTSOCK") {
- serverconsole.locerrmessage("Not a socket. The file descriptor provided is not a valid socket.");
- } else if (err.code == "EPROTO") {
- serverconsole.locerrmessage("Protocol error. An unspecified protocol error occurred.");
- } else if (err.code == "EPROTONOSUPPORT") {
- serverconsole.locerrmessage("Protocol not supported. The requested network protocol is not supported.");
- } else if (err.code == "ETIMEDOUT") {
- serverconsole.locerrmessage("Connection timed out. The server did not respond within the specified timeout period.");
- } else if (err.code == "ENOTFOUND") {
- serverconsole.locerrmessage("Domain name doesn't exist (invalid IP address?).");
- } else if (err.code == "EINVAL") {
- serverconsole.locerrmessage("Invalid argument (invalid IP address?).");
- } else {
- serverconsole.locerrmessage("There was an unknown error with the server.");
- }
- serverconsole.locmessage(attmtsRedir + " attempts left.");
- } else {
- try {
- process.send("\x12ERRLIST" + attmtsRedir + err.code);
- } catch (err) {
- // Probably main process exited
- }
- }
- if (attmtsRedir > 0) {
- server2.close();
- setTimeout(start, 900);
- } else {
- try {
- if (cluster.isPrimary !== undefined) process.send("\x12ERRCRASH" + err.code);
- } catch (err) {
- // Probably main process exited
- }
- setTimeout(function () {
- var errno = errors[err.code];
- if (errno) {
- process.exit(errno);
- } else {
- process.exit(1);
- }
- }, 50);
- }
+ serverErrorHandler(err, true);
});
-
server2.on("listening", function () {
attmtsRedir = 5;
listeningMessage();
@@ -2443,6 +2399,27 @@ if (!cluster.isPrimary) {
// Server error calling method
function callServerError(errorCode, extName, stack, ch) {
+ if (typeof errorCode !== "number") {
+ throw new TypeError("HTTP error code parameter needs to be an integer.");
+ }
+
+ // Handle optional parameters
+ if (extName && typeof extName === "object") {
+ ch = stack;
+ stack = extName;
+ extName = undefined;
+ } else if (typeof extName !== "string" && extName !== null && extName !== undefined) {
+ throw new TypeError("Extension name parameter needs to be a string.");
+ }
+
+ if (stack && typeof stack === "object" && Object.prototype.toString.call(stack) !== "[object Error]") {
+ ch = stack;
+ stack = undefined;
+ } else if (typeof stack !== "object" && typeof stack !== "string" && stack) {
+ throw new TypeError("Error stack parameter needs to be either a string or an instance of Error object.");
+ }
+
+ // Determine error file
function getErrorFileName(list, callback, _i) {
if (err.code == "ERR_SSL_HTTP_REQUEST" && process.version && parseInt(process.version.split(".")[0].substr(1)) >= 16) {
// Disable custom error page for HTTP SSL error
@@ -2464,14 +2441,14 @@ if (!cluster.isPrimary) {
callback("." + errorCode.toString());
}
} catch (err2) {
- callServerError(500, undefined, generateErrorStack(err2));
+ callServerError(500, err2);
}
});
} else {
try {
callback(page404);
} catch (err2) {
- callServerError(500, undefined, generateErrorStack(err2));
+ callServerError(500, err2);
}
}
});
@@ -2484,7 +2461,7 @@ if (!cluster.isPrimary) {
callback("." + errorCode.toString());
}
} catch (err2) {
- callServerError(500, undefined, generateErrorStack(err2));
+ callServerError(500, err2);
}
});
}
@@ -2520,7 +2497,7 @@ if (!cluster.isPrimary) {
serverconsole.errmessage(stack);
}
if (stackHidden) stack = "[error stack hidden]";
- if (serverErrorDescs[errorCode] === undefined) {
+ if (serverHTTPErrorDescs[errorCode] === undefined) {
callServerError(501, extName, stack);
} else {
var cheaders = getCustomHeaders();
@@ -2542,14 +2519,14 @@ if (!cluster.isPrimary) {
if (err.code == "ERR_SSL_HTTP_REQUEST" && process.version && parseInt(process.version.split(".")[0].substr(1)) >= 16) {
// Disable custom error page for HTTP SSL error
res.writeHead(errorCode, http.STATUS_CODES[errorCode], cheaders);
- res.write(("{errorMessage}
{errorDesc}
{server}
").replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">")).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]"))); + res.write(("
{errorMessage}
{errorDesc}
{server}
").replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverHTTPErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">")).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]"))); res.end(); } else { fs.readFile(errorFile, function (err, data) { try { if (err) throw err; res.writeHead(errorCode, http.STATUS_CODES[errorCode], cheaders); - responseEnd(data.toString().replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "
").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">")).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]"))); + responseEnd(data.toString().replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverHTTPErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "
").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">")).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]"))); } catch (err) { var additionalError = 500; if (err.code == "ENOENT") { @@ -2566,7 +2543,7 @@ if (!cluster.isPrimary) { additionalError = 508; } res.writeHead(errorCode, http.STATUS_CODES[errorCode], cheaders); - res.write(("
{errorMessage}
{errorDesc}
" + ((additionalError == 404) ? "" : "Additionally, a {additionalError} error occurred while loading an error page.
") + "{server}
").replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">")).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]")).replace(/{additionalError}/g, additionalError.toString())); + res.write(("
{errorMessage}
{errorDesc}
" + ((additionalError == 404) ? "" : "Additionally, a {additionalError} error occurred while loading an error page.
") + "{server}
").replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverHTTPErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">")).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]")).replace(/{additionalError}/g, additionalError.toString())); res.end(); } }); @@ -3113,14 +3090,14 @@ if (!cluster.isPrimary) { callback("." + errorCode.toString()); } } catch (err2) { - callServerError(500, undefined, generateErrorStack(err2)); + callServerError(500, err2); } }); } else { try { callback(page404); } catch (err2) { - callServerError(500, undefined, generateErrorStack(err2)); + callServerError(500, err2); } } }); @@ -3133,7 +3110,7 @@ if (!cluster.isPrimary) { callback("." + errorCode.toString()); } } catch (err2) { - callServerError(500, undefined, generateErrorStack(err2)); + callServerError(500, err2); } }); } @@ -3175,7 +3152,7 @@ if (!cluster.isPrimary) { if (stackHidden) stack = "[error stack hidden]"; // Validate the error code and handle unknown codes - if (serverErrorDescs[errorCode] === undefined) { + if (serverHTTPErrorDescs[errorCode] === undefined) { callServerError(501, extName, stack); } else { var cheaders = getCustomHeaders(); @@ -3205,7 +3182,7 @@ if (!cluster.isPrimary) { try { if (err) throw err; res.writeHead(errorCode, http.STATUS_CODES[errorCode], cheaders); - responseEnd(data.toString().replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "
").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{path}/g, req.url.replace(/&/g, "&").replace(//g, ">")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">") + ((req.headers.host == undefined || isProxy) ? "" : " on " + String(req.headers.host).replace(/&/g, "&").replace(//g, ">"))).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]"))); // Replace placeholders in error response + responseEnd(data.toString().replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverHTTPErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "
").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{path}/g, req.url.replace(/&/g, "&").replace(//g, ">")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">") + ((req.headers.host == undefined || isProxy) ? "" : " on " + String(req.headers.host).replace(/&/g, "&").replace(//g, ">"))).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]"))); // Replace placeholders in error response } catch (err) { var additionalError = 500; // Handle additional error cases @@ -3224,7 +3201,7 @@ if (!cluster.isPrimary) { } res.writeHead(errorCode, http.STATUS_CODES[errorCode], cheaders); - res.write(("
{errorMessage}
{errorDesc}
" + ((additionalError == 404) ? "" : "Additionally, a {additionalError} error occurred while loading an error page.
") + "{server}
").replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{path}/g, req.url.replace(/&/g, "&").replace(//g, ">")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">") + ((req.headers.host == undefined || isProxy) ? "" : " on " + String(req.headers.host).replace(/&/g, "&").replace(//g, ">"))).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]")).replace(/{additionalError}/g, additionalError.toString())); // Replace placeholders in error response + res.write(("
{errorMessage}
{errorDesc}
" + ((additionalError == 404) ? "" : "Additionally, a {additionalError} error occurred while loading an error page.
") + "{server}
").replace(/{errorMessage}/g, errorCode.toString() + " " + http.STATUS_CODES[errorCode].replace(/&/g, "&").replace(//g, ">")).replace(/{errorDesc}/g, serverHTTPErrorDescs[errorCode]).replace(/{stack}/g, stack.replace(/&/g, "&").replace(//g, ">").replace(/\r\n/g, "").replace(/\n/g, "
").replace(/\r/g, "
").replace(/ {2}/g, " ")).replace(/{path}/g, req.url.replace(/&/g, "&").replace(//g, ">")).replace(/{server}/g, "" + ((exposeServerVersion ? "SVR.JS/" + version + " (" + getOS() + "; " + (process.isBun ? ("Bun/v" + process.versions.bun + "; like Node.JS/" + process.version) : ("Node.JS/" + process.version)) + ")" : "SVR.JS") + ((!exposeModsInErrorPages || extName == undefined) ? "" : " " + extName)).replace(/&/g, "&").replace(//g, ">") + ((req.headers.host == undefined || isProxy) ? "" : " on " + String(req.headers.host).replace(/&/g, "&").replace(//g, ">"))).replace(/{contact}/g, serverAdmin.replace(/&/g, "&").replace(//g, ">").replace(/\./g, "[dot]").replace(/@/g, "[at]")).replace(/{additionalError}/g, additionalError.toString())); // Replace placeholders in error response res.end(); } }); @@ -3236,7 +3213,7 @@ if (!cluster.isPrimary) { head = fs.existsSync("./.head") ? fs.readFileSync("./.head").toString() : (fs.existsSync("./head.html") ? fs.readFileSync("./head.html").toString() : ""); // header foot = fs.existsSync("./.foot") ? fs.readFileSync("./.foot").toString() : (fs.existsSync("./foot.html") ? fs.readFileSync("./foot.html").toString() : ""); // footer } catch (err) { - callServerError(500, undefined, generateErrorStack(err)); + callServerError(500, err); } // Function to perform HTTP redirection to a specified destination URL @@ -3278,7 +3255,7 @@ if (!cluster.isPrimary) { customHeaders["Allow"] = "POST"; // Call the server error function with 405 status code and custom headers - callServerError(405, undefined, undefined, customHeaders); + callServerError(405, customHeaders); return; } @@ -3292,7 +3269,7 @@ if (!cluster.isPrimary) { } // If the formidable module had an error, call the server error function with 500 status code and error stack - if (formidable._errored) callServerError(500, undefined, generateErrorStack(formidable._errored)); + if (formidable._errored) callServerError(500, formidable._errored); // Create a new formidable form var form = formidable(formidableOptions); @@ -3551,7 +3528,7 @@ if (!cluster.isPrimary) { serverconsole.errmessage("Symbolic link loop detected."); return; } else { - callServerError(500, undefined, generateErrorStack(err)); + callServerError(500, err); return; } } @@ -3693,16 +3670,15 @@ if (!cluster.isPrimary) { // Get stats for all files in the directory and generate the listing getStatsForAllFiles(list, "." + decodeURIComponent(href), function (filelist) { - // Function to check file extension - function checkEXT(filename, ext) { - return filename.match(new RegExp("\\." + ext.replace(/^\./, "").replace(/([.+*?^$()\[\]{}|\\])/, "\\$1") + "$", "i")); - } - var directoryListingRows = []; for (var i = 0; i < filelist.length; i++) { if (filelist[i].name[0] !== ".") { var estats = filelist[i].stats; var ename = filelist[i].name; + var eext = ename.match(/\.([^.]+)$/); + if (eext) eext = eext[1]; + else eext = ""; + var emime = eext ? mime.contentType(eext) : false; if (filelist[i].errored) { directoryListingRows.push( "
![\"[BAD]\"](\"/.dirimages/bad.png\")