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

BREAKING CHANGES: (for SeCuRiTy):

Browse Source 
By default:
- `ssid_sessions[socket.ssid]` is now `session_data`
- `require` is no longer allowed in user scripts

To access global `socket_sessions` and `ssid_sessions`, as well as `require` additional modules, you must set `privileged: true` for the specific service. See `config.json`.
This commit is contained in:
zefie
2022-10-09 13:26:14 -04:00
parent 2491f62b89
commit 37f1ab67ad
118 changed files with 577 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/info.js
View File

@@ -3,8 +3,8 @@ var minisrv_service_file = true;
var client_caps = null;
if (socket.ssid != null) {
if (ssid_sessions[socket.ssid].capabilities) {
client_caps = ssid_sessions[socket.ssid].capabilities;
if (session_data.capabilities) {
client_caps = session_data.capabilities;
}
}
if (client_caps) {
@@ -17,12 +17,12 @@ Content-Type: text/html`
var wtv_system_sysconfig_str = "TODO";
var wtv_system_version = ssid_sessions[socket.ssid].get("wtv-system-version");
var wtv_client_bootrom_version = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version");
var wtv_client_serial_number = wtvshared.filterSSID(ssid_sessions[socket.ssid].get("wtv-client-serial-number"));
var wtv_client_rom_type = ssid_sessions[socket.ssid].get("wtv-client-rom-type");
var wtv_system_chipversion_str = ssid_sessions[socket.ssid].get("wtv-system-chipversion");
var wtv_system_sysconfig_hex = parseInt(ssid_sessions[socket.ssid].get("wtv-system-sysconfig")).toString(16);
var wtv_system_version = session_data.get("wtv-system-version");
var wtv_client_bootrom_version = session_data.get("wtv-client-bootrom-version");
var wtv_client_serial_number = wtvshared.filterSSID(session_data.get("wtv-client-serial-number"));
var wtv_client_rom_type = session_data.get("wtv-client-rom-type");
var wtv_system_chipversion_str = session_data.get("wtv-system-chipversion");
var wtv_system_sysconfig_hex = parseInt(session_data.get("wtv-system-sysconfig")).toString(16);
var capabilities_table = new WTVClientCapabilities().capabilities_table;
@@ -82,19 +82,19 @@ Content-Type: text/html`
<td width=10>
<td valign=top>${socket.remoteAddress}
`;
if (ssid_sessions[socket.ssid].getSessionData("registered")) {
if (session_data.getSessionData("registered")) {
data += `<tr>
<td valign=top align=right><shadow>Subscriber Name:</shadow>
<td width=10>
<td valign=top>${ssid_sessions[socket.ssid].getSessionData("subscriber_name")}
<td valign=top>${session_data.getSessionData("subscriber_name")}
<tr>
<td valign=top align=right><shadow>Subscriber Username:</shadow>
<td width=10>
<td valign=top>${ssid_sessions[socket.ssid].getSessionData("subscriber_username")}
<td valign=top>${session_data.getSessionData("subscriber_username")}
<tr>
<td valign=top align=right><shadow>Subscriber Contact:</shadow>
<td width=10>
<td valign=top>${ssid_sessions[socket.ssid].getSessionData("subscriber_contact")} (${ssid_sessions[socket.ssid].getSessionData("subscriber_contact_method")})`;
<td valign=top>${session_data.getSessionData("subscriber_contact")} (${session_data.getSessionData("subscriber_contact_method")})`;
} else {
data += `<tr>
<td valign=top align=right><shadow>Unregistered Guest:</shadow>
@@ -113,7 +113,7 @@ Content-Type: text/html`
<td width=10>
<td valign=top>&modem;
`;
if (ssid_sessions[socket.ssid].get("wtv-need-upgrade")) {
if (session_data.get("wtv-need-upgrade")) {
data += `<tr>
<td valign=top align=right><shadow>Mini-browser:</shadow>
<td width=10>

12
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/nullify-me.js
View File

@@ -2,12 +2,12 @@ var minisrv_service_file = true;
// null is the new demo/flash
if (ssid_sessions[socket.ssid]) {
if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
if (ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_store) {
if (ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_store.user_id != null) {
if (ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_store.user_id >= 0)
ssid_sessions[socket.ssid].switchUserID(-1);
if (session_data) {
if (session_data.data_store.wtvsec_login) {
if (session_data.data_store.wtvsec_login.ticket_store) {
if (session_data.data_store.wtvsec_login.ticket_store.user_id != null) {
if (session_data.data_store.wtvsec_login.ticket_store.user_id >= 0)
session_data.switchUserID(-1);
}
}
}

2
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/register.js
View File

@@ -3,7 +3,7 @@ var minisrv_service_file = true;
headers = `200 OK
Content-Type: text/html`;
if (ssid_sessions[socket.ssid].getSessionData("registered")) {
if (session_data.getSessionData("registered")) {
var redirect = [10, "client:goback?"];
var message = "Error: Your box is already registered. If you would like to re-register, you must first unregister.";
} else if (request_headers.query.confirm_register) {

2
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/tricks.js
View File

@@ -41,7 +41,7 @@ data = `<html>
<td><a href="client:showservices">Show Services</a>
<td width = 25>
`;
if (ssid_sessions[socket.ssid].getSessionData("registered")) data += `<td><a href="wtv-tricks:/unregister">Unregister This Box</a>`;
if (session_data.getSessionData("registered")) data += `<td><a href="wtv-tricks:/unregister">Unregister This Box</a>`;
else data += `<td><a href="wtv-tricks:/register">Register This Box</a>`
data += `

6
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/unregister.js
View File

@@ -3,18 +3,18 @@ var minisrv_service_file = true;
headers = `200 OK
Content-Type: text/html`;
if (!ssid_sessions[socket.ssid].getSessionData("registered")) {
if (!session_data.getSessionData("registered")) {
headers += "\nwtv-noback-all: wtv-";
headers += "\nwtv-expire-all: wtv-";
var redirect = [5, "client:relogin?"];
var message = "Error: Your box is not registered. You are accessing " + minisrv_config.config.service_name + " in Guest Mode. There is nothing to delete!";
} else if (ssid_sessions[socket.ssid].user_id !== 0) {
} else if (session_data.user_id !== 0) {
headers += "\nwtv-noback-all: wtv-";
headers += "\nwtv-expire-all: wtv-";
var redirect = [5, "wtv-tricks:/tricks"];
var message = "Error: You must be the primary user to unregister this box.";
} else if (request_headers.query.confirm_unregister) {
if (ssid_sessions[socket.ssid].unregisterBox()) {
if (session_data.unregisterBox()) {
headers += "\nwtv-noback-all: wtv-";
headers += "\nwtv-expire-all: wtv-";
var redirect = [3, "client:relog?"];