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

use wtv-head-waiter:/relogin for boot url

Browse Source 
- viewer seems to retain only wtv-* and wtv-head-waiter, so lets try to be closer to protocol and boot with a wtv-head-waiter address instead of wtv-1800
- we still handle via wtv-1800 but we accept wtv-head-waiter:/relogin and send the client on its way to the relogin path
This commit is contained in:
zefie
2021-08-08 20:06:03 -04:00
parent 304968a364
commit 7a09c5f3b1
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js
View File

@@ -144,7 +144,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
headers += getServiceString('wtv-flashrom') + "\n"; headers += getServiceString('wtv-flashrom') + "\n";
if (bf0app_update) headers += "wtv-boot-url: " + gourl + "\n"; if (bf0app_update) headers += "wtv-boot-url: " + gourl + "\n";
else { else {
headers += "wtv-boot-url: wtv-1800:/preregister?relogin=true"; headers += "wtv-boot-url: wtv-head-waiter:/relogin?relogin=true";
if (request_headers.query.guest_login) headers += "&guest_login=true"; if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\n"; headers += "\n";
} }

8
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js
View File

@@ -43,7 +43,7 @@ wtv-ticket: ${wtvsec_login.ticket_b64}
${getServiceString('wtv-register')} ${getServiceString('wtv-register')}
${getServiceString('wtv-head-waiter')} ${getServiceString('wtv-head-waiter')}
${getServiceString('wtv-star')} ${getServiceString('wtv-star')}
wtv-boot-url: wtv-register:/splash? wtv-boot-url: wtv-head-waiter:/relogin?
` `
} }
headers += `wtv-visit: ${gourl} headers += `wtv-visit: ${gourl}
@@ -110,11 +110,11 @@ wtv-connection-timeout: 90
wtv-show-time-enabled: true wtv-show-time-enabled: true
wtv-fader-timeout: 900 wtv-fader-timeout: 900
wtv-tourist-enabled: true` wtv-tourist-enabled: true`
headers += "\nwtv-relogin-url: wtv-1800:/preregister?relogin=true"; headers += "\nwtv-relogin-url: wtv-head-waiter:/relogin?relogin=true";
if (request_headers.query.guest_login) headers += "&guest_login=true"; if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\nwtv-reconnect-url: wtv-1800:/preregister?reconnect=true"; headers += "\nwtv-reconnect-url: wtv-head-waiter:/relogin?reconnect=true";
if (request_headers.query.guest_login) headers += "&guest_login=true"; if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\nwtv-boot-url: wtv-1800:/preregister?relogin=true"; headers += "\nwtv-boot-url: wtv-head-waiter:/relogin?relogin=true";
if (request_headers.query.guest_login) headers += "&guest_login=true"; if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\nwtv-allow-dsc: true"; headers += "\nwtv-allow-dsc: true";
headers += "\nwtv-home-url: wtv-home:/home?"; headers += "\nwtv-home-url: wtv-home:/home?";

6
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
View File

@@ -53,8 +53,8 @@ wtv-expire-all: wtv-head-waiter:
wtv-log-url: wtv-log:/log`; wtv-log-url: wtv-log:/log`;
if (challenge_header != "") headers += "\n" + challenge_header; if (challenge_header != "") headers += "\n" + challenge_header;
headers += ` headers += `
wtv-relogin-url: wtv-1800:/preregister?relogin=true wtv-relogin-url: wtv-head-waiter:/relogin?relogin=true
wtv-reconnect-url: wtv-1800:/preregister?reconnect=true wtv-reconnect-url: wwtv-head-waiter:/relogin?reconnect=true
wtv-visit: ${gourl} wtv-visit: ${gourl}
Content-type: text/html`; Content-type: text/html`;
data = ''; data = '';
@@ -66,7 +66,7 @@ Connection: Keep-Alive
Expires: Wed, 09 Oct 1991 22:00:00 GMT Expires: Wed, 09 Oct 1991 22:00:00 GMT
wtv-expire-all: wtv-head-waiter: wtv-expire-all: wtv-head-waiter:
wtv-expire-all: wtv-1800: wtv-expire-all: wtv-1800:
wtv-visit: wtv-1800:/preregister?relogin=true wtv-visit: wtv-head-waiter:/relogin?relogin=true
Content-type: text/html`; Content-type: text/html`;
data = ''; data = '';
} }

20
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js Normal file
View File

@@ -0,0 +1,20 @@
var gourl = "wtv-1800:/preregister?";
if (request_headers.query.relogin) gourl += "relogin=true";
else if (request_headers.query.reconnect) gourl += "reconnect=true";
if (request_headers.query.guest_login) {
if (request_headers.query.relogin || request_headers.query.reconnect) gourl += "&";
gourl += "guest_login=true";
if (request_headers.query.skip_splash) gourl += "&skip_splash=true";
}
headers = `200 OK
Connection: Keep-Alive
Expires: Wed, 09 Oct 1991 22:00:00 GMT
wtv-expire-all: wtv-head-waiter:
wtv-expire-all: wtv-1800:
wtv-service: reset
${getServiceString('wtv-1800')}
wtv-visit: ${gourl}
Content-type: text/html`;
data = '';

3
zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
View File

@@ -71,6 +71,9 @@
<Content Include="ServiceVault\wtv-flashrom\ROMCache\up-arrows.swf" /> <Content Include="ServiceVault\wtv-flashrom\ROMCache\up-arrows.swf" />
<Content Include="ServiceVault\wtv-flashrom\ROMCache\WebTVLogoJewel.gif" /> <Content Include="ServiceVault\wtv-flashrom\ROMCache\WebTVLogoJewel.gif" />
<Content Include="ServiceVault\wtv-flashrom\willie.js" /> <Content Include="ServiceVault\wtv-flashrom\willie.js" />
<Content Include="ServiceVault\wtv-head-waiter\relogin.js">
<SubType>Code</SubType>
</Content>
<Content Include="ServiceVault\wtv-music\demo\hacktv4.gif" /> <Content Include="ServiceVault\wtv-music\demo\hacktv4.gif" />
<Content Include="ServiceVault\wtv-music\demo\index.html" /> <Content Include="ServiceVault\wtv-music\demo\index.html" />
<Content Include="ServiceVault\wtv-music\demo\midi\acey.mid" /> <Content Include="ServiceVault\wtv-music\demo\midi\acey.mid" />