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

various fixes to previous commit

Browse Source
This commit is contained in:
zefie
2022-02-08 02:09:52 -05:00
parent 0d991d5eac
commit c31f4cfa8c
8 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zefie_wtvp_minisrv/ServiceVault/wtv-setup/accounts.js
View File

@@ -67,7 +67,8 @@ Subscriber:
<P>`; <P>`;
var accounts = ssid_sessions[socket.ssid].listPrimaryAccountUsers(); var accounts = ssid_sessions[socket.ssid].listPrimaryAccountUsers();
if (Object.keys(accounts).length > 1) data += "Additional users:</B></FONT>"; var num_accounts = ssid_sessions[socket.ssid].getNumberOfUserAccounts();
if (num_accounts > 1) data += "Additional users:</B></FONT>";
data += "<TD WIDTH=20><TD WIDTH=198 VALIGN=top ALIGN=left>"; data += "<TD WIDTH=20><TD WIDTH=198 VALIGN=top ALIGN=left>";
@@ -77,18 +78,18 @@ Subscriber:
</B></FONT> </B></FONT>
<P>`; <P>`;
if (Object.keys(accounts).length > 1) { if (num_accounts > 1) {
delete accounts.subscriber; delete accounts.subscriber;
for (const [key, value] of Object.entries(accounts)) { for (const [key, value] of Object.entries(accounts)) {
data += `<FONT COLOR="189CD6"><B> data += `<FONT COLOR="189CD6"><B>
<A HREF="wtv-setup:/edit-user-begin?user_id=${key.replace("user", '')}">${value.subscriber_username}</A> <A HREF="wtv-setup:/edit-user-begin?user_id=${key.replace("user", '')}">${value.subscriber_username}</A>
</B></FONT><BR>
`; `;
}; };
} }
data += ` data += `
</B></FONT>
<BR>
<TR> <TR>
<TD> <TD>
<TD COLSPAN=4 HEIGHT=4 VALIGN=top ALIGN=left> <TD COLSPAN=4 HEIGHT=4 VALIGN=top ALIGN=left>
@@ -111,11 +112,11 @@ Subscriber:
<TD COLSPAN=3 VALIGN=top ALIGN=right> <TD COLSPAN=3 VALIGN=top ALIGN=right>
<FONT COLOR="#E7CE4A" SIZE=-1><SHADOW> <FONT COLOR="#E7CE4A" SIZE=-1><SHADOW>
<INPUT action="/remove-users?user-count=x" <INPUT action="/remove-users?user-count=x"
name="RemoveUser" value="Remove User" WIDTH=140 ${(Object.keys(accounts).length <= 1) ? 'USESTYLE' : 'disabled="disabled" text=gray' } name="RemoveUser" value="Remove User" WIDTH=140 ${(num_accounts >= 1) ? 'USESTYLE' : 'disabled="disabled" text=gray' }
TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" NAME="Button1" WIDTH=103> TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" NAME="Button1" WIDTH=103>
<IMG SRC="wtv-home:/ROMCache/Spacer.gif" WIDTH=4 HEIGHT=1> <IMG SRC="wtv-home:/ROMCache/Spacer.gif" WIDTH=4 HEIGHT=1>
<INPUT action="/add-user?user_count=${Object.keys(accounts).length}" <INPUT action="/add-user?user_count=${num_accounts}"
name="AddUser" value="Add User" WIDTH=120 ${(Object.keys(accounts).length >= minisrv_config.config.user_accounts.max_users_per_account) ? 'disabled="disabled" text=gray' : 'USESTYLE'} name="AddUser" value="Add User" WIDTH=120 ${(num_accounts >= minisrv_config.config.user_accounts.max_users_per_account) ? 'disabled="disabled" text=gray' : 'USESTYLE'}
TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" NAME="Button2" WIDTH=103> TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" NAME="Button2" WIDTH=103>
<IMG SRC="wtv-home:/ROMCache/Spacer.gif" WIDTH=4 HEIGHT=1> <IMG SRC="wtv-home:/ROMCache/Spacer.gif" WIDTH=4 HEIGHT=1>
<INPUT action="client:goback" <INPUT action="client:goback"

4
zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-name.js
View File

@@ -2,8 +2,8 @@ var minisrv_service_file = true;
if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account."); if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + " account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}."); else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
else if (!request_headers.query.user_name) errpage = wtvshared.doErrorPage(400, "Please enter a username.");
if (errpage) { if (errpage) {
headers = errpage[0]; headers = errpage[0];

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-password.js
View File

@@ -10,7 +10,7 @@ else if (request_headers.query.user_name.length < minisrv_config.config.user_acc
else if (request_headers.query.user_name.length > minisrv_config.config.user_accounts.max_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.max_length + " or less characters."); else if (request_headers.query.user_name.length > minisrv_config.config.user_accounts.max_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with " + minisrv_config.config.user_accounts.max_length + " or less characters.");
else if (!wtvr.checkUsernameSanity(request_headers.query.user_name)) errpage = wtvshared.doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only <b>letters</b>, <b>numbers</b>, <b>_</b> or <b>-</b>. Also, please be sure your username begins with a letter."); else if (!wtvr.checkUsernameSanity(request_headers.query.user_name)) errpage = wtvshared.doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only <b>letters</b>, <b>numbers</b>, <b>_</b> or <b>-</b>. Also, please be sure your username begins with a letter.");
else if (!wtvr.checkUsernameAvailable(request_headers.query.user_name, ssid_sessions)) errpage = wtvshared.doErrorPage(400, "The username you have selected is already in use. Please select another username."); else if (!wtvr.checkUsernameAvailable(request_headers.query.user_name, ssid_sessions)) errpage = wtvshared.doErrorPage(400, "The username you have selected is already in use. Please select another username.");
else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + " account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}."); else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user.js
View File

@@ -1,7 +1,7 @@
var minisrv_service_file = true; var minisrv_service_file = true;
if (Object.keys(ssid_sessions[socket.ssid].listPrimaryAccountUsers()).length >= minisrv_config.config.user_accounts.max_users_per_account) { if (Object.keys(ssid_sessions[socket.ssid].listPrimaryAccountUsers()).length >= minisrv_config.config.user_accounts.max_users_per_account) {
errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + " account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}."); errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
} }
else if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account."); else if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");

