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

sync usenet progress before bed

Browse Source 
- image attachments on webtv cause server error
- only affects inline embeds
- midi and audio attachments should still work fine
This commit is contained in:
zefie
2022-10-13 02:26:22 -04:00
parent 0b56f02ec4
commit f6db75fca2
6 changed files with 79 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
zefie_wtvp_minisrv/app.js
View File

@@ -1039,7 +1039,7 @@ async function sendToClient(socket, headers_obj, data) {
// add Connection header if missing, default to Keep-Alive
if (!headers_obj.Connection) {
headers_obj.Connection = "Keep-Alive";
headers_obj = moveObjectElement('Connection', 'Response', headers_obj);
headers_obj = wtvshared.moveObjectElement('Connection', 'Response', headers_obj);
}
var content_length = 0;
@@ -1131,7 +1131,7 @@ async function sendToClient(socket, headers_obj, data) {
// encrypt if needed
if (socket_sessions[socket.id].secure == true && !socket_sessions[socket.id].do_not_encrypt) {
headers_obj["wtv-encrypted"] = 'true';
headers_obj = moveObjectElement('wtv-encrypted', 'Connection', headers_obj);
headers_obj = wtvshared.moveObjectElement('wtv-encrypted', 'Connection', headers_obj);
if (content_length > 0 && socket_sessions[socket.id].wtvsec) {
if (!minisrv_config.config.debug_flags.quiet) console.log(" * Encrypting response to client ...")
var enc_data = socket_sessions[socket.id].wtvsec.Encrypt(1, data);
@@ -1168,7 +1168,7 @@ async function sendToClient(socket, headers_obj, data) {
if (ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64) {
if (ssid_sessions[socket.ssid].data_store.wtvsec_login.update_ticket) {
headers_obj["wtv-ticket"] = ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64;
headers_obj = moveObjectElement("wtv-ticket", "Connection", headers_obj);
headers_obj = wtvshared.moveObjectElement("wtv-ticket", "Connection", headers_obj);
ssid_sessions[socket.ssid].data_store.wtvsec_login.update_ticket = false;
}
}
@@ -1282,30 +1282,6 @@ function concatArrayBuffer(buffer1, buffer2) {
return tmp.buffer;
}
function moveObjectElement(currentKey, afterKey, obj) {
var result = {};
var val = obj[currentKey];
delete obj[currentKey];
var next = -1;
var i = 0;
if (typeof afterKey == 'undefined' || afterKey == null) afterKey = '';
Object.keys(obj).forEach(function (k) {
var v = obj[k];
if ((afterKey == '' && i == 0) || next == 1) {
result[currentKey] = val;
next = 0;
}
if (k == afterKey) { next = 1; }
result[k] = v;
++i;
});
if (next == 1) {
result[currentKey] = val;
}
if (next !== -1) return result; else return obj;
}
function isUnencryptedString(string) {
// 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