zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further fix d4e355a0a3

Browse Source 
- was only replacing one +
- code for single post element was erroneous
This commit is contained in:
zefie
2021-08-08 18:06:55 -04:00
parent 00d0d59f07
commit e09af90908
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
zefie_wtvp_minisrv/app.js
View File

@@ -319,7 +319,7 @@ async function processURL(socket, request_headers) {
var qraw_split = qraw[i].split("="); var qraw_split = qraw[i].split("=");
if (qraw_split.length == 2) { if (qraw_split.length == 2) {
var k = qraw_split[0]; var k = qraw_split[0];
request_headers.query[k] = unescape(qraw[i].split("=")[1].replace('+',"%20")); request_headers.query[k] = unescape(qraw[i].split("=")[1].replace(/\+/g,"%20"));
} }
} }
} }
@@ -328,25 +328,25 @@ async function processURL(socket, request_headers) {
} }
if (request_headers.post_data) { if (request_headers.post_data) {
if (headersAreStandard(request_headers.post_data.toString(CryptoJS.enc.Utf8))) { var post_data_string = request_headers.post_data.toString(CryptoJS.enc.Utf8).replace("\0", "");
if (request_headers.post_data.toString(CryptoJS.enc.Utf8).indexOf('=')) { if (isUnencryptedString(post_data_string)) {
if (request_headers.post_data.toString(CryptoJS.enc.Utf8).indexOf('&')) { if (post_data_string.indexOf('=')) {
var qraw = request_headers.post_data.toString(CryptoJS.enc.Utf8).split('&'); if (post_data_string.indexOf('&')) {
var qraw = post_data_string.split('&');
if (qraw.length > 0) { if (qraw.length > 0) {
for (let i = 0; i < qraw.length; i++) { for (let i = 0; i < qraw.length; i++) {
var qraw_split = qraw[i].split("="); var qraw_split = qraw[i].split("=");
if (qraw_split.length == 2) { if (qraw_split.length == 2) {
var k = qraw_split[0]; var k = qraw_split[0];
request_headers.query[k] = unescape(qraw[i].split("=")[1].replace('+', "%20")); request_headers.query[k] = unescape(qraw[i].split("=")[1].replace(/\+/g, "%20"));
} }
} }
} }
} else { } else {
var qraw = request_headers.post_data.toString(CryptoJS.enc.Utf8); var qraw_split = post_data_string.split("=");
var qraw_split = qraw[i].split("=");
if (qraw_split.length == 2) { if (qraw_split.length == 2) {
var k = qraw_split[0]; var k = qraw_split[0];
request_headers.query[k] = unescape(qraw[i].split("=")[1].replace('+', "%20")); request_headers.query[k] = unescape(qraw_split[1].replace(/\+/g, "%20"));
} }
} }
} }
@@ -747,7 +747,7 @@ function moveObjectElement(currentKey, afterKey, obj) {
if (next !== -1) return result; else return obj; if (next !== -1) return result; else return obj;
} }
function headersAreStandard(string, verbose = false) { function isUnencryptedString(string, verbose = false) {
// a generic "isAscii" check is not sufficient, as the test will see the binary // a generic "isAscii" check is not sufficient, as the test will see the binary
// compressed / encrypted data as ASCII. This function checks for characters expected // compressed / encrypted data as ASCII. This function checks for characters expected
// in unencrypted headers, and returns true only if every character in the string matches // in unencrypted headers, and returns true only if every character in the string matches
@@ -780,7 +780,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
} else { } else {
data = data.split("\n\n")[0]; data = data.split("\n\n")[0];
} }
if (headersAreStandard(data)) { if (isUnencryptedString(data)) {
if (headers.length != 0) { if (headers.length != 0) {
var new_header_obj = headerStringToObj(data); var new_header_obj = headerStringToObj(data);
Object.keys(new_header_obj).forEach(function (k, v) { Object.keys(new_header_obj).forEach(function (k, v) {
@@ -793,7 +793,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
} else if (!skipSecure) { } else if (!skipSecure) {
// if its a POST request, assume its a binary blob and not encrypted (dangerous) // if its a POST request, assume its a binary blob and not encrypted (dangerous)
if (!encryptedRequest) { if (!encryptedRequest) {
// its not a POST and it failed the headersAreStandard test, so we think this is an encrypted blob // its not a POST and it failed the isUnencryptedString test, so we think this is an encrypted blob
if (socket_sessions[socket.id].secure != true) { if (socket_sessions[socket.id].secure != true) {
// first time so reroll sessions // first time so reroll sessions
if (zdebug) console.log(" # [ UNEXPECTED BINARY BLOCK ] First sign of encryption, re-creating RC4 sessions for socket id", socket.id); if (zdebug) console.log(" # [ UNEXPECTED BINARY BLOCK ] First sign of encryption, re-creating RC4 sessions for socket id", socket.id);
@@ -987,7 +987,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
} }
var enc_data = CryptoJS.enc.Hex.parse(data_hex.substring(header_length * 2)); var enc_data = CryptoJS.enc.Hex.parse(data_hex.substring(header_length * 2));
if (enc_data.sigBytes > 0) { if (enc_data.sigBytes > 0) {
if (headersAreStandard(enc_data.toString(CryptoJS.enc.Latin1), (!skipSecure && !encryptedRequest))) { if (isUnencryptedString(enc_data.toString(CryptoJS.enc.Latin1), (!skipSecure && !encryptedRequest))) {
// some builds (like our targeted 3833), send SECURE ON but then unencrypted headers // some builds (like our targeted 3833), send SECURE ON but then unencrypted headers
if (zdebug) console.log(" # Psuedo-encrypted Request (SECURE ON)", "on", socket.id); if (zdebug) console.log(" # Psuedo-encrypted Request (SECURE ON)", "on", socket.id);
// don't actually encrypt output // don't actually encrypt output
@@ -1187,7 +1187,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
return; return;
} }
var str_test = enc_data.toString(CryptoJS.enc.Latin1); var str_test = enc_data.toString(CryptoJS.enc.Latin1);
if (headersAreStandard(str_test)) { if (isUnencryptedString(str_test)) {
var dec_data = enc_data; var dec_data = enc_data;
} else { } else {
var dec_data = CryptoJS.lib.WordArray.create(socket_sessions[socket.id].wtvsec.Decrypt(0, enc_data)); var dec_data = CryptoJS.lib.WordArray.create(socket_sessions[socket.id].wtvsec.Decrypt(0, enc_data));