diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/en-US/modem_firmware.dat.gz b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/en-US/modem_firmware.dat.gz
index 70fb3441..cda77497 100644
Binary files a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/en-US/modem_firmware.dat.gz and b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/en-US/modem_firmware.dat.gz differ
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/ja-JP/modem_firmware.dat.gz b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/ja-JP/modem_firmware.dat.gz
index a936d1dd..45e80dc8 100644
Binary files a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/ja-JP/modem_firmware.dat.gz and b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/Modem_Firmware/Locale/ja-JP/modem_firmware.dat.gz differ
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js
index 0b1b075b..6f37edd8 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js
@@ -57,7 +57,7 @@ if (request_headers['wtv-request-type'] == 'download') {
break;
case "GET":
- wtvdl.get(update_list[k].file.replace(diskmap_data.base, ""), update_list[k].file, service_name + ":/" + update_list[k].location, diskmap_group_data, update_list[k].checksum)
+ wtvdl.get(update_list[k].file.replace(diskmap_data.base, ""), update_list[k].file, service_name + ":/" + update_list[k].location, diskmap_group_data, update_list[k].checksum, update_list[k].uncompressed_size || null, update_list[k].original_filename)
break;
}
});
@@ -188,6 +188,8 @@ if (request_headers['wtv-request-type'] == 'download') {
if (!fs.existsSync(post_match_file)) post_match_file = null;
});
+
+
var post_match_file_lstat = fs.lstatSync(post_match_file);
var post_match_file_data = new Buffer.from(fs.readFileSync(post_match_file, {
encoding: null,
@@ -196,11 +198,23 @@ if (request_headers['wtv-request-type'] == 'download') {
diskmap_group_data.files[k].base = diskmap_group_data.base;
diskmap_group_data.files[k].last_modified = (new Date(new Date(post_match_file_lstat.mtime).toUTCString()) / 1000);
diskmap_group_data.files[k].content_length = post_match_file_lstat.size;
- diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(post_match_file_data)).toString(CryptoJS.enc.Hex).toLowerCase();
diskmap_group_data.files[k].action = (diskmap_group_data.files[k].action) ? diskmap_group_data.files[k].action.toUpperCase() : "GET";
+ if (wtvshared.getFileExt(post_match_file).toLowerCase() == "gz") {
+ // we need the checksum of the uncompressed data
+ var gunzipped = zlib.gunzipSync(post_match_file_data);
+ diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
+ var gzip_fn_end = post_match_file_data.indexOf("\0", 10);
+ if (!diskmap_group_data.files[k].dont_extract_filename) {
+ diskmap_group_data.files[k].original_filename = post_match_file_data.toString('utf8', 10, gzip_fn_end);
+ }
+ //diskmap_group_data.files[k].uncompressed_size = gunzipped.byteLength;
+ gunzipped = null;
+ } else {
+ diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(post_match_file_data)).toString(CryptoJS.enc.Hex).toLowerCase();
+ }
+
if (parseInt(diskmap_group_data.files[k].last_modified) > newest_file_epoch) newest_file_epoch = parseInt(diskmap_group_data.files[k].last_modified);
- //if (!diskmap_group_data.files[k].display) diskmap_group_data.files[k].display = diskmap_group_data.display;
diskmap_group_data.files[k].invalid = true;
wtv_download_list.push(diskmap_group_data.files[k]);
@@ -271,6 +285,6 @@ if (request_headers['wtv-request-type'] == 'download') {
} else if (request_headers.query.group && request_headers.query.diskmap) {
var message = request_headers.query.message || "Retrieving files...";
var main_message = request_headers.query.main_message || "Your receiver is downloading files.";
- headers = "200 OK\nContent-Type: text/html";
+ headers = "200 OK\nwtv-connection-close: close\nConnection: close\nContent-Type: text/html";
data = wtvdl.getSyncPage(message, request_headers.query.group, request_headers.query.diskmap, main_message, message, force_update)
}
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
index 9f44b498..38e60ef4 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
@@ -54,7 +54,7 @@ wtv-log-url: wtv-log:/log`;
if (challenge_header != "") headers += "\n" + challenge_header;
headers += `
wtv-relogin-url: wtv-head-waiter:/relogin?relogin=true
-wtv-reconnect-url: wwtv-head-waiter:/relogin?reconnect=true
+wtv-reconnect-url: wtv-head-waiter:/relogin?reconnect=true
wtv-visit: ${gourl}
Content-type: text/html`;
data = '';
diff --git a/zefie_wtvp_minisrv/WTVDownloadList.js b/zefie_wtvp_minisrv/WTVDownloadList.js
index 712a67e5..9daa7e45 100644
--- a/zefie_wtvp_minisrv/WTVDownloadList.js
+++ b/zefie_wtvp_minisrv/WTVDownloadList.js
@@ -146,16 +146,23 @@ class WTVDownloadList {
* @param {string} checksum md5sum of the file
* @param {string} file_permission File permissions
*/
- get(file, path, source, group, checksum = null, uncompressed_size = null, file_permission = 'r') {
- file = this.wtvshared.stripGzipFromPath(file);
+ get(file, path, source, group, checksum = null, uncompressed_size = null, original_filename = null, file_permission = 'r') {
+ if (original_filename) {
+ file = file.split('/');
+ var file_name = file[file.length - 1];
+ path = path.replace(file_name, original_filename);
+ file.pop();
+ if (file.length > 0) file = file.join('/') + '/' + original_filename;
+ else file = original_filename;
+ }
this.download_list += "GET " + file + "\n";
+
this.download_list += "group: " + group + "-UPDATE\n";
this.download_list += "location: " + source + "\n";
this.download_list += "file-permission: " + file_permission + "\n";
if (checksum != null) this.download_list += "wtv-checksum: " + checksum + "\n";
if (uncompressed_size != null) this.download_list += "wtv-uncompressed-filesize: " + uncompressed_size + "\n";
- this.download_list += "service-source-location: /webtv/content/" + source.substr(source.indexOf('-') + 1, source.indexOf(':/') - source.indexOf('-') - 1) + "d/" + source.substr(source.indexOf(':/') + 2) + "\n";
- path = this.wtvshared.stripGzipFromPath(path);
+ this.download_list += "service-source-location: /webtv/content/" + source.substr(source.indexOf('-') + 1, source.indexOf(':/') - source.indexOf('-') - 1) + "d/" + source.substr(source.indexOf(':/') + 2) + "\n";
this.download_list += "client-dest-location: " + path + "\n\n";
}
@@ -241,7 +248,7 @@ class WTVDownloadList {
if (fail_url === null) fail_url = new this.clientShowAlert({
'image': this.minisrv_config.config.service_logo,
'message': "Download failed...",
- 'buttonlabel1': "Okay...",
+ 'buttonlabel1': "Fuck!",
'buttonaction1': "client:goback",
'noback': true,
}).getURL();
diff --git a/zefie_wtvp_minisrv/WTVShared.js b/zefie_wtvp_minisrv/WTVShared.js
index a53a7800..f3d6493d 100644
--- a/zefie_wtvp_minisrv/WTVShared.js
+++ b/zefie_wtvp_minisrv/WTVShared.js
@@ -94,6 +94,16 @@ class WTVShared {
return path;
}
+ /**
+ * Returns a percentage
+ * @param {number} partialValue
+ * @param {number} totalValue
+ * @returns {number} percentage
+ */
+ getPercentage = function (partialValue, totalValue) {
+ return Math.floor((100 * partialValue) / totalValue);
+ }
+
/**
* If the file ends with .gz, remove it
* @param {string} path
diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index b4e1aa38..6046689c 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -584,28 +584,29 @@ async function sendToClient(socket, headers_obj, data) {
}
}
+ if (content_length > 0) {
+ if (socket_sessions[socket.id].wtv_request_type == "download") {
+ if (headers_obj['Content-Type'] != "wtv/download-list") {
+ if (wtvshared.getFileExt(socket_sessions[socket.id].request_headers.request_url).toLowerCase() == "gz") {
+ // we need the checksum of the uncompressed data
+ var gunzipped = zlib.gunzipSync(data);
+ headers_obj['wtv-checksum'] = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
+ headers_obj['wtv-uncompressed-size'] = gunzipped.byteLength;
+ gunzipped = null;
+ } else {
+ headers_obj['wtv-checksum'] = CryptoJS.MD5(CryptoJS.lib.WordArray.create(data)).toString(CryptoJS.enc.Hex).toLowerCase();
+ }
+ }
+ }
+ }
+
// if box can do compression, see if its worth enabling
// small files actually get larger, so don't compress them
var compression_type = 0;
if (content_length >= 256) compression_type = wtvmime.shouldWeCompress(ssid_sessions[socket.ssid], headers_obj);
- // disk service hack before further processing :)
- if (socket_sessions[socket.id].wtv_request_type == "download" && content_length > 0) {
- if (headers_obj['Content-Type'] == "application/gzip") {
- var gunzipped = zlib.gunzipSync(data);
- headers_obj['wtv-checksum'] = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
- headers_obj['wtv-uncompressed-filesize'] = gunzipped.byteLength;
- headers_obj['Content-Type'] = wtvmime.getSimpleContentType(wtvshared.stripGzipFromPath(socket_sessions[socket.id].request_headers.request_url));
- gunzipped = null;
- } else {
- headers_obj['wtv-checksum'] = CryptoJS.MD5(CryptoJS.lib.WordArray.create(data)).toString(CryptoJS.enc.Hex).toLowerCase();
- }
- }
- delete socket_sessions[socket.id].wtv_request_type;
- delete socket_sessions[socket.id].request_headers;
-
// compress if needed
- if (compression_type > 0 && content_length > 0 && headers_obj['http_response'].substring(0,3) == "200") {
+ if (compression_type > 0 && content_length > 0 && headers_obj['http_response'].substring(0, 3) == "200") {
var uncompressed_content_length = content_length;
switch (compression_type) {
case 1:
@@ -640,7 +641,7 @@ async function sendToClient(socket, headers_obj, data) {
}
// encrypt if needed
- if (socket_sessions[socket.id].secure == true) {
+ 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);
if (content_length > 0 && socket_sessions[socket.id].wtvsec) {
@@ -650,6 +651,11 @@ async function sendToClient(socket, headers_obj, data) {
}
}
+ if (socket_sessions[socket.id].do_not_encrypt) {
+ if (headers_obj["wtv-encrypted"]) delete headers_obj["wtv-encrypted"];
+ if (headers_obj["secure"]) delete headers_obj["secure"];
+ }
+
// calculate content length
// make sure we are using our Content-length and not one set in a script.
if (headers_obj["Content-Length"]) delete headers_obj["Content-Length"];
@@ -675,6 +681,21 @@ async function sendToClient(socket, headers_obj, data) {
headers_obj['http_response'] = "HTTP/1.0 " + headers_obj['http_response'];
}
+/* // wtv-request-type download wants minimal headers?
+ if (data.byteLength > 0) {
+ if (socket_sessions[socket.id].wtv_request_type == "download") {
+ if (headers_obj['Content-Type'] != "wtv/download-list") {
+ // minimalize headers
+ var new_headers = { "http_response": headers_obj['http_response'].split(" ")[0] + " " }
+ if (headers_obj['wtv-encrypted']) new_headers['wtv-encrypted'] = headers_obj['wtv-encrypted'];
+ new_headers["content-type"] = headers_obj['Content-Type'];
+ new_headers["content-length"] = headers_obj['Content-length'];
+
+ headers_obj = new_headers;
+ }
+ }
+ }
+*/
// header object to string
if (minisrv_config.config.debug_flags.show_headers) console.log(" * Outgoing headers on socket ID", socket.id, (await wtvshared.filterSSID(headers_obj)));
Object.keys(headers_obj).forEach(function (k) {
@@ -690,42 +711,32 @@ async function sendToClient(socket, headers_obj, data) {
}
});
+ if (headers_obj["Connection"]) {
+ if (headers_obj["Connection"].toLowerCase() == "close" && wtv_connection_close == "true") {
+ socket_sessions[socket.id].destroy_me = true;
+ }
+ }
// send to client
var toClient = null;
if (typeof data == 'string') {
toClient = headers + end_of_line + data;
- socket.write(toClient);
+ socket.write(Buffer.from(toClient));
} else if (typeof data == 'object') {
if (minisrv_config.config.debug_flags.quiet) var verbosity_mod = (headers_obj["wtv-encrypted"] == 'true') ? " encrypted response" : "";
if (socket_sessions[socket.id].secure_headers == true) {
// encrypt headers
if (minisrv_config.config.debug_flags.quiet) verbosity_mod += " with encrypted headers";
var enc_headers = socket_sessions[socket.id].wtvsec.Encrypt(1, headers + end_of_line);
- socket.write(new Uint8Array(concatArrayBuffer(enc_headers, data)));
+ socket.write(new Buffer.from(concatArrayBuffer(enc_headers, data)));
} else {
- socket.write(new Uint8Array(concatArrayBuffer(Buffer.from(headers + end_of_line), data)));
+ socket.write(new Buffer.from(concatArrayBuffer(Buffer.from(headers + end_of_line), data)));
}
if (minisrv_config.config.debug_flags.quiet) console.log(" * Sent" + verbosity_mod + " " + headers_obj.http_response + " to client (Content-Type:", headers_obj['Content-Type'], "~", headers_obj['Content-length'], "bytes)");
}
-
- if (socket_sessions[socket.id].expecting_post_data) delete socket_sessions[socket.id].expecting_post_data;
- if (socket_sessions[socket.id].header_buffer) delete socket_sessions[socket.id].header_buffer;
- if (socket_sessions[socket.id].secure_buffer) delete socket_sessions[socket.id].secure_buffer;
- if (socket_sessions[socket.id].buffer) delete socket_sessions[socket.id].buffer;
- if (socket_sessions[socket.id].headers) delete socket_sessions[socket.id].headers;
- if (socket_sessions[socket.id].post_data) delete socket_sessions[socket.id].post_data;
- if (socket_sessions[socket.id].post_data_length) delete socket_sessions[socket.id].post_data_length;
- if (socket_sessions[socket.id].post_data_percents_shown) delete socket_sessions[socket.id].post_data_percents_shown;
- socket.setTimeout(minisrv_config.config.socket_timeout * 1000);
- if (socket_sessions[socket.id].close_me) socket.end();
- if (headers_obj["Connection"]) {
- if (headers_obj["Connection"].toLowerCase() == "close" && wtv_connection_close == "true") {
- socket.destroy();
- }
- }
}
+
function concatArrayBuffer(buffer1, buffer2) {
var tmp = new Uint8Array(buffer1.byteLength + buffer2.byteLength);
tmp.set(new Uint8Array(buffer1), 0);
@@ -1070,44 +1081,36 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
socket_sessions[socket.id].post_data = "";
socket_sessions[socket.id].headers = headers;
var post_string = "POST";
- if (socket_sessions[socket.id].secure == true) {
- post_string = "Encrypted " + post_string;
- }
+ if (socket_sessions[socket.id].secure) post_string = "Encrypted " + post_string;
// the client may have just sent the data with the primary headers, so lets look for that.
if (data_hex.indexOf("0d0a0d0a") != -1) socket_sessions[socket.id].post_data = data_hex.substring(data_hex.indexOf("0d0a0d0a") + 8);
if (data_hex.indexOf("0a0a") != -1) socket_sessions[socket.id].post_data = data_hex.substring(data_hex.indexOf("0a0a") + 4);
-
}
+
if (socket_sessions[socket.id].post_data.length == (socket_sessions[socket.id].post_data_length * 2)) {
// got all expected data
if (socket_sessions[socket.id].expecting_post_data) delete socket_sessions[socket.id].expecting_post_data;
console.log(" * Incoming", post_string, "request on", socket.id, "from", wtvshared.filterSSID(socket.ssid), "to", headers['request_url'], "(got all expected", socket_sessions[socket.id].post_data_length, "bytes of data from client already)");
headers.post_data = CryptoJS.enc.Hex.parse(socket_sessions[socket.id].post_data);
- if (socket_sessions[socket.id].headers) delete socket_sessions[socket.id].headers;
+ delete socket_sessions[socket.id].headers;
+ delete socket_sessions[socket.id].post_data;
+ delete socket_sessions[socket.id].post_data_length;
processURL(socket, headers);
- } else {
- // expecting more data (see below)
- socket_sessions[socket.id].expecting_post_data = true;
- if (!socket_sessions[socket.id].post_data) socket_sessions[socket.id].post_data = '';
- if (socket_sessions[socket.id].secure) {
- // decrypt if encrypted
- socket_sessions[socket.id].post_data = CryptoJS.lib.WordArray.create(socket_sessions[socket.id].wtvsec.Decrypt(0, CryptoJS.enc.Hex.parse(socket_sessions[socket.id].post_data))).toString(CryptoJS.enc.Hex);
- } else {
- // just pass it over
- socket_sessions[socket.id].post_data = socket_sessions[socket.id].post_data;
- }
- socket_sessions[socket.id].post_data += CryptoJS.enc.Hex.parse(socket_sessions[socket.id].post_data);
- console.log(" * Incoming", post_string, "request on", socket.id, "from", wtvshared.filterSSID(socket.ssid), "to", headers['request_url'], "(expecting", socket_sessions[socket.id].post_data_length, "bytes of data from client...)");
- }
- if (socket_sessions[socket.id].post_data.length > (socket_sessions[socket.id].post_data_length * 2)) {
- // got too much data ? ... should not ever reach this code
- var errpage = doErrorPage(400, "Received too much data in POST request
Got " + (socket_sessions[socket.id].post_data.length / 2) + ", expected " + socket_sessions[socket.id].post_data_length);
+ } else if (socket_sessions[socket.id].post_data.length > (socket_sessions[socket.id].post_data_length * 2)) {
+ // got too much data ? ... should not ever reach this code (section 2)
+ var errpage = doErrorPage(400, "Received too much data in POST request
Got " + (socket_sessions[socket.id].post_data.length / 2) + ", expected " + socket_sessions[socket.id].post_data_length) + " (2)";
headers = errpage[0];
data = errpage[1];
sendToClient(socket, headers, data);
return;
- }
+ } else {
+ // expecting more data (see below)
+ socket_sessions[socket.id].expecting_post_data = true;
+ if (!socket_sessions[socket.id].post_data) socket_sessions[socket.id].post_data = '';
+ socket_sessions[socket.id].post_data += CryptoJS.enc.Hex.parse(socket_sessions[socket.id].post_data);
+ console.log(" * Incoming", post_string, "request on", socket.id, "from", wtvshared.filterSSID(socket.ssid), "to", headers['request_url'], "(expecting", socket_sessions[socket.id].post_data_length, "bytes of data from client...)");
+ }
return;
} else {
delete socket_sessions[socket.id].headers;
@@ -1144,10 +1147,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
console.log(" * ", Math.floor(new Date().getTime() / 1000), "Receiving", post_string, "data on", socket.id, "[", socket_sessions[socket.id].post_data.length / 2, "of", socket_sessions[socket.id].post_data_length, "bytes ]");
} else {
// calculate and display percentage of data received
- var getPercentage = function (partialValue, totalValue) {
- return Math.floor((100 * partialValue) / totalValue);
- }
- var postPercent = getPercentage(socket_sessions[socket.id].post_data.length, (socket_sessions[socket.id].post_data_length * 2));
+ var postPercent = wtvshared.getPercentage(socket_sessions[socket.id].post_data.length, (socket_sessions[socket.id].post_data_length * 2));
if (minisrv_config.config.post_percentages) {
if (minisrv_config.config.post_percentages.includes(postPercent)) {
if (!socket_sessions[socket.id].post_data_percents_shown) socket_sessions[socket.id].post_data_percents_shown = new Array();
@@ -1175,8 +1175,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq
delete socket_sessions[socket.id].post_data_length;
processURL(socket, headers);
return;
- }
- if (socket_sessions[socket.id].post_data.length > (socket_sessions[socket.id].post_data_length * 2)) {
+ } else if (socket_sessions[socket.id].post_data.length > (socket_sessions[socket.id].post_data_length * 2)) {
if (socket_sessions[socket.id].expecting_post_data) delete socket_sessions[socket.id].expecting_post_data;
socket.setTimeout(minisrv_config.config.socket_timeout * 1000);
// got too much data ? ... should not ever reach this code
diff --git a/zefie_wtvp_minisrv/config.json b/zefie_wtvp_minisrv/config.json
index 101339f4..db14be70 100644
--- a/zefie_wtvp_minisrv/config.json
+++ b/zefie_wtvp_minisrv/config.json
@@ -13,7 +13,7 @@
"hide_ssid_in_logs": true,
"post_percentages": [ 0, 25, 50, 100 ],
"verbosity": 2,
- "socket_timeout": 10800,
+ "socket_timeout": 86400,
"post_data_socket_timeout": 30,
"error_log_file": "errors.log",
"catchall_file_name": "catchall.js",