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

fix guest login feature

Browse Source
This commit is contained in:
zefie
2021-08-07 19:03:07 -04:00
parent c09d0d6989
commit 95d069582b
6 changed files with 87 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,45 +1,45 @@
var gourl = "wtv-head-waiter:/login?"; var gourl = "wtv-head-waiter:/login?";
if (socket.ssid) { if (socket.ssid) {
if (ssid_sessions[socket.ssid].loadSessionData() == true) { if (ssid_sessions[socket.ssid].loadSessionData() == true) {
console.log(" * Loaded session data from disk for", filterSSID(socket.ssid)) console.log(" * Loaded session data from disk for", filterSSID(socket.ssid))
ssid_sessions[socket.ssid].setSessionData("registered", (ssid_sessions[socket.ssid].getSessionData("registered") == true) ? true : false); ssid_sessions[socket.ssid].setSessionData("registered", (ssid_sessions[socket.ssid].getSessionData("registered") == true) ? true : false);
} else {
ssid_sessions[socket.ssid].session_data = {};
ssid_sessions[socket.ssid].setSessionData("registered", false);
}
if (ssid_sessions[socket.ssid].data_store) {
if (ssid_sessions[socket.ssid].data_store.sockets) {
var i = 0;
ssid_sessions[socket.ssid].data_store.sockets.forEach(function (k) {
if (typeof k != "undefined") {
if (k != socket) {
k.destroy();
ssid_sessions[socket.ssid].data_store.sockets.delete(k);
i++;
}
}
});
if (i > 0 && zdebug) console.log(" # Closed", i, "previous sockets for", filterSSID(socket.ssid));
}
}
if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
if (zdebug) console.log(" # Recreating primary WTVSec login instance for", filterSSID(socket.ssid));
delete ssid_sessions[socket.ssid].data_store.wtvsec_login;
}
ssid_sessions[socket.ssid].data_store.wtvsec_login = new WTVSec();
ssid_sessions[socket.ssid].data_store.wtvsec_login.IssueChallenge();
ssid_sessions[socket.ssid].data_store.wtvsec_login.set_incarnation(request_headers["wtv-incarnation"] || 1);
} else { } else {
ssid_sessions[socket.ssid].session_data = {}; console.log(" * Something bad happened (we don't know the client ssid???)");
ssid_sessions[socket.ssid].setSessionData("registered", false); var errpage = doErrorPage(400)
headers = errpage[0];
data = errpage[1];
} }
if (ssid_sessions[socket.ssid].data_store) {
if (ssid_sessions[socket.ssid].data_store.sockets) {
var i = 0;
ssid_sessions[socket.ssid].data_store.sockets.forEach(function (k) {
if (typeof k != "undefined") {
if (k != socket) {
k.destroy();
ssid_sessions[socket.ssid].data_store.sockets.delete(k);
i++;
}
}
});
if (i > 0 && zdebug) console.log(" # Closed", i, "previous sockets for", filterSSID(socket.ssid));
}
}
if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
if (zdebug) console.log(" # Recreating primary WTVSec login instance for", filterSSID(socket.ssid));
delete ssid_sessions[socket.ssid].data_store.wtvsec_login;
}
ssid_sessions[socket.ssid].data_store.wtvsec_login = new WTVSec(); if (request_headers.query.relogin && ssid_sessions[socket.ssid].getSessionData("registered")) gourl += "relogin=true";
ssid_sessions[socket.ssid].data_store.wtvsec_login.IssueChallenge(); if (request_headers.query.reconnect && ssid_sessions[socket.ssid].getSessionData("registered")) gourl += "reconnect=true";
ssid_sessions[socket.ssid].data_store.wtvsec_login.set_incarnation(request_headers["wtv-incarnation"] || 1);
} else {
console.log(" * Something bad happened (we don't know the client ssid???)");
var errpage = doErrorPage(400)
headers = errpage[0];
data = errpage[1];
}
if (request_headers.query.relogin && ssid_sessions[socket.ssid].getSessionData("registered")) gourl += "relogin=true";
if (request_headers.query.reconnect && ssid_sessions[socket.ssid].getSessionData("registered")) gourl += "reconnect=true";
if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
var prereg_contype = "text/html"; var prereg_contype = "text/html";
@@ -53,11 +53,11 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
var file_path = null; var file_path = null;
var bf0app_update = false; var bf0app_update = false;
var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type");
var send_tellyscripts = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin); var send_tellyscript = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin);
var wtv_script_id = parseInt(ssid_sessions[socket.ssid].get("wtv-script-id")); var wtv_script_id = parseInt(ssid_sessions[socket.ssid].get("wtv-script-id"));
var bootrom = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version"); var bootrom = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version");
if ((request_headers.query.reconnect || request_headers.query.relogin) && wtv_script_id != 0) send_tellyscripts = false; if ((request_headers.query.reconnect || request_headers.query.relogin) && wtv_script_id != 0) send_tellyscript = false;
if (send_tellyscripts) { if (send_tellyscript) {
if (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist) { if (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist) {
var send_telly_to_ssid = (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist.findIndex(element => element == socket.ssid) != -1) var send_telly_to_ssid = (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist.findIndex(element => element == socket.ssid) != -1)
if (send_telly_to_ssid) { if (send_telly_to_ssid) {
@@ -117,10 +117,15 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
if (request_headers.query.reconnect) { if (request_headers.query.reconnect) {
gourl = null; gourl = null;
} }
if (!file_path != null && !zquiet) console.log(" * Sending TellyScript", file_path, "on socket", socket.id); if (!file_path != null && !zquiet) console.log(" * Sending TellyScript", file_path, "on socket", socket.id);
if (request_headers.query.guest_login) {
send_tellyscript = false;
gourl += "&guest_login=true"
}
headers = "200 OK\n" headers = "200 OK\n"
if (bf0app_update) headers += "minisrv-use-carriage-return: false\n"; if (bf0app_update) headers += "minisrv-use-carriage-return: false\n";
headers += "Connection: Keep-Alive\n"; headers += "Connection: Keep-Alive\n";
@@ -137,7 +142,11 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
if (request_headers.query.reconnect && !ssid_sessions[socket.ssid].session_data.registered) headers += getServiceString('wtv-register') + "\n"; if (request_headers.query.reconnect && !ssid_sessions[socket.ssid].session_data.registered) headers += getServiceString('wtv-register') + "\n";
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 headers += "wtv-boot-url: wtv-1800:/preregister?relogin=true\n"; else {
headers += "wtv-boot-url: wtv-1800:/preregister?relogin=true";
if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\n";
}
if (gourl != null) headers += "wtv-visit: " + gourl + "\n"; if (gourl != null) headers += "wtv-visit: " + gourl + "\n";
if (!bf0app_update && ssid_sessions[socket.ssid].get("wtv-open-access")) headers += "wtv-open-isp-disabled: false\n"; if (!bf0app_update && ssid_sessions[socket.ssid].get("wtv-open-access")) headers += "wtv-open-isp-disabled: false\n";
headers += "wtv-client-time-zone: GMT -0000\n"; headers += "wtv-client-time-zone: GMT -0000\n";

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

@@ -24,7 +24,7 @@ if (socket.ssid !== null) {
if (challenge_response.toString(CryptoJS.enc.Base64) == client_challenge_response) { if (challenge_response.toString(CryptoJS.enc.Base64) == client_challenge_response) {
console.log(" * wtv-challenge-response success for " + filterSSID(socket.ssid)); console.log(" * wtv-challenge-response success for " + filterSSID(socket.ssid));
wtvsec_login.PrepareTicket(); wtvsec_login.PrepareTicket();
if (!ssid_sessions[socket.ssid].getSessionData("registered")) gourl = "wtv-register:/splash"; if (!ssid_sessions[socket.ssid].getSessionData("registered") && !request_headers.query.guest_login) gourl = "wtv-register:/splash";
} else { } else {
console.log(" * wtv-challenge-response FAILED for " + filterSSID(socket.ssid)); console.log(" * wtv-challenge-response FAILED for " + filterSSID(socket.ssid));
@@ -44,7 +44,7 @@ if (gourl) {
Connection: Close Connection: Close
wtv-open-isp-disabled: false wtv-open-isp-disabled: false
`; `;
if (!ssid_sessions[socket.ssid].session_data.registered && !request_headers.query.guest_mode) { if (!ssid_sessions[socket.ssid].getSessionData("registered") && !request_headers.query.guest_login) {
headers += `wtv-encrypted: true headers += `wtv-encrypted: true
wtv-ticket: ${wtvsec_login.ticket_b64} wtv-ticket: ${wtvsec_login.ticket_b64}
${getServiceString('wtv-register')} ${getServiceString('wtv-register')}
@@ -58,7 +58,7 @@ Content-type: text/html`;
data = ''; data = '';
} }
else { else {
if (request_headers.query.guest_mode) { if (request_headers.query.guest_login) {
var namerand = Math.floor(Math.random() * 100000); var namerand = Math.floor(Math.random() * 100000);
var nickname = (minisrv_config.config.service_name + '_' + namerand) var nickname = (minisrv_config.config.service_name + '_' + namerand)
var human_name = nickname; var human_name = nickname;
@@ -99,7 +99,7 @@ wtv-messenger-authorized: ${messenger_authorized}
wtv-messenger-enable: ${messenger_enabled} wtv-messenger-enable: ${messenger_enabled}
wtv-noback-all: wtv- wtv-noback-all: wtv-
wtv-service: reset wtv-service: reset
`+ getServiceString('all', { "exceptions": ["wtv-register"] } ) + ` `+ getServiceString('all', { "exceptions": ["wtv-register"] }) + `
user-id: ${userid} user-id: ${userid}
wtv-human-name: ${human_name} wtv-human-name: ${human_name}
${ssid_sessions[socket.ssid].setIRCNick(nickname)} ${ssid_sessions[socket.ssid].setIRCNick(nickname)}
@@ -115,11 +115,16 @@ wtv-inactive-timeout: 0
wtv-connection-timeout: 90 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`
wtv-boot-url: wtv-1800:/preregister?relogin=true headers += "\nwtv-relogin-url: wtv-1800:/preregister?relogin=true";
wtv-allow-dsc: true if (request_headers.query.guest_login) headers += "&guest_login=true";
wtv-home-url: wtv-home:/home? headers += "\nwtv-reconnect-url: wtv-1800:/preregister?reconnect=true";
` if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\nwtv-boot-url: wtv-1800:/preregister?relogin=true";
if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\nwtv-allow-dsc: true";
headers += "\nwtv-home-url: wtv-home:/home?";
if (ssid_sessions[socket.ssid].get('wtv-need-upgrade') != 'true' && !request_headers.query.reconnect) { if (ssid_sessions[socket.ssid].get('wtv-need-upgrade') != 'true' && !request_headers.query.reconnect) {
headers += "\nwtv-settings-url: wtv-setup:/get"; headers += "\nwtv-settings-url: wtv-setup:/get";
} }

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

@@ -2,7 +2,13 @@ var challenge_response, challenge_header = "";
var gourl = "wtv-head-waiter:/login-stage-two?"; var gourl = "wtv-head-waiter:/login-stage-two?";
if (request_headers.query.relogin) gourl += "relogin=true"; if (request_headers.query.relogin) gourl += "relogin=true";
if (request_headers.query.reconnect) gourl += "reconnect=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";
}
var send_to_relogin = true; var send_to_relogin = true;
if (socket.ssid) { if (socket.ssid) {

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

@@ -10,4 +10,4 @@ ${getServiceString('wtv-star')}
wtv-relogin-url: wtv-1800:/preregister?relogin=true wtv-relogin-url: wtv-1800:/preregister?relogin=true
wtv-reconnect-url: wtv-1800:/preregister?reconnect=true wtv-reconnect-url: wtv-1800:/preregister?reconnect=true
wtv-boot-url: wtv-1800:/preregister?relogin=true wtv-boot-url: wtv-1800:/preregister?relogin=true
Location: client:relogin`; Location: wtv-1800:/preregister?relogin=true`;

14
zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateWelcome.js
View File

@@ -1,12 +1,16 @@
if (request_headers.query.noreg) { if (request_headers.query.noreg) {
headers = `302 Moved headers = `300 Moved
Connection: Close Connection: Close
wtv-noback-all: wtv-register: wtv-noback-all: wtv-register:
wtv-expire-all: wtv- wtv-expire-all: wtv-
wtv-open-isp-disabled: false wtv-ticket: ${ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64}
wtv-visit: wtv-head-waiter:/login-stage-two?guest_mode=true wtv-service: reset
Location: wtv-head-waiter:/login-stage-two?guest_mode=true ${getServiceString('wtv-1800')}
Content-type: text/html`; wtv-relogin-url: wtv-1800:/preregister?guest_login=true
wtv-reconnect-url: wtv-1800:/preregister?guest_login=true&reconnect=true
wtv-boot-url: wtv-1800:/preregister?guest_login=true
Location: client:relogin`;
} else if (!request_headers.query.registering) { } else if (!request_headers.query.registering) {
var errpage = doErrorPage(400); var errpage = doErrorPage(400);
headers = errpage[0]; headers = errpage[0];

1
zefie_wtvp_minisrv/WTVRegister.js
View File

@@ -29,6 +29,7 @@ class WTVRegister {
checkUsernameAvailable(username, ssid_sessions) { checkUsernameAvailable(username, ssid_sessions) {
var username_match = false; var username_match = false;
this.fs.readdirSync(this.session_store_dir).forEach(file => { this.fs.readdirSync(this.session_store_dir).forEach(file => {
if (!file.match(/.*\.json/ig)) return;
if (username_match) return; if (username_match) return;
try { try {
var temp_session_data_file = this.fs.readFileSync(this.session_store_dir + this.path.sep + file, 'Utf8'); var temp_session_data_file = this.fs.readFileSync(this.session_store_dir + this.path.sep + file, 'Utf8');