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

fix flashrom yet again

Browse Source
This commit is contained in:
zefie
2021-08-10 01:17:39 -04:00
parent 28adff5a59
commit 5083b51c6b
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js
View File

@@ -1,6 +1,5 @@
const WTVFlashrom = require("./WTVFlashrom.js"); const WTVFlashrom = require("./WTVFlashrom.js");
request_is_async = true; request_is_async = true;
console.log(request_headers);
var bf0app_update = false; var bf0app_update = false;
var request_path = request_headers.request_url.replace(service_name + ":/", ""); var request_path = request_headers.request_url.replace(service_name + ":/", "");

2
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
View File

@@ -8,7 +8,7 @@ if (!request_headers.query.path) {
headers = errpage[0]; headers = errpage[0];
data = errpage[1]; data = errpage[1];
} else { } else {
var wtvflashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, minisrv_config.services[service_name].debug); var wtvflashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server);
var request_path = request_headers.query.path; var request_path = request_headers.query.path;
// read flashrom header info into array using WTVFlashrom class // read flashrom header info into array using WTVFlashrom class

3
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/initiate-lc2-download.js
View File

@@ -5,8 +5,9 @@ var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type");
url = "client:updateflash?ipaddr=" + minisrv_config.services[service_name].host + "&port=" + minisrv_config.services[service_name].port + "&path=" + escape(service_name + ":/" +request_headers.query.path); url = "client:updateflash?ipaddr=" + minisrv_config.services[service_name].host + "&port=" + minisrv_config.services[service_name].port + "&path=" + escape(service_name + ":/" +request_headers.query.path);
if (request_headers.query.numparts) url += escape("&numparts=" + request_headers.query.numparts); if (request_headers.query.numparts) url += escape("&numparts=" + request_headers.query.numparts);
} }
headers = "200 OK\n"; headers = "300 OK\n";
headers += "wtv-visit: " + url + "\n"; headers += "wtv-visit: " + url + "\n";
headers += "Location: " + url + "\n";
headers += "Content-type: text/html"; headers += "Content-type: text/html";
data = ''; data = '';
} else { } else {

4
zefie_wtvp_minisrv/WTVFlashrom.js
View File

@@ -14,7 +14,7 @@ class WTVFlashrom {
this.service_name = service_name; this.service_name = service_name;
this.use_zefie_server = use_zefie_server; this.use_zefie_server = use_zefie_server;
this.bf0app_update = bf0app_update; this.bf0app_update = bf0app_update;
this.zdebug = true; this.zdebug = debug;
} }
@@ -138,7 +138,7 @@ class WTVFlashrom {
var flashrom_info = this.getFlashromInfo(data, request_path) var flashrom_info = this.getFlashromInfo(data, request_path)
if (flashrom_info.is_bootrom) headers += "Content-Type: binary/x-wtv-bootrom"; // maybe? if (flashrom_info.is_bootrom) headers += "Content-Type: binary/x-wtv-bootrom"; // maybe?
else headers += "Content-Type: binary/x-wtv-flashblock"; else headers += "Content-Type: binary/x-wtv-flashblock";
if (flashrom_info.next_rompath != null) headers += "\nwtv-visit: " + flashrom_info.next_rompath; if (flashrom_info.next_rompath != null && this.bf0app_update) headers += "\nwtv-visit: " + flashrom_info.next_rompath;
callback(data, headers); callback(data, headers);
} }

3
zefie_wtvp_minisrv/WTVSec.js
View File

@@ -238,7 +238,8 @@ class WTVSec {
* #returns {Buffer} JS Buffer object * #returns {Buffer} JS Buffer object
*/ */
wordArrayToBuffer(wordArray) { wordArrayToBuffer(wordArray) {
return new Buffer.from(wordArray.toString(CryptoJS.enc.Hex), 'hex'); if (wordArray) return new Buffer.from(wordArray.toString(CryptoJS.enc.Hex), 'hex');
else return null;
} }
/** /**