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

more optimizations, remove WTVIRC for now, upgrade test.js

Browse Source
This commit is contained in:
zefie
2025-08-13 21:42:22 -04:00
parent 54bb975f1a
commit 22c7229e38
162 changed files with 1002 additions and 5539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ let challenge_response, gourl, wtvsec_login;
const hasPendingTransfer = session_data.hasPendingTransfer()
if (hasPendingTransfer) {
if (hasPendingTransfer.type == "target") {
if (hasPendingTransfer.type === "target") {
const xferSession = new WTVClientSessionData(minisrv_config, hasPendingTransfer.ssid);
xferSession.user_id = 0
const primary_username = xferSession.listPrimaryAccountUsers()['subscriber']['subscriber_username'];
@@ -21,7 +21,7 @@ if (hasPendingTransfer) {
const errpage = wtvshared.doRedirect(transferPendingDest);
headers = errpage[0];
data = errpage[1];
} else if (hasPendingTransfer.type == "source") {
} else if (hasPendingTransfer.type === "source") {
const transferPendingSrc = new clientShowAlert({
'image': minisrv_config.config.service_logo,
'message': "There is a pending transfer of this account to <b>" + hasPendingTransfer.ssid + "</b>. In order to use this box, you need to complete or cancel the transfer.",
@@ -58,11 +58,11 @@ wtv-visit: client:hangupphone`
}
let errpage;
if (socket.ssid !== null) {
if (wtvsec_login.ticket_b64 == null) {
if (wtvsec_login.ticket_b64 === null) {
challenge_response = wtvsec_login.challenge_response;
client_challenge_response = request_headers["wtv-challenge-response"] || null;
if (challenge_response && client_challenge_response) {
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 " + wtvshared.filterSSID(socket.ssid));
wtvsec_login.PrepareTicket();
gourl = "wtv-head-waiter:/login-stage-two?";
@@ -84,8 +84,8 @@ wtv-visit: client:hangupphone`
}
}
if (!errpage) {
if (user_id != null && !request_headers.query.initial_login && !request_headers.query.user_login && !request_headers.query.relogin && !request_headers.query.reconnect) {
if (request_headers.query.password == "") {
if (user_id !== null && !request_headers.query.initial_login && !request_headers.query.user_login && !request_headers.query.relogin && !request_headers.query.reconnect) {
if (request_headers.query.password === "") {
headers = `403 Please enter your password and try again
minisrv-no-mail-count: true`;
} else if (session_data.validateUserPassword(request_headers.query.password)) {

4
zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/choose-user.js
View File

@@ -82,10 +82,10 @@ let accounts_listed = 0;
for (const [key, value] of Object.entries(accounts)) {
let user_id;
data += "<td absheight=37><td valign=middle abswidth=50% maxlines=1>";
if (key == "subscriber") user_id = 0;
if (key === "subscriber") user_id = 0;
else user_id = key.replace("user", '');
data += `<a href=/ValidateLogin?user_id=${user_id}&user_login=true nocancel>`;
if (key == "subscriber") data += `<font size=+1><b>${value['subscriber_username']}</b></font></a>`;
if (key === "subscriber") data += `<font size=+1><b>${value['subscriber_username']}</b></font></a>`;
else data += `<font size=+1>${value['subscriber_username']}</font>`
data += "<td width=15><td nowrap> <font color=42BD52>";
const userSession = new WTVClientSessionData(minisrv_config, socket.ssid);

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

@@ -7,7 +7,7 @@ if (socket.ssid && session_data) {
socket_sessions[socket.id].wtvsec.ticket_b64 = request_headers["wtv-ticket"];
//socket_sessions[socket.id].secure == true;
}
} else if (socket_sessions[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
}
}

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

@@ -54,7 +54,7 @@ else {
if (session_data.getSessionData("subscriber_smtp_password") === null) {
session_data.setUserSMTPPassword(wtvshared.generatePassword(16));
}
if (session_data.user_id == 0) {
if (session_data.user_id === 0) {
const accounts = session_data.listPrimaryAccountUsers();
let offline_user_list_str = "<user-list>\n";
let i = 0;
@@ -167,7 +167,7 @@ wtv-inactive-timeout: 1440
headers += "wtv-home-url: " + home_url + "\n";
}
if (session_data.get('wtv-need-upgrade') != 'true' && !request_headers.query.reconnect && !limitedLogin && !limitedLoginRegistered)
if (session_data.get('wtv-need-upgrade') !== 'true' && !request_headers.query.reconnect && !limitedLogin && !limitedLoginRegistered)
headers += "wtv-settings-url: wtv-setup:/get\n";
if (!limitedLogin && !limitedLoginRegistered) {

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

@@ -14,7 +14,7 @@ let send_to_relogin = true;
if (session_data) {
if (request_headers["wtv-ticket"]) {
if (session_data.data_store.wtvsec_login.ticket_b64 == null) {
if (session_data.data_store.wtvsec_login.ticket_b64 === null) {
if (request_headers["wtv-ticket"].length > 8) {
session_data.data_store.wtvsec_login.DecodeTicket(request_headers["wtv-ticket"]);
session_data.data_store.wtvsec_login.ticket_b64 = request_headers["wtv-ticket"];
@@ -25,7 +25,7 @@ if (session_data) {
if (session_data.data_store.wtvsec_login) {
const client_challenge_response = request_headers["wtv-challenge-response"] || null;
if (challenge_response && client_challenge_response) {
if (challenge_response.toString(CryptoJS.enc.Base64).slice(0, 85) == client_challenge_response.slice(0, 85)) {
if (challenge_response.toString(CryptoJS.enc.Base64).slice(0, 85) === client_challenge_response.slice(0, 85)) {
console.log(" * wtv-challenge-response success for " + socket.ssid);
session_data.data_store.wtvsec_login.PrepareTicket();
send_to_relogin = false;
@@ -50,7 +50,7 @@ Expires: Wed, 09 Oct 1991 22:00:00 GMT
wtv-expire-all: wtv-head-waiter:
`+ getServiceString('wtv-log') + `
wtv-log-url: wtv-log:/log`;
if (challenge_header != "") headers += "\n" + challenge_header;
if (challenge_header !== "") headers += "\n" + challenge_header;
headers += `
wtv-country: US
wtv-language-header: en-US,en