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

Fix redirect loop with "[" and "]".

Browse source
This commit is contained in:
Dorian Niemiec 2023-08-12 17:40:42 +02:00
parent 86d424f906
commit 028606fb15
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
svr.js
View file

@ -1089,6 +1089,18 @@ function sanitizeURL(resource) {
else return sanitizedResource; else return sanitizedResource;
} }
function fixNodeMojibakeURL(string) {
var encoded = "";
Buffer.from(string, "latin1").forEach(function(value) {
if(value > 127) {
encoded += "%" + (value < 16 ? "0" : "") + value.toString(16).toUpperCase();
} else {
encoded += String.fromCodePoint(value)
}
});
return encoded;
}
var key = ""; var key = "";
var cert = ""; var cert = "";
@ -2066,17 +2078,16 @@ if (!cluster.isPrimary) {
} }
return ph; return ph;
} }
if (req.headers["x-svr-js-from-main-thread"] == "true" && (!req.socket.remoteAddress || req.socket.remoteAddress == "::1" || req.socket.remoteAddress == "::ffff:127.0.0.1" || req.socket.remoteAddress == "127.0.0.1" || req.socket.remoteAddress == "localhost")) { if (req.headers["x-svr-js-from-main-thread"] == "true" && (!req.socket.remoteAddress || req.socket.remoteAddress == "::1" || req.socket.remoteAddress == "::ffff:127.0.0.1" || req.socket.remoteAddress == "127.0.0.1" || req.socket.remoteAddress == "localhost")) {
var headers = getCustomHeaders(); var headers = getCustomHeaders();
res.writeHead(204, "No Content", headers); res.writeHead(204, "No Content", headers);
res.end(); res.end();
return; return;
} }
try {
req.url = encodeURI(Buffer.from(req.url, "latin1").toString("utf8")).replace(/%25/gi, "%"); req.url = fixNodeMojibakeURL(req.url);
} catch (err) {
//URL not converted...
}
res.writeHeadNative = res.writeHead; res.writeHeadNative = res.writeHead;
res.writeHead = function (a, b, c) { res.writeHead = function (a, b, c) {
if (parseInt(a) >= 400 && parseInt(a) <= 599) { if (parseInt(a) >= 400 && parseInt(a) <= 599) {
@ -2086,6 +2097,7 @@ if (!cluster.isPrimary) {
} }
res.writeHeadNative(a, b, c); res.writeHeadNative(a, b, c);
}; };
var finished = false; var finished = false;
res.on("finish", function () { res.on("finish", function () {
if (!finished) { if (!finished) {
@ -2973,11 +2985,7 @@ if (!cluster.isPrimary) {
return; return;
} }
try { request.url = fixNodeMojibakeURL(request.url);
request.url = encodeURI(Buffer.from(request.url, "latin1").toString("utf8")).replace(/%25/gi, "%");
} catch (err) {
//Request URL not modified...
}
var headWritten = false; var headWritten = false;
var lastStatusCode = null; var lastStatusCode = null;