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

v0.8.1

Browse Source 
- fix: reported verbosity levels
 - fix: In some cases SSID was not filtered
 - fix: could not read service folders/files that had urlescape'd characters in them
 - update: change config variable name, allow user override (user_config.json)
 - update user-config example
 - Clean up session info into a class
This commit is contained in:
zefie
2021-07-18 08:11:07 -04:00
parent 23d014a334
commit 857e3639cc
19 changed files with 290 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/finalize-security.js
View File

@@ -1,14 +1,14 @@
var challenge_response, challenge_header = '';
var gourl;
if (socket_session_data[socket.id].ssid !== null) {
if (socket.ssid !== null) {
if (request_headers["wtv-ticket"]) {
if (request_headers["wtv-ticket"].length > 8) {
DecodeTicket(request_headers["wtv-ticket"]);
socket_session_data[socket.id].wtvsec.ticket_b64 = request_headers["wtv-ticket"];
//socket_session_data[socket.id].secure == true;
socket_sessions[socket.id].wtvsec.ticket_b64 = request_headers["wtv-ticket"];
//socket_sessions[socket.id].secure == true;
}
} else if (socket_session_data[socket.id].wtvsec.ticket_b64 == null) {
} else if (socket_sessions[socket.id].wtvsec.ticket_b64 == null) {
// TODO: client should have a ticket and send it back by now, if not we should handle this correctly
}
}
@@ -16,7 +16,7 @@ if (socket_session_data[socket.id].ssid !== null) {
headers = `200 OK
Connection: Keep-Alive
wtv-encrypted: true
wtv-ticket: `+socket_session_data[socket.id].wtvsec.ticket_b64+`
wtv-ticket: `+socket_sessions[socket.id].wtvsec.ticket_b64+`
wtv-expire-all: htv-
wtv-home-url: wtv-home:/home?
wtv-visit: wtv-home:/splash?

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

@@ -1,22 +1,22 @@
var challenge_response, challenge_header = '';
var gourl;
if (socket_session_data[socket.id].ssid != null && !getSessionData(socket_session_data[socket.id].ssid, 'wtvsec_login')) {
if (socket.ssid != null && !ssid_sessions[socket.ssid].get("wtvsec_login")) {
var wtvsec_login = new WTVSec(1,zdebug);
wtvsec_login.IssueChallenge();
wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]);
setSessionData(socket_session_data[socket.id].ssid, 'wtvsec_login', wtvsec_login)
ssid_sessions[socket.ssid].set("wtvsec_login", wtvsec_login);
} else {
var wtvsec_login = getSessionData(socket_session_data[socket.id].ssid, 'wtvsec_login')
var wtvsec_login = ssid_sessions[socket.ssid].get("wtvsec_login");
}
if (socket_session_data[socket.id].ssid !== null) {
if (socket.ssid !== null) {
if (wtvsec_login.ticket_b64 == null) {
if (request_headers["wtv-ticket"]) {
if (request_headers["wtv-ticket"].length > 8) {
wtvsec_login.DecodeTicket(request_headers["wtv-ticket"]);
wtvsec_login.ticket_b64 = request_headers["wtv-ticket"];
//socket_session_data[socket.id].secure = true;
//socket_sessions[socket.id].secure = true;
}
} else {
challenge_response = wtvsec_login.challenge_response;
@@ -24,11 +24,11 @@ if (socket_session_data[socket.id].ssid !== null) {
if (challenge_response && client_challenge_response) {
//if (challenge_response.toString(CryptoJS.enc.Base64).substring(0,85) == client_challenge_response.substring(0,85)) {
if (challenge_response.toString(CryptoJS.enc.Base64) == client_challenge_response) {
console.log(" * wtv-challenge-response success for " + processSSID(socket_session_data[socket.id].ssid));
console.log(" * wtv-challenge-response success for " + processSSID(socket.ssid));
wtvsec_login.PrepareTicket();
//socket_session_data[socket.id].secure = true;
//socket_sessions[socket.id].secure = true;
} else {
console.log(" * wtv-challenge-response FAILED for " + processSSID(socket_session_data[socket.id].ssid));
console.log(" * wtv-challenge-response FAILED for " + processSSID(socket.ssid));
if (zdebug) console.log("Response Expected:", challenge_response.toString(CryptoJS.enc.Base64));
if (zdebug) console.log("Response Received:", client_challenge_response)
gourl = "wtv-head-waiter:/login?reissue_challenge=true";

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

@@ -1,7 +1,7 @@
var challenge_response, challenge_header = '';
if (socket_session_data[socket.id].ssid !== null) {
var wtvsec_login = getSessionData(socket_session_data[socket.id].ssid, 'wtvsec_login');
if (socket.ssid !== null) {
var wtvsec_login = ssid_sessions[socket.ssid].get("wtvsec_login");
if (request_headers["wtv-ticket"]) {
if (wtvsec_login.ticket_b64 == null) {
if (request_headers["wtv-ticket"].length > 8) {
@@ -15,7 +15,7 @@ if (socket_session_data[socket.id].ssid !== null) {
var client_challenge_response = request_headers["wtv-challenge-response"] || null;
if (challenge_response && client_challenge_response) {
if (challenge_response.toString(CryptoJS.enc.Base64).substring(0, 85) == client_challenge_response.substring(0, 85)) {
console.log(" * wtv-challenge-response success for " + socket_session_data[socket.id].ssid);
console.log(" * wtv-challenge-response success for " + socket.ssid);
wtvsec_login.PrepareTicket();
} else {
challenge_header = "wtv-challenge: " + wtvsec_login.IssueChallenge();