remove guest mode

This commit is contained in:
zefie
2025-08-12 01:05:10 -04:00
parent b29dd70f52
commit ad95d5f088
16 changed files with 467 additions and 568 deletions

View File

@@ -51,10 +51,6 @@ if (request_headers.query.reconnect && session_data.getSessionData("registered")
if (session_data.data_store.wtvsec_login) { if (session_data.data_store.wtvsec_login) {
var prereg_contype = "text/html"; var prereg_contype = "text/html";
if (request_headers.query.relogin || request_headers.query.guest_login) { // relogin
session_data.data_store.wtvsec_login.ticket_b64 = null; // clear old ticket
}
// if relogin and wtv-script-id != 0, skip tellyscript // if relogin and wtv-script-id != 0, skip tellyscript
session_data.set("wtv-open-access", (request_headers['wtv-open-access'] === "true") ? true : false); session_data.set("wtv-open-access", (request_headers['wtv-open-access'] === "true") ? true : false);
var file_path = null; var file_path = null;
@@ -63,7 +59,7 @@ if (session_data.data_store.wtvsec_login) {
var bf0app_update = false; var bf0app_update = false;
var romtype = session_data.get("wtv-client-rom-type"); var romtype = session_data.get("wtv-client-rom-type");
var bootrom = parseInt(session_data.get("wtv-client-bootrom-version")); var bootrom = parseInt(session_data.get("wtv-client-bootrom-version"));
var send_tellyscript = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin && !request_headers.query.guest_login && !bootrom !== 0); var send_tellyscript = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin && !bootrom !== 0);
var wtv_script_id = parseInt(session_data.get("wtv-script-id")); var wtv_script_id = parseInt(session_data.get("wtv-script-id"));
var wtv_script_mod = parseInt(session_data.get("wtv-script-mod")); var wtv_script_mod = parseInt(session_data.get("wtv-script-mod"));
if ((request_headers.query.reconnect || request_headers.query.relogin) && wtv_script_id != 0) send_tellyscript = false; if ((request_headers.query.reconnect || request_headers.query.relogin) && wtv_script_id != 0) send_tellyscript = false;
@@ -165,12 +161,6 @@ if (session_data.data_store.wtvsec_login) {
if (request_headers.query.reconnect) gourl = null; if (request_headers.query.reconnect) gourl = null;
if (request_headers.query.guest_login) {
send_tellyscript = false;
if (gourl != null) gourl += "&guest_login=true"
if (request_headers.query.skip_splash) gourl += "&skip_splash=true";
}
if (file_path != null && send_tellyscript && !minisrv_config.config.debug_flags.quiet) console.log(" * Sending TellyScript", file_path, "on socket", socket.id); if (file_path != null && send_tellyscript && !minisrv_config.config.debug_flags.quiet) console.log(" * Sending TellyScript", file_path, "on socket", socket.id);
if (template != null && send_tellyscript && !minisrv_config.config.debug_flags.quiet) console.log(" * Generating TellyScript on socket", socket.id); if (template != null && send_tellyscript && !minisrv_config.config.debug_flags.quiet) console.log(" * Generating TellyScript on socket", socket.id);
@@ -193,7 +183,6 @@ if (session_data.data_store.wtvsec_login) {
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-head-waiter:/login?relogin=true"; headers += "wtv-boot-url: wtv-head-waiter:/login?relogin=true";
if (request_headers.query.guest_login) headers += "&guest_login=true";
headers += "\n"; headers += "\n";
} }
if (gourl != null) headers += "wtv-visit: " + gourl + "\n"; if (gourl != null) headers += "wtv-visit: " + gourl + "\n";

View File

@@ -137,9 +137,6 @@ contact the server operator (eg. email, Discord, Twitter, etc...)
<font size=-1><b>verbosity</b><br>Console log debug level. <font size=-1><b>verbosity</b><br>Console log debug level.
<tr><td absheight=60 valign=top> <tr><td absheight=60 valign=top>
<font size=-1><b>show_diskmap</b><br>Useful for debugging wtv-disk downloads. <font size=-1><b>show_diskmap</b><br>Useful for debugging wtv-disk downloads.
<tr><td absheight=140 valign=top>
<font size=-1><b>allow_guests</b><br>Allows users to use the service without having to register.
Guest session data is destroyed upon logout, and some features are not available to guests.
<tr><td absheight=90 valign=top> <tr><td absheight=90 valign=top>
<font size=-1><b>enable_<br>lzpf_compression</b><br>Toggles whether LZPF compression will be considered or not <font size=-1><b>enable_<br>lzpf_compression</b><br>Toggles whether LZPF compression will be considered or not
<tr><td absheight=90 valign=top> <tr><td absheight=90 valign=top>
@@ -211,9 +208,6 @@ ${generateFormField('select', 'verbosity', [
<td absheight=60 valign=top> <td absheight=60 valign=top>
${generateFormField('checkbox', 'show_diskmap')} ${generateFormField('checkbox', 'show_diskmap')}
<tr> <tr>
<td absheight=140 valign=top>
${generateFormField('checkbox', 'allow_guests')}
<tr>
<td absheight=85 valign=top> <td absheight=85 valign=top>
${generateFormField('checkbox', 'enable_lzpf_compression')} ${generateFormField('checkbox', 'enable_lzpf_compression')}
<tr> <tr>

View File

@@ -82,12 +82,6 @@ wtv-visit: client:hangupphone`
} }
} }
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";
}
if (user_id != null && !request_headers.query.initial_login && !request_headers.query.user_login && !request_headers.query.relogin && !request_headers.query.reconnect) { 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 (request_headers.query.password == "") {
headers = `403 Please enter your password and try again headers = `403 Please enter your password and try again

View File

@@ -3,14 +3,14 @@ var gourl = null;
var bootrom = parseInt(session_data.get("wtv-client-bootrom-version")); var bootrom = parseInt(session_data.get("wtv-client-bootrom-version"));
if (!session_data.isRegistered() && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) gourl = "wtv-register:/splash?"; if (!session_data.isRegistered()) gourl = "wtv-register:/splash?";
var home_url = "wtv-home:/home?"; var home_url = "wtv-home:/home?";
if (gourl) { if (gourl) {
headers = "200 OK\n"; headers = "200 OK\n";
if (bootrom !== 0) headers += "wtv-open-isp-disabled: false\n"; if (bootrom !== 0) headers += "wtv-open-isp-disabled: false\n";
if (!session_data.isRegistered() && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) { if (!session_data.isRegistered()) {
// fake logged in for reg // fake logged in for reg
session_data.setUserLoggedIn(true); session_data.setUserLoggedIn(true);
headers += `wtv-encrypted: ${(request_headers['wtv-encrypted']) ? wtvshared.parseBool(request_headers['wtv-encrypted']) : true} headers += `wtv-encrypted: ${(request_headers['wtv-encrypted']) ? wtvshared.parseBool(request_headers['wtv-encrypted']) : true}
@@ -27,17 +27,6 @@ Content-type: text/html`;
else { else {
if (session_data.lockdown) { if (session_data.lockdown) {
home_url = minisrv_config.config.unauthorized_url; home_url = minisrv_config.config.unauthorized_url;
}
else if (request_headers.query.guest_login && minisrv_config.config.allow_guests) {
var namerand = Math.floor(Math.random() * 100000);
var nickname = (minisrv_config.config.service_name + '_' + namerand)
var human_name = nickname;
var userid = '1' + Math.floor(Math.random() * 1000000000000000000);
var messenger_enabled = 0;
var messenger_authorized = 0;
var timezone = "-0000";
if (request_headers.query.skip_splash) gourl = "wtv-home:/home?";
else gourl = "wtv-home:/splash?";
} else if (!session_data.getSessionData("registered")) { } else if (!session_data.getSessionData("registered")) {
var errpage = wtvshared.doErrorPage(400); var errpage = wtvshared.doErrorPage(400);
headers = errpage[0]; headers = errpage[0];
@@ -174,13 +163,8 @@ wtv-inactive-timeout: 1440
if (!limitedLogin && !limitedLoginRegistered) { if (!limitedLogin && !limitedLoginRegistered) {
headers += "wtv-relogin-url: wtv-head-waiter:/relogin?relogin=true\n"; headers += "wtv-relogin-url: wtv-head-waiter:/relogin?relogin=true\n";
if (request_headers.query.guest_login) headers += "&guest_login=true\n";
headers += "wtv-reconnect-url: wtv-head-waiter:/login-stage-two?reconnect=true\n"; headers += "wtv-reconnect-url: wtv-head-waiter:/login-stage-two?reconnect=true\n";
if (request_headers.query.guest_login) headers += "&guest_login=true\n";
headers += "wtv-boot-url: wtv-head-waiter:/relogin?relogin=true\n"; headers += "wtv-boot-url: wtv-head-waiter:/relogin?relogin=true\n";
if (request_headers.query.guest_login) headers += "&guest_login=true\n ";
headers += "wtv-home-url: " + home_url + "\n"; headers += "wtv-home-url: " + home_url + "\n";
} }

View File

@@ -9,11 +9,6 @@ else if (request_headers.query.reconnect) gourl += "reconnect=true";
else gourl += "initial_login=true" else gourl += "initial_login=true"
var bootrom = parseInt(session_data.get("wtv-client-bootrom-version")); var bootrom = parseInt(session_data.get("wtv-client-bootrom-version"));
if (request_headers.query.guest_login || bootrom === 0) {
if (gourl.substr(-1) != "?") gourl += "&";
gourl += "guest_login=true";
if (request_headers.query.skip_splash) gourl += "&skip_splash=true";
}
var send_to_relogin = true; var send_to_relogin = true;

View File

@@ -6,12 +6,6 @@ var gourl = "wtv-1800:/preregister?";
if (request_headers.query.relogin) gourl += "relogin=true"; if (request_headers.query.relogin) gourl += "relogin=true";
else 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";
if (request_headers.query.skip_splash) gourl += "&skip_splash=true";
}
headers = `200 OK headers = `200 OK
Connection: Keep-Alive Connection: Keep-Alive
Expires: Wed, 09 Oct 1991 22:00:00 GMT Expires: Wed, 09 Oct 1991 22:00:00 GMT

View File

@@ -1,91 +1,87 @@
var minisrv_service_file = true; var minisrv_service_file = true;
var mailstore_exists = false; var mailstore_exists = false;
if (!session_data.isRegistered()) {
var errpage = wtvshared.doErrorPage("400", "Mail service is not available for guest users."); function mail_end_error(msg) {
var errpage = wtvshared.doErrorPage("400", msg);
headers = errpage[0]; headers = errpage[0];
data = errpage[1]; data = errpage[1];
}
var intro_seen = session_data.mailstore.checkMailIntroSeen();
if (!intro_seen && !request_headers.query.intro_seen) {
// user is trying to bypass the intro screen
headers = "300 OK\nLocation: wtv-mail:/DiplomaMail";
} else { } else {
function mail_end_error(msg) { if (!intro_seen && request_headers.query.intro_seen) {
var errpage = wtvshared.doErrorPage("400", msg); // User has come from intro
headers = errpage[0]; session_data.mailstore.setMailIntroSeen(true);
data = errpage[1];
} }
// check if mailstore exista
mailstore_exists = session_data.mailstore.mailstoreExists();
var intro_seen = session_data.mailstore.checkMailIntroSeen(); // create mailstore if it doesnt exist
if (!intro_seen && !request_headers.query.intro_seen) { if (!mailstore_exists) mailstore_exists = session_data.mailstore.createMailstore();
// user is trying to bypass the intro screen
headers = "300 OK\nLocation: wtv-mail:/DiplomaMail";
} else {
if (!intro_seen && request_headers.query.intro_seen) {
// User has come from intro
session_data.mailstore.setMailIntroSeen(true);
}
// check if mailstore exists (returns null if guest)
mailstore_exists = session_data.mailstore.mailstoreExists();
// create mailstore if it doesnt exist (also returns null if guest) if (mailstore_exists) {
if (!mailstore_exists) mailstore_exists = session_data.mailstore.createMailstore(); // mailstore exists
if (mailstore_exists) { var default_limit = (minisrv_config.services[service_name].messages_per_page) ? minisrv_config.services[service_name].messages_per_page : 25; // user config or 25
// mailstore exists and user is not guest var mailbox = (request_headers.query.mailbox) ? parseInt(request_headers.query.mailbox) : 0;
var limit = (request_headers.query.limit) ? parseInt(request_headers.query.limit) : default_limit;
var reverse_sort = (request_headers.query.reverse_sort) ? true : false;
var page = (request_headers.query.page) ? parseInt(request_headers.query.page) : 0;
var default_limit = (minisrv_config.services[service_name].messages_per_page) ? minisrv_config.services[service_name].messages_per_page : 25; // user config or 25 // get mailbox name
var mailbox = (request_headers.query.mailbox) ? parseInt(request_headers.query.mailbox) : 0; var mailbox_name = session_data.mailstore.getMailboxById(parseInt(mailbox));
var limit = (request_headers.query.limit) ? parseInt(request_headers.query.limit) : default_limit;
var reverse_sort = (request_headers.query.reverse_sort) ? true : false;
var page = (request_headers.query.page) ? parseInt(request_headers.query.page) : 0;
// get mailbox name // if false or null, then mailbox is invalid
var mailbox_name = session_data.mailstore.getMailboxById(parseInt(mailbox)); if (!mailbox_name) {
mail_end_error("Invalid Mailbox ID");
// if false or null, then mailbox is invalid } else {
if (!mailbox_name) { // mailboxid is ok
mail_end_error("Invalid Mailbox ID"); if (!session_data.mailstore.mailboxExists(mailbox)) {
} else { // mailbox does not yet exist, create it
// mailboxid is ok var mailbox_exists = session_data.mailstore.createMailbox(mailbox);
if (!session_data.mailstore.mailboxExists(mailbox)) { if (!mailbox_exists) {
// mailbox does not yet exist, create it // failed to create mailbox for some reason
var mailbox_exists = session_data.mailstore.createMailbox(mailbox); mail_end_error();
if (!mailbox_exists) {
// failed to create mailbox for some reason
mail_end_error();
} else {
if (mailbox === 0) {
// Just created Inbox for the first time, so create the welcome message
session_data.mailstore.createWelcomeMessage();
}
}
}
var message_list = session_data.mailstore.listMessages(mailbox, limit, reverse_sort, (page * limit))
var total_message_count = session_data.mailstore.countMessages(mailbox);
var total_unread_message_count = session_data.mailstore.countUnreadMessages(mailbox);
var message_list_string = null;
if (total_message_count == 0) {
message_list_string = "No new mail messages for ";
} else { } else {
if (total_unread_message_count > 0) { if (mailbox === 0) {
message_list_string = total_unread_message_count + " new mail message" + ((total_message_count != 1) ? 's' : ''); // Just created Inbox for the first time, so create the welcome message
if (total_message_count - total_unread_message_count > 0) message_list_string += ", " + (total_message_count - total_unread_message_count) + " mail message" + (((total_message_count - total_unread_message_count) != 1) ? 's' : '') + " for "; session_data.mailstore.createWelcomeMessage();
} else {
message_list_string = total_message_count + " mail message" + ((total_message_count != 1) ? 's' : '') + " for ";
} }
} }
}
var message_list = session_data.mailstore.listMessages(mailbox, limit, reverse_sort, (page * limit))
var total_message_count = session_data.mailstore.countMessages(mailbox);
var total_unread_message_count = session_data.mailstore.countUnreadMessages(mailbox);
var username = session_data.getSessionData("subscriber_username"); var message_list_string = null;
var notImplementedAlert = new clientShowAlert({ if (total_message_count == 0) {
'image': minisrv_config.config.service_logo, message_list_string = "No new mail messages for ";
'message': "This feature is not available.", } else {
'buttonlabel1': "Okay", if (total_unread_message_count > 0) {
'buttonaction1': "client:donothing", message_list_string = total_unread_message_count + " new mail message" + ((total_message_count != 1) ? 's' : '');
'noback': true, if (total_message_count - total_unread_message_count > 0) message_list_string += ", " + (total_message_count - total_unread_message_count) + " mail message" + (((total_message_count - total_unread_message_count) != 1) ? 's' : '') + " for ";
}).getURL(); } else {
message_list_string = total_message_count + " mail message" + ((total_message_count != 1) ? 's' : '') + " for ";
}
}
headers = `200 OK var username = session_data.getSessionData("subscriber_username");
var notImplementedAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo,
'message': "This feature is not available.",
'buttonlabel1': "Okay",
'buttonaction1': "client:donothing",
'noback': true,
}).getURL();
headers = `200 OK
Content-type: text/html`; Content-type: text/html`;
data = `<sendpanel action="wtv-mail:/sendmail" data = `<sendpanel action="wtv-mail:/sendmail"
message="Write a new e-mail message" message="Write a new e-mail message"
label="Write"> label="Write">
<savepanel <savepanel
@@ -205,23 +201,23 @@ label="View saved e-mail messages">
<td height=80> <td height=80>
<img src="wtv-mail:/content/images/Mail.gif" width=87 height=45> <img src="wtv-mail:/content/images/Mail.gif" width=87 height=45>
`; `;
var icon_image = null; var icon_image = null;
switch (mailbox_name) { switch (mailbox_name) {
case "Inbox": case "Inbox":
icon_image = session_data.mailstore.getMailboxIcon(); icon_image = session_data.mailstore.getMailboxIcon();
break; break;
case "Sent": case "Sent":
icon_image = "MailboxSent.gif"; icon_image = "MailboxSent.gif";
break; break;
case "Trash": case "Trash":
icon_image = "MailboxDiscard.gif"; icon_image = "MailboxDiscard.gif";
break; break;
default: default:
icon_image = "MailboxStorage.gif"; icon_image = "MailboxStorage.gif";
break; break;
} }
data += ` data += `
<img src="wtv-mail:/content/images/${icon_image}" width=74 height=45 > <img src="wtv-mail:/content/images/${icon_image}" width=74 height=45 >
<td width=250 align=left><font sizerange=small> <td width=250 align=left><font sizerange=small>
</table> </table>
@@ -260,9 +256,9 @@ label="View saved e-mail messages">
<spacer type=horizontal size=13> <spacer type=horizontal size=13>
<td bgcolor=#171726 width="438" valign="top"> <td bgcolor=#171726 width="438" valign="top">
<spacer type=vertical size=13><br>`; <spacer type=vertical size=13><br>`;
if (message_list) { if (message_list) {
data += ` data += `
<font sizerange=medium> ${message_list_string} <font sizerange=medium> ${message_list_string}
<table cellspacing=0 cellpadding=0 border=0> <table cellspacing=0 cellpadding=0 border=0>
<TR><TD maxlines="1"> <TR><TD maxlines="1">
@@ -283,17 +279,17 @@ ${username}@${minisrv_config.config.service_name}
<spacer type=vertical size=1> <spacer type=vertical size=1>
<hr width=422 align=left> <hr width=422 align=left>
`; `;
Object.keys(message_list).forEach(function (k) { Object.keys(message_list).forEach(function (k) {
var message = message_list[k]; var message = message_list[k];
if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject); if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject);
message.known_sender = session_data.isAddressInAddressBook(message.from_addr); message.known_sender = session_data.isAddressInAddressBook(message.from_addr);
var message_font_open = "<font color=#7A9FCC>"; var message_font_open = "<font color=#7A9FCC>";
var message_font_close = "</font>"; var message_font_close = "</font>";
if (message.unread) { if (message.unread) {
message_font_open = `<b><font color=#99E6FF>`; message_font_open = `<b><font color=#99E6FF>`;
message_font_close = "</font></b>" message_font_close = "</font></b>"
} }
data += `<spacer type=vertical size=5> data += `<spacer type=vertical size=5>
<table cellspacing=0 cellpadding=0 border=0> <table cellspacing=0 cellpadding=0 border=0>
<tr> <tr>
<td href="readmail?message_id=${message.id}#next" id="id${message.id}" selected> <td href="readmail?message_id=${message.id}#next" id="id${message.id}" selected>
@@ -313,16 +309,16 @@ ${message_font_close}
<td abswidth=47 maxlines=1> <td abswidth=47 maxlines=1>
${message_font_open} ${message_font_open}
`; `;
var message_date = new Date(message.date * 1000); var message_date = new Date(message.date * 1000);
data += (message_date.getMonth() + 1) + "/" + message_date.getDate() + "\n"; data += (message_date.getMonth() + 1) + "/" + message_date.getDate() + "\n";
data += ` data += `
${message_font_close} ${message_font_close}
</table> </table>
<tr> <tr>
<td height=5>`; <td height=5>`;
}); });
} else { } else {
data += ` data += `
<font sizerange=medium> No ${(mailbox_name == "Inbox") ? `new e-mail messages for<table cellspacing=0 cellpadding=0 border=0> <font sizerange=medium> No ${(mailbox_name == "Inbox") ? `new e-mail messages for<table cellspacing=0 cellpadding=0 border=0>
<TR><TD maxlines="1"> <TR><TD maxlines="1">
${username}@${minisrv_config.config.service_name} ${username}@${minisrv_config.config.service_name}
@@ -330,18 +326,17 @@ ${username}@${minisrv_config.config.service_name}
</TABLE>` : 'e-mail messages in mailbox ' + mailbox_name} </TABLE>` : 'e-mail messages in mailbox ' + mailbox_name}
</font><br> </font><br>
`; `;
} }
data += ` data += `
<spacer type=vertical size=6> <spacer type=vertical size=6>
</table> </table>
</body> </body>
</HTML> </HTML>
`; `;
}
} else {
mail_end_error("Access Denied");
} }
} else {
mail_end_error("Access Denied");
} }
} }

View File

@@ -3,335 +3,330 @@ var minisrv_service_file = true;
var message_snapshot_data = null; var message_snapshot_data = null;
var message_voicemail_data = null; var message_voicemail_data = null;
if (!session_data.isRegistered()) { var intro_seen = session_data.mailstore.checkMailIntroSeen();
var errpage = wtvshared.doErrorPage("400", "Sending mail and posting to usenet is not available for guest users."); if (!intro_seen && !request_headers.query.intro_seen) {
headers = errpage[0]; // user is trying to bypass the intro screen
data = errpage[1]; headers = "300 OK\nLocation: wtv-mail:/DiplomaMail?came-from=" + encodeURIComponent(request_headers.request_url);
} else { } else if (request_headers.query.clear == "true") {
var intro_seen = session_data.mailstore.checkMailIntroSeen(); if (request_headers.Referer)
if (!intro_seen && !request_headers.query.intro_seen) { gourl = request_headers.Referer.replace(/[\?\&]clear\=true/, '');
// user is trying to bypass the intro screen else
headers = "300 OK\nLocation: wtv-mail:/DiplomaMail?came-from=" + encodeURIComponent(request_headers.request_url); gourl = "wtv-mail:/sendmail"
} else if (request_headers.query.clear == "true") { if (request_headers.query.saveoff) delete request_headers.query.saveoff;
if (request_headers.Referer) session_data.deleteSessionData("usenet_draft");
gourl = request_headers.Referer.replace(/[\?\&]clear\=true/, ''); session_data.deleteSessionData("usenet_draft_attachments");
else session_data.deleteSessionData("mail_draft");
gourl = "wtv-mail:/sendmail" session_data.deleteSessionData("mail_draft_attachments");
if (request_headers.query.saveoff) delete request_headers.query.saveoff; if (request_headers.query.message_to) delete request_headers.query.message_to;
session_data.deleteSessionData("usenet_draft"); if (request_headers.query.message_subject) delete request_headers.query.message_subject;
session_data.deleteSessionData("usenet_draft_attachments"); if (request_headers.query.message_body) delete request_headers.query.message_body;
session_data.deleteSessionData("mail_draft"); if (request_headers.query.message_url) delete request_headers.query.message_url;
session_data.deleteSessionData("mail_draft_attachments"); if (request_headers.query.message_title) delete request_headers.query.message_title;
if (request_headers.query.message_to) delete request_headers.query.message_to; if (request_headers.query.message_reply_all_cc) delete request_headers.query.message_reply_all_cc;
if (request_headers.query.message_subject) delete request_headers.query.message_subject; if (request_headers.query['wtv-saved-message-id']) delete request_headers.query['wtv-saved-message-id'];
if (request_headers.query.message_body) delete request_headers.query.message_body;
if (request_headers.query.message_url) delete request_headers.query.message_url;
if (request_headers.query.message_title) delete request_headers.query.message_title;
if (request_headers.query.message_reply_all_cc) delete request_headers.query.message_reply_all_cc;
if (request_headers.query['wtv-saved-message-id']) delete request_headers.query['wtv-saved-message-id'];
headers = `300 OK headers = `300 OK
wtv-expire-all: wtv-mail:/listmail wtv-expire-all: wtv-mail:/listmail
wtv-expire-all: wtv-mail:/sendmail wtv-expire-all: wtv-mail:/sendmail
Location: ${gourl}`; Location: ${gourl}`;
} else {
var doClientError = function (msg) {
var clientErrorMsg = new clientShowAlert({
'image': minisrv_config.config.service_logo,
'message': msg,
'buttonlabel1': "Okay",
'buttonaction1': "client:donothing",
'noback': true,
}).getURL();
return "200 OK\nwtv-visit: " + clientErrorMsg;
}
var newsgroup = null;
if (wtvshared.parseBool(request_headers.query.discuss)) {
newsgroup = request_headers.query.group || request_headers.query.message_to || null;
}
var gourl = "wtv-mail:/sendmail";
var msg_subject, to_addr, to_name;
if (newsgroup !== null) {
var to_addr = newsgroup;
var pageTitle = "Post to " + newsgroup;
var article = request_headers.query.article || null;
var gourl = gourl + "?group=" + newsgroup;
} else { } else {
var doClientError = function (msg) { var to_addr = request_headers.query.message_to || null;
var clientErrorMsg = new clientShowAlert({ var pageTitle = "Write an e-mail message";
'image': minisrv_config.config.service_logo, if (request_headers.query.message_reply_id) {
'message': msg, reply_message = session_data.mailstore.getMessageByID(request_headers.query.message_reply_id);
'buttonlabel1': "Okay", if (reply_message) {
'buttonaction1': "client:donothing", msg_subject = "Re: " + reply_message.subject;
'noback': true, to_addr = reply_message.from_addr;
}).getURL(); to_name = reply_message.from_name;
return "200 OK\nwtv-visit: " + clientErrorMsg;
}
var newsgroup = null;
if (wtvshared.parseBool(request_headers.query.discuss)) {
newsgroup = request_headers.query.group || request_headers.query.message_to || null;
}
var gourl = "wtv-mail:/sendmail";
var msg_subject, to_addr, to_name;
if (newsgroup !== null) {
var to_addr = newsgroup;
var pageTitle = "Post to " + newsgroup;
var article = request_headers.query.article || null;
var gourl = gourl + "?group=" + newsgroup;
} else {
var to_addr = request_headers.query.message_to || null;
var pageTitle = "Write an e-mail message";
if (request_headers.query.message_reply_id) {
reply_message = session_data.mailstore.getMessageByID(request_headers.query.message_reply_id);
if (reply_message) {
msg_subject = "Re: " + reply_message.subject;
to_addr = reply_message.from_addr;
to_name = reply_message.from_name;
}
} }
} }
}
var msg_subject = msg_subject || request_headers.query.message_subject || null; var msg_subject = msg_subject || request_headers.query.message_subject || null;
var msg_body = request_headers.query.message_body || null; var msg_body = request_headers.query.message_body || null;
var to_name = to_name || request_headers.query.whatever_webtv_sends_this_as || null; var to_name = to_name || request_headers.query.whatever_webtv_sends_this_as || null;
var msg_url = request_headers.query.message_url || null; var msg_url = request_headers.query.message_url || null;
var msg_url_title = request_headers.query.message_title || null; var msg_url_title = request_headers.query.message_title || null;
var no_signature = false; var no_signature = false;
mail_draft_data = {}; mail_draft_data = {};
mail_draft_attachments = {}; mail_draft_attachments = {};
if (!wtvshared.parseBool(request_headers.query.discuss)) { if (!wtvshared.parseBool(request_headers.query.discuss)) {
mail_draft_data = session_data.getSessionData("mail_draft"); mail_draft_data = session_data.getSessionData("mail_draft");
mail_draft_attachments = session_data.getSessionData("mail_draft_attachments") || {}; mail_draft_attachments = session_data.getSessionData("mail_draft_attachments") || {};
if (mail_draft_data && !wtvshared.parseBool(request_headers.query.discuss)) { if (mail_draft_data && !wtvshared.parseBool(request_headers.query.discuss)) {
session_data.deleteSessionData("mail_draft"); session_data.deleteSessionData("mail_draft");
if (mail_draft_data.to_addr) to_addr = request_headers.query.message_to || mail_draft_data.to_addr; if (mail_draft_data.to_addr) to_addr = request_headers.query.message_to || mail_draft_data.to_addr;
if (mail_draft_data.msg_subject) msg_subject = request_headers.query.message_subject || mail_draft_data.msg_subject; if (mail_draft_data.msg_subject) msg_subject = request_headers.query.message_subject || mail_draft_data.msg_subject;
if (mail_draft_data.msg_body) msg_body = request_headers.query.message_body || mail_draft_data.msg_body; if (mail_draft_data.msg_body) msg_body = request_headers.query.message_body || mail_draft_data.msg_body;
if (mail_draft_data.no_signature) no_signature = mail_draft_data.no_signature; if (mail_draft_data.no_signature) no_signature = mail_draft_data.no_signature;
if (mail_draft_data.msg_url) msg_url = request_headers.query.message_url || mail_draft_data.msg_url; if (mail_draft_data.msg_url) msg_url = request_headers.query.message_url || mail_draft_data.msg_url;
if (mail_draft_data.msg_url_title) msg_url_title = request_headers.query.message_title || mail_draft_data.msg_url_title; if (mail_draft_data.msg_url_title) msg_url_title = request_headers.query.message_title || mail_draft_data.msg_url_title;
}
} else {
mail_draft_data = session_data.getSessionData("usenet_draft");
mail_draft_attachments = session_data.getSessionData("usenet_draft_attachments") || {};
if (mail_draft_data && !wtvshared.parseBool(request_headers.query.discuss)) {
session_data.deleteSessionData("usenet_draft");
if (mail_draft_data.to_addr) to_addr = request_headers.query.message_to || mail_draft_data.to_addr;
if (mail_draft_data.msg_subject) msg_subject = request_headers.query.message_subject || mail_draft_data.msg_subject;
if (mail_draft_data.msg_body) msg_body = request_headers.query.message_body || mail_draft_data.msg_body;
if (mail_draft_data.no_signature) no_signature = mail_draft_data.no_signature;
if (mail_draft_data.article) article = article || mail_draft_data.article;
}
} }
} else {
if (request_headers.query.togglesign == "true") no_signature = false; mail_draft_data = session_data.getSessionData("usenet_draft");
if (request_headers.query.togglesign == "false") no_signature = true; mail_draft_attachments = session_data.getSessionData("usenet_draft_attachments") || {};
if (mail_draft_data && !wtvshared.parseBool(request_headers.query.discuss)) {
if (mail_draft_attachments) { session_data.deleteSessionData("usenet_draft");
if (mail_draft_attachments.message_snapshot_data) message_snapshot_data = mail_draft_attachments.message_snapshot_data; if (mail_draft_data.to_addr) to_addr = request_headers.query.message_to || mail_draft_data.to_addr;
else if (request_headers.query.message_snapshot_data) message_snapshot_data = request_headers.query.message_snapshot_data; if (mail_draft_data.msg_subject) msg_subject = request_headers.query.message_subject || mail_draft_data.msg_subject;
if (mail_draft_attachments.message_voicemail_data) message_voicemail_data = mail_draft_attachments.message_voicemail_data; if (mail_draft_data.msg_body) msg_body = request_headers.query.message_body || mail_draft_data.msg_body;
else if (request_headers.query.message_voicemail_data) message_voicemail_data = request_headers.query.message_voicemail_data; if (mail_draft_data.no_signature) no_signature = mail_draft_data.no_signature;
if (mail_draft_data.article) article = article || mail_draft_data.article;
} }
}
if (message_snapshot_data && request_headers.query.get_snap) { if (request_headers.query.togglesign == "true") no_signature = false;
headers = `200 OK if (request_headers.query.togglesign == "false") no_signature = true;
if (mail_draft_attachments) {
if (mail_draft_attachments.message_snapshot_data) message_snapshot_data = mail_draft_attachments.message_snapshot_data;
else if (request_headers.query.message_snapshot_data) message_snapshot_data = request_headers.query.message_snapshot_data;
if (mail_draft_attachments.message_voicemail_data) message_voicemail_data = mail_draft_attachments.message_voicemail_data;
else if (request_headers.query.message_voicemail_data) message_voicemail_data = request_headers.query.message_voicemail_data;
}
if (message_snapshot_data && request_headers.query.get_snap) {
headers = `200 OK
Content-Type: image/jpeg`; Content-Type: image/jpeg`;
data = message_snapshot_data; data = message_snapshot_data;
} else if (message_voicemail_data && request_headers.query.get_gab) { } else if (message_voicemail_data && request_headers.query.get_gab) {
headers = `200 OK headers = `200 OK
Content-Type: audio/wav`; Content-Type: audio/wav`;
data = message_voicemail_data; data = message_voicemail_data;
} else { } else {
var username = session_data.getSessionData("subscriber_username"); var username = session_data.getSessionData("subscriber_username");
var userdisplayname = wtvshared.htmlEntitize(session_data.getSessionData("subscriber_name")); var userdisplayname = wtvshared.htmlEntitize(session_data.getSessionData("subscriber_name"));
var address = username + "@" + minisrv_config.config.service_name //minisrv_config.config.domain_name var address = username + "@" + minisrv_config.config.service_name //minisrv_config.config.domain_name
var notImplementedAlert = new clientShowAlert({ var notImplementedAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo, 'image': minisrv_config.config.service_logo,
'message': "This feature is not available.", 'message': "This feature is not available.",
'buttonlabel1': "Okay", 'buttonlabel1': "Okay",
'buttonaction1': "client:donothing", 'buttonaction1': "client:donothing",
'noback': true, 'noback': true,
}).getURL(); }).getURL();
if ((typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) || request_headers.query.saveoff || request_headers.query.get_snap || request_headers.query.get_gab) { if ((typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) || request_headers.query.saveoff || request_headers.query.get_snap || request_headers.query.get_gab) {
var from_addr = address; var from_addr = address;
var signature = session_data.getSessionData("subscriber_signature") || null; var signature = session_data.getSessionData("subscriber_signature") || null;
if (typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) { if (typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) {
var attachments = []; var attachments = [];
if (message_snapshot_data) { if (message_snapshot_data) {
var attachment = { var attachment = {
'mime': 'image/jpeg', 'mime': 'image/jpeg',
'filename': 'snapshot.jpg' 'filename': 'snapshot.jpg'
} }
if (typeof message_snapshot_data == "object") { if (typeof message_snapshot_data == "object") {
attachment.content = new Buffer.from(message_snapshot_data).toString('base64'); attachment.content = new Buffer.from(message_snapshot_data).toString('base64');
attachment.is_base64 = true; attachment.is_base64 = true;
} else } else
attachment.content = message_snapshot_data; attachment.content = message_snapshot_data;
attachments.push(attachment); attachments.push(attachment);
}
if (message_voicemail_data) {
var attachment = {
'mime': 'audio/wav',
'filename': 'voicemail.wav'
} }
if (message_voicemail_data) { if (typeof message_voicemail_data == "object") {
var attachment = { attachment.content = new Buffer.from(message_voicemail_data).toString('base64');
'mime': 'audio/wav', attachment.is_base64 = true;
'filename': 'voicemail.wav' } else
attachment.content = message_voicemail_data;
attachments.push(attachment);
}
console.log("DEBUG sendmail: Before send decision - newsgroup =", newsgroup, "to_addr =", to_addr);
if (newsgroup !== null) {
console.log("DEBUG sendmail: Taking newsgroup path");
var request_is_async = true;
var local_service_name = request_headers.query['discuss-prefix'] || "wtv-news"
const wtvnews = new WTVNews(minisrv_config, local_service_name);
var service_config = minisrv_config.services[local_service_name];
if (wtvnewsserver) {
var tls_options = {
ca: this.wtvshared.getServiceDep('wtv-news/localserver_ca.pem'),
key: this.wtvshared.getServiceDep('wtv-news/localserver_key.pem'),
cert: this.wtvshared.getServiceDep('wtv-news/localserver_cert.pem'),
checkServerIdentity: () => { return null; }
} }
if (wtvnewsserver.username)
if (typeof message_voicemail_data == "object") { wtvnews.initializeUsenet("127.0.0.1", service_config.local_nntp_port, tls_options, wtvnewsserver.username, wtvnewsserver.password);
attachment.content = new Buffer.from(message_voicemail_data).toString('base64'); else
attachment.is_base64 = true; wtvnews.initializeUsenet("127.0.0.1", service_config.local_nntp_port, tls_options);
} else } else {
attachment.content = message_voicemail_data; if (service_config.upstream_auth)
wtvnews.initializeUsenet(service_config.upstream_address, service_config.upstream_port, service_config.upstream_tls || null, service_config.upstream_auth.username || null, service_config.upstream_auth.password || null);
attachments.push(attachment); else
wtvnews.initializeUsenet(service_config.upstream_address, service_configupstream_port, service_config.upstream_tls || null);
} }
from_addr = userdisplayname + " <" + from_addr + ">";
console.log("DEBUG sendmail: Before send decision - newsgroup =", newsgroup, "to_addr =", to_addr); news_headers = null;
if (newsgroup !== null) { if (signature && signature != "" && !no_signature) {
console.log("DEBUG sendmail: Taking newsgroup path"); var signature_tuple = null;
var request_is_async = true; if (signature.indexOf('<html>') >= 0) {
var local_service_name = request_headers.query['discuss-prefix'] || "wtv-news" attachments.push({
const wtvnews = new WTVNews(minisrv_config, local_service_name); "mime": 'text/html',
var service_config = minisrv_config.services[local_service_name]; "content": signature,
if (wtvnewsserver) { "use_base64": false,
var tls_options = { "filename": "wtv_signature.html"
ca: this.wtvshared.getServiceDep('wtv-news/localserver_ca.pem'),
key: this.wtvshared.getServiceDep('wtv-news/localserver_key.pem'),
cert: this.wtvshared.getServiceDep('wtv-news/localserver_cert.pem'),
checkServerIdentity: () => { return null; }
}
if (wtvnewsserver.username)
wtvnews.initializeUsenet("127.0.0.1", service_config.local_nntp_port, tls_options, wtvnewsserver.username, wtvnewsserver.password);
else
wtvnews.initializeUsenet("127.0.0.1", service_config.local_nntp_port, tls_options);
} else {
if (service_config.upstream_auth)
wtvnews.initializeUsenet(service_config.upstream_address, service_config.upstream_port, service_config.upstream_tls || null, service_config.upstream_auth.username || null, service_config.upstream_auth.password || null);
else
wtvnews.initializeUsenet(service_config.upstream_address, service_configupstream_port, service_config.upstream_tls || null);
}
from_addr = userdisplayname + " <" + from_addr + ">";
news_headers = null;
if (signature && signature != "" && !no_signature) {
var signature_tuple = null;
if (signature.indexOf('<html>') >= 0) {
attachments.push({
"mime": 'text/html',
"content": signature,
"use_base64": false,
"filename": "wtv_signature.html"
});
} else {
if (msg_body) msg_body += "\n" + signature;
else msg_body = signature;
}
}
if (!msg_body) msg_body = "";
if (attachments.length > 0 || msg_body.indexOf('<html>') >= 0) {
// usenet attachments
var tuples = [];
if (msg_body.indexOf('<html>') >= 0) {
tuples.push({
"mime": 'text/html',
"content": msg_body,
"use_base64": false,
"filename": "message.html"
});
} else {
tuples = [{
"mime": 'text/plain',
"content": msg_body || '',
"use_base64": false
}];
}
if (signature_tuple) tuples.push(signature_tuple);
attachments.forEach((attachment) => {
var tuple = {};
tuple.mime = attachment.mime;
tuple.content = attachment.content;
tuple.use_base64 = (typeof attachment.use_base64 === 'boolean') ? attachment.use_base64 : true;
tuple.is_base64 = (typeof attachment.is_base64 === 'boolean') ? attachment.is_base64 : false;
tuple.filename = attachment.filename || null;
tuples.push(tuple);
}); });
var multipart_data = wtvmime.generateMultipartMIME(tuples); } else {
news_headers = { if (msg_body) msg_body += "\n" + signature;
"Content-Type": multipart_data.content_type, else msg_body = signature;
"MIME-Version": multipart_data.mime_version,
"User-Agent": minisrv_version_string + " for WebTV",
"Content-Language": "en-US"
}
msg_body = multipart_data.content.toString();
} }
wtvnews.postToGroup(newsgroup, from_addr, msg_subject, msg_body, article, news_headers).then(() => { }
session_data.deleteSessionData("usenet_draft");
session_data.deleteSessionData("usenet_draft_attachments"); if (!msg_body) msg_body = "";
headers = `300 OK
if (attachments.length > 0 || msg_body.indexOf('<html>') >= 0) {
// usenet attachments
var tuples = [];
if (msg_body.indexOf('<html>') >= 0) {
tuples.push({
"mime": 'text/html',
"content": msg_body,
"use_base64": false,
"filename": "message.html"
});
} else {
tuples = [{
"mime": 'text/plain',
"content": msg_body || '',
"use_base64": false
}];
}
if (signature_tuple) tuples.push(signature_tuple);
attachments.forEach((attachment) => {
var tuple = {};
tuple.mime = attachment.mime;
tuple.content = attachment.content;
tuple.use_base64 = (typeof attachment.use_base64 === 'boolean') ? attachment.use_base64 : true;
tuple.is_base64 = (typeof attachment.is_base64 === 'boolean') ? attachment.is_base64 : false;
tuple.filename = attachment.filename || null;
tuples.push(tuple);
});
var multipart_data = wtvmime.generateMultipartMIME(tuples);
news_headers = {
"Content-Type": multipart_data.content_type,
"MIME-Version": multipart_data.mime_version,
"User-Agent": minisrv_version_string + " for WebTV",
"Content-Language": "en-US"
}
msg_body = multipart_data.content.toString();
}
wtvnews.postToGroup(newsgroup, from_addr, msg_subject, msg_body, article, news_headers).then(() => {
session_data.deleteSessionData("usenet_draft");
session_data.deleteSessionData("usenet_draft_attachments");
headers = `300 OK
wtv-expire-all: wtv-news:/news?group=${newsgroup} wtv-expire-all: wtv-news:/news?group=${newsgroup}
wtv-expire-all wtv-mail:/sendmail wtv-expire-all wtv-mail:/sendmail
Location: wtv-news:/news?group=${newsgroup}`; Location: wtv-news:/news?group=${newsgroup}`;
sendToClient(socket, headers, ''); sendToClient(socket, headers, '');
}).catch((e) => { }).catch((e) => {
var err = this.wtvshared.doErrorPage(500, null, e.toString()) var err = this.wtvshared.doErrorPage(500, null, e.toString())
sendToClient(socket, err[0], err[1]); sendToClient(socket, err[0], err[1]);
}); });
} else {
console.log("DEBUG sendmail: Taking email path with to_addr =", to_addr);
var messagereturn = session_data.mailstore.sendMessageToAddr(from_addr, to_addr, msg_body, msg_subject, userdisplayname, to_name, signature, attachments, msg_url, msg_url_title);
if (messagereturn !== true) {
var errpage = wtvshared.doErrorPage(400, messagereturn);
headers = errpage[0];
data = errpage[1];
} else { } else {
console.log("DEBUG sendmail: Taking email path with to_addr =", to_addr); session_data.deleteSessionData("mail_draft");
var messagereturn = session_data.mailstore.sendMessageToAddr(from_addr, to_addr, msg_body, msg_subject, userdisplayname, to_name, signature, attachments, msg_url, msg_url_title); session_data.deleteSessionData("mail_draft_attachments");
if (messagereturn !== true) { headers = `300 OK
var errpage = wtvshared.doErrorPage(400, messagereturn);
headers = errpage[0];
data = errpage[1];
} else {
session_data.deleteSessionData("mail_draft");
session_data.deleteSessionData("mail_draft_attachments");
headers = `300 OK
wtv-expire-all: wtv-mail:/listmail wtv-expire-all: wtv-mail:/listmail
wtv-expire-all: wtv-mail:/sendmail wtv-expire-all: wtv-mail:/sendmail
Location: wtv-mail:/listmail`; Location: wtv-mail:/listmail`;
}
} }
}
} else if (request_headers.query.saveoff) { } else if (request_headers.query.saveoff) {
var mail_draft_data = { var mail_draft_data = {
to_addr: to_addr, to_addr: to_addr,
msg_subject: msg_subject, msg_subject: msg_subject,
msg_body: msg_body, msg_body: msg_body,
no_signature: no_signature, no_signature: no_signature,
msg_url: msg_url, msg_url: msg_url,
msg_url_title: msg_url_title, msg_url_title: msg_url_title,
} }
if (newsgroup) mail_draft_data.article = article; if (newsgroup) mail_draft_data.article = article;
session_data.setSessionData((newsgroup) ? "usenet_draft" : "mail_draft", mail_draft_data); session_data.setSessionData((newsgroup) ? "usenet_draft" : "mail_draft", mail_draft_data);
headers = `200 OK headers = `200 OK
Content-type: text/html Content-type: text/html
wtv-expire-all: wtv-mail:/sendmail`; wtv-expire-all: wtv-mail:/sendmail`;
} }
} else { } else {
headers = `200 OK headers = `200 OK
Content-type: text/html`; Content-type: text/html`;
var mail_draft_data = session_data.getSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments") || {}; var mail_draft_data = session_data.getSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments") || {};
if (request_headers.query.snapping == "false") { if (request_headers.query.snapping == "false") {
headers += "\nwtv-expire-all: cache:snapshot.jpg"; headers += "\nwtv-expire-all: cache:snapshot.jpg";
if (mail_draft_data.message_snapshot_data) mail_draft_data.message_snapshot_data = null; if (mail_draft_data.message_snapshot_data) mail_draft_data.message_snapshot_data = null;
session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data); session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data);
} }
if (request_headers.query.gabbing == "false") { if (request_headers.query.gabbing == "false") {
headers += "\nwtv-expire-all: cache:voicemail.wav"; headers += "\nwtv-expire-all: cache:voicemail.wav";
if (mail_draft_data.message_voicemail_data) mail_draft_data.message_voicemail_data = null; if (mail_draft_data.message_voicemail_data) mail_draft_data.message_voicemail_data = null;
session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data); session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data);
} }
if (request_headers.query.message_snapshot_data) { if (request_headers.query.message_snapshot_data) {
mail_draft_data.message_snapshot_data = request_headers.query.message_snapshot_data mail_draft_data.message_snapshot_data = request_headers.query.message_snapshot_data
session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data); session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data);
} }
if (request_headers.query.message_voicemail_data) { if (request_headers.query.message_voicemail_data) {
mail_draft_data.message_voicemail_data = request_headers.query.message_voicemail_data mail_draft_data.message_voicemail_data = request_headers.query.message_voicemail_data
session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data); session_data.setSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments", mail_draft_data);
} }
var message_colors = null; var message_colors = null;
if (no_signature) message_colors = session_data.mailstore.getSignatureColors(null, true); if (no_signature) message_colors = session_data.mailstore.getSignatureColors(null, true);
else message_colors = session_data.mailstore.getSignatureColors(session_data.getSessionData("subscriber_signature"), true); else message_colors = session_data.mailstore.getSignatureColors(session_data.getSessionData("subscriber_signature"), true);
data = `<HTML> data = `<HTML>
<head> <head>
<display poweroffalert > <display poweroffalert >
<sendpanel <sendpanel
@@ -364,8 +359,8 @@ myURL = "client:submitform?name=sendform&submitname=gabbing&submitvalue=cache%3A
location = "client:submitform?name=sendform&submitname=gabbing&submitvalue=true"; location = "client:submitform?name=sendform&submitname=gabbing&submitvalue=true";
location.reload(); } location.reload(); }
function clearDraft() { function clearDraft() {
location = "client:submitform?name=sendform&submitname=clear&submitvalue=true"; location = "client:submitform?name=sendform&submitname=clear&submitvalue=true";
location.reload(); location.reload();
} }
</script> </script>
<title> <title>
@@ -402,23 +397,23 @@ ${(request_headers.query.article) ? `<input type="hidden" name="article" value="
<td width=10 height=26> <td width=10 height=26>
<td width=89 valgn=middle> <td width=89 valgn=middle>
<table cellspacing=0 cellpadding=0 href="` <table cellspacing=0 cellpadding=0 href="`
if (newsgroup) { if (newsgroup) {
data += "wtv-news:/news?group=" + newsgroup; data += "wtv-news:/news?group=" + newsgroup;
} else { } else {
data += "wtv-mail:/listmail"; data += "wtv-mail:/listmail";
} }
data += `"><tr> data += `"><tr>
<td height=1> <td height=1>
<tr>`; <tr>`;
if (newsgroup) { if (newsgroup) {
data += `<td><shadow><font sizerange=medium color=#E6CD4A>Group list</font></shadow>`; data += `<td><shadow><font sizerange=medium color=#E6CD4A>Group list</font></shadow>`;
} else { } else {
data += `<td><shadow><font sizerange=medium color=#E6CD4A>Mail list</font></shadow>`; data += `<td><shadow><font sizerange=medium color=#E6CD4A>Mail list</font></shadow>`;
} }
data += `</table>`; data += `</table>`;
if (!newsgroup) { if (!newsgroup) {
data += ` data += `
<td width=5> <td width=5>
<tr> <td bgcolor=#4A525A height=2 width=104 colspan=3> <tr> <td bgcolor=#4A525A height=2 width=104 colspan=3>
<tr> <tr>
@@ -430,7 +425,7 @@ data += `</table>`;
<tr> <tr>
<td><shadow><font sizerange=medium color=#E6CD4A>Address</font></shadow> <td><shadow><font sizerange=medium color=#E6CD4A>Address</font></shadow>
</table>`; </table>`;
} }
data += ` data += `
<td width=5> <td width=5>
<tr> <td bgcolor=#4A525A height=2 width=104 colspan=3> <tr> <td bgcolor=#4A525A height=2 width=104 colspan=3>
@@ -549,12 +544,12 @@ ${address}
<img src="wtv-mail:/content/images/sendmail_panel_dots.gif" width=385 height=2> <img src="wtv-mail:/content/images/sendmail_panel_dots.gif" width=385 height=2>
<tr> <tr>
<td width=80 valign=top align=right>`; <td width=80 valign=top align=right>`;
if (!request_headers.query.discuss) { if (!request_headers.query.discuss) {
data += '<a href="client:openaddresspanel">To:</a>'; data += '<a href="client:openaddresspanel">To:</a>';
} else { } else {
data += 'To:'; data += 'To:';
} }
data += `&nbsp; data += `&nbsp;
<td width=305 valign=top> <td width=305 valign=top>
<textarea <textarea
bgcolor="${message_colors.bgcolor}" bgcolor="${message_colors.bgcolor}"
@@ -573,7 +568,7 @@ autoactivate
addresses addresses
autoascii autoascii
nohighlight`; nohighlight`;
if (newsgroup) { data += "\nreadonly" } if (newsgroup) { data += "\nreadonly" }
data += ` data += `
>${(to_addr) ? to_addr : ''}</textarea> >${(to_addr) ? to_addr : ''}</textarea>
<tr> <tr>
@@ -624,15 +619,15 @@ link=${message_colors.link}
vlink=${message_colors.vlink} vlink=${message_colors.vlink}
vspace=0 vspace=0
hspace=0>`; hspace=0>`;
if (session_data.getSessionData("subscriber_signature") && session_data.getSessionData("subscriber_signature") != "" && !no_signature) { if (session_data.getSessionData("subscriber_signature") && session_data.getSessionData("subscriber_signature") != "" && !no_signature) {
data += wtvshared.sanitizeSignature(session_data.getSessionData("subscriber_signature")); data += wtvshared.sanitizeSignature(session_data.getSessionData("subscriber_signature"));
} }
if (msg_url) { if (msg_url) {
data += `<input type="hidden" name="message_url" value="${msg_url}"> data += `<input type="hidden" name="message_url" value="${msg_url}">
<input type="hidden" name="message_title" value="${msg_url_title}"> <input type="hidden" name="message_title" value="${msg_url_title}">
Included Page: <a href="${msg_url}">${wtvshared.htmlEntitize(msg_url_title).replace(/&apos;/gi, "'")}</a>`; Included Page: <a href="${msg_url}">${wtvshared.htmlEntitize(msg_url_title).replace(/&apos;/gi, "'")}</a>`;
} }
data += ` data += `
<td abswidth=13> <td abswidth=13>
<td abswidth=2 bgcolor=#000000> <td abswidth=2 bgcolor=#000000>
<tr> <tr>
@@ -649,18 +644,18 @@ Included Page: <a href="${msg_url}">${wtvshared.htmlEntitize(msg_url_title).repl
<table cellspacing=0 cellpadding=0 border=0> <table cellspacing=0 cellpadding=0 border=0>
<tr> <tr>
<td width=305 valign=top>`; <td width=305 valign=top>`;
if (!session_data.getSessionData("subscriber_signature") || session_data.getSessionData("subscriber_signature") == "") { if (!session_data.getSessionData("subscriber_signature") || session_data.getSessionData("subscriber_signature") == "") {
data += `<input type = hidden name = "togglesign" value = "false"> <td abswidth=13 > `; data += `<input type = hidden name = "togglesign" value = "false"> <td abswidth=13 > `;
} else if (no_signature) { } else if (no_signature) {
data += `<a href="javascript:Signing('true')"> data += `<a href="javascript:Signing('true')">
<img src="wtv-mail:/content/images/RemoveButton.gif" align=absmiddle height=25 width=25>&nbsp;Add signature&nbsp;</a> <img src="wtv-mail:/content/images/RemoveButton.gif" align=absmiddle height=25 width=25>&nbsp;Add signature&nbsp;</a>
<br>`; <br>`;
} else { } else {
data += `<a href="javascript:Signing('false')"> data += `<a href="javascript:Signing('false')">
<img src="wtv-mail:/content/images/RemoveButton.gif" align=absmiddle height=25 width=25>&nbsp;Remove signature&nbsp;</a> <img src="wtv-mail:/content/images/RemoveButton.gif" align=absmiddle height=25 width=25>&nbsp;Remove signature&nbsp;</a>
<br>`; <br>`;
} }
data += ` data += `
<td align=right valign=top width=110> <FONT COLOR="#E7CE4A"><SHADOW> <td align=right valign=top width=110> <FONT COLOR="#E7CE4A"><SHADOW>
<INPUT TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" action="javascript:Submit()" <INPUT TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" action="javascript:Submit()"
value="Send" value="Send"
@@ -674,8 +669,8 @@ USESTYLE NOARGS>
<spacer type=vertical size=5> <spacer type=vertical size=5>
`; `;
if ((request_headers.query.snapping && request_headers.query.snapping !== 'false') || mail_draft_attachments.message_snapshot_data) { if ((request_headers.query.snapping && request_headers.query.snapping !== 'false') || mail_draft_attachments.message_snapshot_data) {
data += `<tr> data += `<tr>
<td absheight="10"> <td absheight="10">
<img src="ROMCache/Spacer.gif" width="1" height="10"> <img src="ROMCache/Spacer.gif" width="1" height="10">
</td></tr></tbody></table> </td></tr></tbody></table>
@@ -703,12 +698,12 @@ USESTYLE NOARGS>
<img src="ROMCache/Spacer.gif" width="1" height="1"> <img src="ROMCache/Spacer.gif" width="1" height="1">
</td></tr><tr> </td></tr><tr>
<td colspan="2" absheight="15">`; <td colspan="2" absheight="15">`;
if (!mail_draft_attachments.message_snapshot_data) { if (!mail_draft_attachments.message_snapshot_data) {
data += `<input type="file" device="video" name="message_snapshot_data" src="cache:snapshot.jpg" invisible="" width="75%" height="75%"> data += `<input type="file" device="video" name="message_snapshot_data" src="cache:snapshot.jpg" invisible="" width="75%" height="75%">
<input type="hidden" name="message_snapshot_url" value="cache:snapshot.jpg">`; <input type="hidden" name="message_snapshot_url" value="cache:snapshot.jpg">`;
} }
data += ` data += `
</td></tr><tr> </td></tr><tr>
<td colspan="2" align="center"> <td colspan="2" align="center">
<img src="${(mail_draft_attachments.message_snapshot_data) ? 'wtv-mail:/sendmail?get_snap=true' : (request_headers.query.message_snapshot_url) ? request_headers.query.message_snapshot_url : 'cache:snapshot.jpg'}" width="380" height="290"> <img src="${(mail_draft_attachments.message_snapshot_data) ? 'wtv-mail:/sendmail?get_snap=true' : (request_headers.query.message_snapshot_url) ? request_headers.query.message_snapshot_url : 'cache:snapshot.jpg'}" width="380" height="290">
@@ -736,10 +731,10 @@ USESTYLE NOARGS>
<td absheight="6"> <td absheight="6">
<img src="ROMCache/Spacer.gif" width="1" height="6"> <img src="ROMCache/Spacer.gif" width="1" height="6">
</td></tr>`; </td></tr>`;
} }
if ((request_headers.query.gabbing && request_headers.query.gabbing !== 'false') || mail_draft_attachments.message_voicemail_data) { if ((request_headers.query.gabbing && request_headers.query.gabbing !== 'false') || mail_draft_attachments.message_voicemail_data) {
data += `<tr> data += `<tr>
<td absheight="10"> <td absheight="10">
<img src="ROMCache/Spacer.gif" width="1" height="10"> <img src="ROMCache/Spacer.gif" width="1" height="10">
</td></tr></tbody></table> </td></tr></tbody></table>
@@ -792,15 +787,14 @@ ${(!mail_draft_attachments.message_voicemail_data) ? '' : '<input type=hidden na
<td absheight="6"> <td absheight="6">
<img src="ROMCache/Spacer.gif" width="1" height="6"> <img src="ROMCache/Spacer.gif" width="1" height="6">
</td></tr>`; </td></tr>`;
} }
data += ` data += `
</form> </form>
</tbody> </tbody>
</table> </table>
</body> </body>
</HTML> </HTML>
`; `;
}
} }
} }
} }