9
zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user-done.js
View File

@@ -17,15 +17,15 @@ if (!errpage) {
} }
if (!errpage) { if (!errpage) {
if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + " account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}."); if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
else if (!request_headers.query.user_name) errpage = wtvshared.doErrorPage(400, "Please enter a username."); else if (!request_headers.query.user_name) errpage = wtvshared.doErrorPage(400, "Please enter a username.");
else if (!request_headers.query.display_name) request_headers.query.display_name = request_headers.query.username;
} }
if (errpage) { if (errpage) {
headers = errpage[0]; headers = errpage[0];
data = errpage[1]; data = errpage[1];
} else { } else {
if (!request_headers.query.display_name) request_headers.query.display_name = request_headers.query.username;
userSession = new WTVClientSessionData(minisrv_config, socket.ssid); userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
var freeUserId = ssid_sessions[socket.ssid].findFreeUserSlot(ssid_sessions[socket.ssid]); var freeUserId = ssid_sessions[socket.ssid].findFreeUserSlot(ssid_sessions[socket.ssid]);
if (freeUserId) { if (freeUserId) {
@@ -33,10 +33,10 @@ if (errpage) {
userSession.setSessionData("subscriber_name", request_headers.query.display_name); userSession.setSessionData("subscriber_name", request_headers.query.display_name);
userSession.setSessionData("subscriber_username", request_headers.query.user_name); userSession.setSessionData("subscriber_username", request_headers.query.user_name);
userSession.setSessionData("registered", true); userSession.setSessionData("registered", true);
mailstore_exists = userSession.mailstore.mailstoreExists(); var mailstore_exists = userSession.mailstore.mailstoreExists();
if (!mailstore_exists) mailstore_exists = userSession.mailstore.createMailstore(); if (!mailstore_exists) mailstore_exists = userSession.mailstore.createMailstore();
if (mailstore_exists) { if (mailstore_exists) {
if (!userSession.mailstore.mailboxExists(mailbox)) { if (!userSession.mailstore.mailboxExists(0)) {
// mailbox does not yet exist, create it // mailbox does not yet exist, create it
var mailbox_exists = userSession.mailstore.createMailbox(0); var mailbox_exists = userSession.mailstore.createMailbox(0);
if (mailbox_exists) { if (mailbox_exists) {
@@ -55,6 +55,7 @@ if (errpage) {
headers = `300 OK headers = `300 OK
Content-type: text/html Content-type: text/html
wtv-expire: wtv-setup:/accounts
Location: wtv-setup:/accounts`; Location: wtv-setup:/accounts`;
} }
} }

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/validate-add-user.js
View File

@@ -16,7 +16,7 @@ if (!errpage) {
} }
if (!errpage) { if (!errpage) {
if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + " account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}."); if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
else if (!request_headers.query.user_name) errpage = wtvshared.doErrorPage(400, "Please enter a username."); else if (!request_headers.query.user_name) errpage = wtvshared.doErrorPage(400, "Please enter a username.");
} }

16
zefie_wtvp_minisrv/app.js
View File

@@ -1529,14 +1529,14 @@ if (minisrv_config.config.error_log_file) {
process.stderr.write = writeError process.stderr.write = writeError
} }
if (minisrv_config.config.passwords) { // sanity
if (minisrv_config.config.passwords.enabled) { if (minisrv_config.config.user_accounts.max_users_per_account < 1) {
if (!minisrv_config.config.passwords.encryption_key) { console.log(" * WARNING: user_accounts.max_users_per_account should be at least 1, we have set it to 1.");
console.log(" * WARNING: passwords.encryption_key not defined, using default. Consider setting a unique key before setting passwords."); minisrv_config.config.user_accounts.max_users_per_account = 1;
console.log(" * WARNING: Changing the encryption key after users have set passwords will invalidate and lock out all users who have set passwords, without your manual intervention."); }
minisrv_config.config.passwords.encryption_key = minisrv_config.config.passwords.default_encryption_key; if (minisrv_config.config.user_accounts.max_users_per_account > 99) {
} console.log(" * WARNING: user_accounts.max_users_per_account should be less than 99, we have set it to 99.");
} minisrv_config.config.user_accounts.max_users_per_account = 99;
} }
process.on('uncaughtException', function (err) { process.on('uncaughtException', function (err) {

3
zefie_wtvp_minisrv/config.json
View File

@@ -37,8 +37,7 @@
"enabled": true, "enabled": true,
"min_length": 5, "min_length": 5,
"max_length": 32, "max_length": 32,
"form_size": 16, "form_size": 16
"default_encryption_key": "S4WZvVfoQ77fovegdO7olln0P0ZNAMWe"
} }
}, },
"services": { "services": {