diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js index abc141e0..3ee2a2a0 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js @@ -5,7 +5,8 @@ if (socket.ssid != null) { ssid_sessions[socket.ssid].data_store.wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]); } } else { - var errpage = doErrorCode(400); + console.log(" * Something bad happened (we don't know the client ssid???)"); + var errpage = doErrorCode(400) headers = errpage[0]; data = errpage[1]; } @@ -63,8 +64,7 @@ wtv-client-date: `+ strftime("%a, %d %b %Y %H:%M:%S", new Date(new Date().toUTCS }); } } else { - console.log(" * Something bad happened (we don't know the client ssid???)"); - var errpage = doErrorCode(400) + var errpage = doErrorCode(400); headers = errpage[0]; data = errpage[1]; } \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js index a18c64a6..ccaf410c 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js @@ -26,8 +26,13 @@ function doLocalFlashROM(flashrom_file_path) { if (request_headers.query.raw) { if ((/\.brom$/).test(request_path)) headers += "Content-Type: binary/x-wtv-bootrom"; // maybe? else headers += "Content-Type: binary/x-wtv-flashblock"; - var flashrom_file_path = service_dir + '/' + request_path; - if (minisrv_config.services[service_name].use_zefie_server && !fs.existsSync(flashrom_file_path)) { + var flashrom_file_path = null; + Object.keys(service_vaults).forEach(function (g) { + if (flashrom_file_path != null) return; + flashrom_file_path = service_vaults[g].path + "/" + service_name + "/" + request_path; + if (!fs.existsSync(flashrom_file_path)) flashrom_file_path = null; + }); + if (minisrv_config.services[service_name].use_zefie_server && !flashrom_file_path) { // get flashrom files from archive.midnightchannel.net var options = { host: "archive.midnightchannel.net", diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js index 051eb77c..5f1e2050 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js @@ -26,8 +26,14 @@ if (!request_headers.query.path) { data = errpage[1]; } else { var request_path = unescape(request_headers.query.path); - var flashrom_file_path = service_dir + '/' + request_path; - if (minisrv_config.services[service_name].use_zefie_server && !fs.existsSync(flashrom_file_path)) { + var flashrom_file_path = null; + Object.keys(service_vaults).forEach(function (g) { + if (flashrom_file_path != null) return; + flashrom_file_path = service_vaults[g].path + "/" + service_name + "/" + request_path; + if (!fs.existsSync(flashrom_file_path)) flashrom_file_path = null; + }); + + if (minisrv_config.services[service_name].use_zefie_server && !flashrom_file_path) { // read first 256 bytes of flashrom file from archive.midnightchannel.net // to get `flashrom_message` and `numparts` if missing var options = { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js index f5c2065c..51e21954 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js @@ -14,7 +14,7 @@ if (ssid_sessions[socket.ssid].get('box-does-psuedo-encryption')) { data =` Home for minisrv - +