View File

@@ -1,28 +0,0 @@
var minisrv_service_file = true;
if (minisrv_config.config.allow_guests) {
headers = `300 Moved
Connection: Close
wtv-noback-all: wtv-register:
wtv-expire-all: wtv-`;
if (socket.ssid) {
if (session_data) {
if (session_data.data_store) {
if (session_data.data_store.wtvsec_login) {
headers += "\nwtv-ticket: " + session_data.data_store.wtvsec_login.ticket_b64;
}
}
}
}
headers += `
wtv-service: reset
${getServiceString('wtv-1800')}
wtv-relogin-url: wtv-1800:/preregister?guest_login=true&skip_splash=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 {
var errpage = wtvshared.doErrorPage(400, "Guest mode is not enabled on this service.");
headers = errpage[0];
data = errpage[1];
}

View File

@@ -10,7 +10,6 @@ var nickname = (minisrv_config.config.service_name + '_' + namerand)
var human_name = nickname; var human_name = nickname;
var isOldBuild = wtvshared.isOldBuild(session_data); var isOldBuild = wtvshared.isOldBuild(session_data);
var form_data = `<input type=button action="ValidateAgreement?registering=true&subscriber_name=${human_name}&subscriber_username=${nickname}" text="#dddddd" Value="Quick Reg" name="speedyreg" borderimage="file://ROM/Borders/ButtonBorder2.bif" width=130>`; var form_data = `<input type=button action="ValidateAgreement?registering=true&subscriber_name=${human_name}&subscriber_username=${nickname}" text="#dddddd" Value="Quick Reg" name="speedyreg" borderimage="file://ROM/Borders/ButtonBorder2.bif" width=130>`;
if (minisrv_config.config.allow_guests) form_data += `<input type=button text="#dddddd" action="BeMyGuest" Value="Sign in as Guest" name="noreg" borderimage="file://ROM/Borders/ButtonBorder2.bif" width=170 >`;
var main_data = `<form action="ValidateAgreement" var main_data = `<form action="ValidateAgreement"
ENCTYPE="x-www-form-encoded" METHOD="POST"> ENCTYPE="x-www-form-encoded" METHOD="POST">
<input type=hidden name=registering value="true"> <input type=hidden name=registering value="true">

View File

@@ -55,17 +55,14 @@ class WTVAuthor {
} }
pagestoreExists() { pagestoreExists() {
if (!this.isguest) { if (this.pagestore_dir === null) {
if (this.pagestore_dir === null) { // set pagestore directory local var so we don't call the function every time
// set pagestore directory local var so we don't call the function every time var userstore_dir = this.wtvclient.getUserStoreDirectory();
var userstore_dir = this.wtvclient.getUserStoreDirectory(); // PageStore
// PageStore var store_dir = "PageStore" + this.path.sep;
var store_dir = "PageStore" + this.path.sep; this.pagestore_dir = userstore_dir + store_dir;
this.pagestore_dir = userstore_dir + store_dir; }
} return this.fs.existsSync(this.pagestore_dir);
return this.fs.existsSync(this.pagestore_dir);
}
return true;
} }
createPagestore() { createPagestore() {

View File

@@ -346,13 +346,11 @@ class WTVClientSessionData {
} }
scrapbookExists() { scrapbookExists() {
if (!this.isguest) { if (this.scrapbook_dir === null) {
if (this.scrapbook_dir === null) { var userstore_dir = this.getUserStoreDirectory();
var userstore_dir = this.getUserStoreDirectory(); var store_dir = "Scrapbook" + this.path.sep;
var store_dir = "Scrapbook" + this.path.sep; this.scrapbook_dir = userstore_dir + store_dir;
this.scrapbook_dir = userstore_dir + store_dir; }
}
}
return this.fs.existsSync(this.scrapbook_dir); return this.fs.existsSync(this.scrapbook_dir);
} }

View File

@@ -39,18 +39,15 @@ class WTVFavorites {
} }
favstoreExists() { favstoreExists() {
if (!this.isguest) { if (this.favstore_dir === null) {
if (this.favstore_dir === null) { // set favstore directory local var so we don't call the function every time
// set favstore directory local var so we don't call the function every time const userstore_dir = this.wtvclient.getUserStoreDirectory();
const userstore_dir = this.wtvclient.getUserStoreDirectory();
// FavStore // FavStore
const store_dir = "FavStore" + this.path.sep; const store_dir = "FavStore" + this.path.sep;
this.favstore_dir = userstore_dir + store_dir; this.favstore_dir = userstore_dir + store_dir;
} }
return this.fs.existsSync(this.favstore_dir); return this.fs.existsSync(this.favstore_dir);
}
return null;
} }
folderExists(foldername) { folderExists(foldername) {

View File

@@ -56,17 +56,14 @@ class WTVMail {
mailstoreExists() { mailstoreExists() {
if (!this.isguest) { if (this.mailstore_dir === null) {
if (this.mailstore_dir === null) { // set mailstore directory local var so we don't call the function every time
// set mailstore directory local var so we don't call the function every time const userstore_dir = this.wtvclient.getUserStoreDirectory();
const userstore_dir = this.wtvclient.getUserStoreDirectory(); // MailStore
// MailStore const store_dir = "MailStore" + this.path.sep;
const store_dir = "MailStore" + this.path.sep; this.mailstore_dir = userstore_dir + store_dir;
this.mailstore_dir = userstore_dir + store_dir;
}
return this.fs.existsSync(this.mailstore_dir);
} }
return null; return this.fs.existsSync(this.mailstore_dir);
} }
getSignatureColors(signature = null, sendmail = true) { getSignatureColors(signature = null, sendmail = true) {

View File

@@ -47,7 +47,6 @@
"show_diskmap": false, // Useful for debugging custom Diskmaps "show_diskmap": false, // Useful for debugging custom Diskmaps
"unauthorized_url": "wtv-1800:/unauthorized?", // Where to send unauthorized users "unauthorized_url": "wtv-1800:/unauthorized?", // Where to send unauthorized users
"enable_port_isolation": true, // Only respond to services on their correct ports "enable_port_isolation": true, // Only respond to services on their correct ports
"allow_guests": true, // Allow users to experience the server without registering
"domain_name": "wtv.zefie.com", // For usenet and future stuff, no need to change just yet, "domain_name": "wtv.zefie.com", // For usenet and future stuff, no need to change just yet,
"max_post_length": 20, // in megabytes "max_post_length": 20, // in megabytes
"require_valid_ssid": false, // require a valid SSID (with valid CRC) "require_valid_ssid": false, // require a valid SSID (with valid CRC)

View File

@@ -9,7 +9,8 @@
"start": "node app.js", "start": "node app.js",
"irc": "node irconly.js", "irc": "node irconly.js",
"test": "node test.js", "test": "node test.js",
"debug": "cross-env DEBUG=* node app.js" "debug": "cross-env DEBUG=* node app.js",
"modem-proxy": "node modem_proxy.js"
}, },
"author": { "author": {
"name": "zefie", "name": "zefie",