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

mostly fix bad-disk detection

Browse Source 
- may still get bad-disk screen once after fixing disk
- may only be an issue if the user reconnects before the cleanup
This commit is contained in:
zefie
2022-03-17 19:24:06 -04:00
parent 3269ec55a5
commit d70cb5bf36
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js
View File

@@ -64,7 +64,10 @@ minisrv-no-mail-count: true
`; `;
} }
} else { } else {
if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) { if (ssid_sessions[socket.ssid].baddisk === true) {
gourl = "wtv-head-waiter:/bad-disk?"
}
else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) {
gourl = "wtv-head-waiter:/choose-user?" gourl = "wtv-head-waiter:/choose-user?"
} else { } else {
var limitedLogin = (!ssid_sessions[socket.ssid].lockdown && (!ssid_sessions[socket.ssid].get('password_valid') && ssid_sessions[socket.ssid].getUserPasswordEnabled())); var limitedLogin = (!ssid_sessions[socket.ssid].lockdown && (!ssid_sessions[socket.ssid].get('password_valid') && ssid_sessions[socket.ssid].getUserPasswordEnabled()));

13
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/bad-disk.js
View File

@@ -1,6 +1,9 @@
var minisrv_service_file = true; var minisrv_service_file = true;
// remove restrictions once this page is shown, since the user will be 'trapped' anyway
ssid_sessions[socket.ssid].disableLockdown(); ssid_sessions[socket.ssid].disableLockdown();
ssid_sessions[socket.ssid].delete("wtv-my-disk-sucks-sucks-sucks");
ssid_sessions[socket.ssid].baddisk = false;
headers = `200 OK headers = `200 OK
Content-type: text/html`; Content-type: text/html`;
@@ -12,14 +15,14 @@ data = `<html>
<body bgcolor="#191919" text="#42CC55" link="36d5ff" fontsize="large" hspace=0 vspace=0> <body bgcolor="#191919" text="#42CC55" link="36d5ff" fontsize="large" hspace=0 vspace=0>
<table cellspacing=0 cellpadding=0> <table cellspacing=0 cellpadding=0>
<tr><td width=104 height=74 valign=middle align=center bgcolor="3B3A4D"> <tr><td width=104 height=74 valign=middle align=center bgcolor="3B3A4D">
<img src="wtv-flashrom:/ROMCache/WebTVLogoJewel.gif" width=86 height=64><td width=20 valign=top align=left bgcolor="3B3A4D"> <img src="${minisrv_config.config.service_logo}" width=86 height=64><td width=20 valign=top align=left bgcolor="3B3A4D">
<img src="ROMCache/Spacer.gif" <img src="${service_name}:/ROMCache/Spacer.gif"
width=1 height=1> width=1 height=1>
<td colspan=10 width=436 valign=middle align=left bgcolor="3B3A4D"> <td colspan=10 width=436 valign=middle align=left bgcolor="3B3A4D">
<font color="D6DFD0" size="+2"> <font color="D6DFD0" size="+2">
<blackface> <blackface>
<shadow> <shadow>
<img src="ROMCache/Spacer.gif" <img src="${service_name}:/ROMCache/Spacer.gif"
width=1 height=4> width=1 height=4>
<br> <br>
Please Call Please Call
@@ -52,9 +55,9 @@ or replaced before you can connect to WebTV.
<!-- Disabled until we can reliably grab the user's box manufacturer <!-- Disabled until we can reliably grab the user's box manufacturer
<p>Call Philips customer service at<br>1-888-813-7069 --> <p>Call Philips customer service at<br>1-888-813-7069 -->
<tr><td colspan=2> <tr><td colspan=2>
<td colspan=99 abswidth=436 absheight=2 bgcolor=2B2B2B> <img src="wtv-flashrom:/ROMCache/Spacer.gif" width=1 height=1> <tr><td absheight=1> <td colspan=99 abswidth=436 absheight=2 bgcolor=2B2B2B> <img src="wtv-flashrom:/${service_name}:/ROMCache/Spacer.gif" width=1 height=1> <tr><td absheight=1>
<tr><td colspan=2> <tr><td colspan=2>
<td colspan=99 abswidth=436 absheight=2 bgcolor=0D0D0D> <img src="wtv-flashrom:/ROMCache/Spacer.gif" width=1 height=1> <tr><td height=7> <td colspan=99 abswidth=436 absheight=2 bgcolor=0D0D0D> <img src="wtv-flashrom:/${service_name}:/ROMCache/Spacer.gif" width=1 height=1> <tr><td height=7>
<tr> <tr>
<td width=104 valign=middle align=center> <td width=20 valign=middle align=center> <td colspan=9 width=416 valign=top align=left> <table cellspacing=0 cellpadding=0> <td width=104 valign=middle align=center> <td width=20 valign=middle align=center> <td colspan=9 width=416 valign=top align=left> <table cellspacing=0 cellpadding=0>
<tr> <tr>

5
zefie_wtvp_minisrv/app.js
View File

@@ -429,6 +429,7 @@ async function processURL(socket, request_headers) {
// lockdown mode and URL not authorized // lockdown mode and URL not authorized
headers = "300 Unauthorized\n"; headers = "300 Unauthorized\n";
headers += "Location: " + minisrv_config.config.unauthorized_url + "\n"; headers += "Location: " + minisrv_config.config.unauthorized_url + "\n";
headers += "minisrv-no-mail-count: true\n";
data = ""; data = "";
sendToClient(socket, headers, data); sendToClient(socket, headers, data);
console.log(" * Lockdown rejected request for " + shortURL + " on socket ID", socket.id); console.log(" * Lockdown rejected request for " + shortURL + " on socket ID", socket.id);
@@ -440,6 +441,7 @@ async function processURL(socket, request_headers) {
// user is not fully logged in, and URL not authorized // user is not fully logged in, and URL not authorized
headers = "300 Unauthorized\n"; headers = "300 Unauthorized\n";
headers += "Location: client:relogin\n"; headers += "Location: client:relogin\n";
headers += "minisrv-no-mail-count: true\n";
data = ""; data = "";
sendToClient(socket, headers, data); sendToClient(socket, headers, data);
console.log(" * Incomplete login rejected request for " + shortURL + " on socket ID", socket.id); console.log(" * Incomplete login rejected request for " + shortURL + " on socket ID", socket.id);
@@ -458,7 +460,8 @@ async function processURL(socket, request_headers) {
if (!ssid_sessions[socket.ssid].isUserLoggedIn() && !ssid_sessions[socket.ssid].isAuthorized(shortURL, 'login')) { if (!ssid_sessions[socket.ssid].isUserLoggedIn() && !ssid_sessions[socket.ssid].isAuthorized(shortURL, 'login')) {
// lockdown mode and URL not authorized // lockdown mode and URL not authorized
headers = `300 Unauthorized headers = `300 Unauthorized
Location: " + minisrv_config.config.unauthorized_url`; Location: ${minisrv_config.config.unauthorized_url}
minisrv-no-mail-count: true`;
data = ""; data = "";
sendToClient(socket, headers, data); sendToClient(socket, headers, data);
console.log(" * Rejected login bypass request for " + shortURL + " on socket ID", socket.id); console.log(" * Rejected login bypass request for " + shortURL + " on socket ID", socket.id);