From 7aec035faec5f6c4cff16fd2391cd2c4019ec3f6 Mon Sep 17 00:00:00 2001 From: zefie Date: Tue, 24 Jun 2025 10:21:32 -0400 Subject: [PATCH] attempt to cleanly reject guest users from mail/usenet --- zefie_wtvp_minisrv/app.js | 2 +- .../ServiceVault/wtv-mail/listmail.js | 667 +++---- .../ServiceVault/wtv-mail/sendmail.js | 1541 +++++++++-------- 3 files changed, 1111 insertions(+), 1099 deletions(-) diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 9fdb5eed..7e57e3ae 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -2197,7 +2197,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq async function cleanupSocket(socket) { try { if (socket_sessions[socket.id]) { - if (!minisrv_config.config.debug_flags.quiet) console.debug('* Cleaning up disconnected socket', socket.id, `(${socket_sessions[socket.id].socket_total_read} bytes read, ${socket_sessions[socket.id].socket_total_written} bytes written)`); + if (!minisrv_config.config.debug_flags.quiet) console.debug('* Cleaning up disconnected socket', socket.id, `(${socket_sessions[socket.id].socket_total_read || 0} bytes read, ${socket_sessions[socket.id].socket_total_written || 0} bytes written)`); delete socket_sessions[socket.id]; } if (socket.ssid) { diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js index 518b9a14..54e8f8dc 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js @@ -1,342 +1,347 @@ var minisrv_service_file = true; var mailstore_exists = false; - -function mail_end_error(msg) { - var errpage = wtvshared.doErrorPage("400", msg); +if (!session_data.isRegistered()) { + var errpage = wtvshared.doErrorPage("400", "Mail service is not available for guest users."); headers = errpage[0]; 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 { - if (!intro_seen && request_headers.query.intro_seen) { - // User has come from intro - session_data.mailstore.setMailIntroSeen(true); + function mail_end_error(msg) { + var errpage = wtvshared.doErrorPage("400", msg); + headers = errpage[0]; + data = errpage[1]; } - // 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) mailstore_exists = session_data.mailstore.createMailstore(); - - if (mailstore_exists) { - // mailstore exists and user is not guest - - var default_limit = (minisrv_config.services[service_name].messages_per_page) ? minisrv_config.services[service_name].messages_per_page : 25; // user config or 25 - 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; - - // get mailbox name - var mailbox_name = session_data.mailstore.getMailboxById(parseInt(mailbox)); - - // if false or null, then mailbox is invalid - if (!mailbox_name) { - mail_end_error("Invalid Mailbox ID"); - } else { - // mailboxid is ok - if (!session_data.mailstore.mailboxExists(mailbox)) { - // mailbox does not yet exist, create it - var mailbox_exists = session_data.mailstore.createMailbox(mailbox); - 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 { - if (total_unread_message_count > 0) { - message_list_string = total_unread_message_count + " new mail message" + ((total_message_count != 1) ? 's' : ''); - 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 "; - } else { - message_list_string = total_message_count + " mail message" + ((total_message_count != 1) ? 's' : '') + " for "; - } - } - - 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`; - - data = ` - - - -${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} - - - - - - -
- - - -
- -
- - - - - -
- - - - - - - - - - - -
-
- - - - -
-
Write -
-		 -
-
- - - - -
-
Storage -
-		 -
-
- - - - -
-
Addresses -
-		 -
-
- - - - -
-
Clean up -
-		 -
-
- - -

 

-
-

-
-
-Quick Tip: - - -
- -indicates messages from known senders
- -
-		 -
- - - - - - -
- -
- -
- - -
- - - -`; - var icon_image = null; - switch (mailbox_name) { - case "Inbox": - icon_image = session_data.mailstore.getMailboxIcon(); - break; - case "Sent": - icon_image = "MailboxSent.gif"; - break; - case "Trash": - icon_image = "MailboxDiscard.gif"; - break; - default: - icon_image = "MailboxStorage.gif"; - break; - } - - data += ` - - -
-
- - -
- - -
- - - ${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} - - - - -
-Settings -		 - - -
-
-
- - -
- - -
`; - if (message_list) { - - data += ` - ${message_list_string} - - -
-${username}@${minisrv_config.config.service_name} -
-
- -
- - - -
-From -Subject -Date -
- -
-`; - Object.keys(message_list).forEach(function (k) { - var message = message_list[k]; - if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject); - message.known_sender = session_data.isAddressInAddressBook(message.from_addr); - var message_font_open = ""; - var message_font_close = ""; - if (message.unread) { - message_font_open = ``; - message_font_close = "" - } - data += ` - - - -
- - -
${(message.known_sender) ? '' : ''} - -${message_font_open} -${(message.from_name) ? message.from_name : message.from_addr} -${message_font_close} - - -${message_font_open} -${(message.subject) ? wtvshared.htmlEntitize(message.subject) : "(No Subject)"} -${message_font_close} - - -${message_font_open} -`; - var message_date = new Date(message.date * 1000); - data += (message_date.getMonth() + 1) + "/" + message_date.getDate() + "\n"; - data += ` -${message_font_close} -
-
`; - }); - } else { - data += ` - No ${(mailbox_name == "Inbox") ? `new e-mail messages for - -
-${username}@${minisrv_config.config.service_name} -
` : 'e-mail messages in mailbox ' + mailbox_name} -
-`; - } - data += ` - -
- - -`; - - - } + 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 { - mail_end_error("Access Denied"); + 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) mailstore_exists = session_data.mailstore.createMailstore(); + + if (mailstore_exists) { + // mailstore exists and user is not guest + + var default_limit = (minisrv_config.services[service_name].messages_per_page) ? minisrv_config.services[service_name].messages_per_page : 25; // user config or 25 + 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; + + // get mailbox name + var mailbox_name = session_data.mailstore.getMailboxById(parseInt(mailbox)); + + // if false or null, then mailbox is invalid + if (!mailbox_name) { + mail_end_error("Invalid Mailbox ID"); + } else { + // mailboxid is ok + if (!session_data.mailstore.mailboxExists(mailbox)) { + // mailbox does not yet exist, create it + var mailbox_exists = session_data.mailstore.createMailbox(mailbox); + 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 { + if (total_unread_message_count > 0) { + message_list_string = total_unread_message_count + " new mail message" + ((total_message_count != 1) ? 's' : ''); + 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 "; + } else { + message_list_string = total_message_count + " mail message" + ((total_message_count != 1) ? 's' : '') + " for "; + } + } + + 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`; + + data = ` + + + + ${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} + + + + + + +
+ + + +
+ +
+ + + + + +
+ + + + + + + + + + + +
+
+ + + + +
+
Write +
+ 		+
+
+ + + + +
+
Storage +
+ 		+
+
+ + + + +
+
Addresses +
+ 		+
+
+ + + + +
+
Clean up +
+ 		+
+
+ + +

 

+
+

+
+
+ Quick Tip: + + +
+ + indicates messages from known senders
+ +
+ 		+
+ + + + + + +
+ +
+ +
+ + +
+ + + + `; + var icon_image = null; + switch (mailbox_name) { + case "Inbox": + icon_image = session_data.mailstore.getMailboxIcon(); + break; + case "Sent": + icon_image = "MailboxSent.gif"; + break; + case "Trash": + icon_image = "MailboxDiscard.gif"; + break; + default: + icon_image = "MailboxStorage.gif"; + break; + } + + data += ` + + +
+
+ + +
+ + +
+ + + ${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} + + + + +
+ Settings + 		+ + +
+
+
+ + + -
+ + +
`; + if (message_list) { + + data += ` + ${message_list_string} + + +
+ ${username}@${minisrv_config.config.service_name} +
+
+ +
+ + + +
+ From + Subject + Date +
+ +
+ `; + Object.keys(message_list).forEach(function (k) { + var message = message_list[k]; + if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject); + message.known_sender = session_data.isAddressInAddressBook(message.from_addr); + var message_font_open = ""; + var message_font_close = ""; + if (message.unread) { + message_font_open = ``; + message_font_close = "" + } + data += ` + + + +
+ + +
${(message.known_sender) ? '' : ''} + + ${message_font_open} + ${(message.from_name) ? message.from_name : message.from_addr} + ${message_font_close} + + + ${message_font_open} + ${(message.subject) ? wtvshared.htmlEntitize(message.subject) : "(No Subject)"} + ${message_font_close} + + + ${message_font_open} + `; + var message_date = new Date(message.date * 1000); + data += (message_date.getMonth() + 1) + "/" + message_date.getDate() + "\n"; + data += ` + ${message_font_close} +
+
`; + }); + } else { + data += ` + No ${(mailbox_name == "Inbox") ? `new e-mail messages for + +
+ ${username}@${minisrv_config.config.service_name} +
` : 'e-mail messages in mailbox ' + mailbox_name} +
+ `; + } + data += ` + +
+ + + `; + + + } + } else { + mail_end_error("Access Denied"); + } } } \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js index 843f0864..e5c91c79 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js @@ -2,796 +2,803 @@ var minisrv_service_file = true; var message_snapshot_data = null; var message_voicemail_data = null; -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?came-from=" + encodeURIComponent(request_headers.request_url); -} else if (request_headers.query.clear == "true") { -} else if (request_headers.query.clear == "true") { - if (request_headers.Referer) - gourl = request_headers.Referer.replace(/[\?\&]clear\=true/, ''); - else - gourl = "wtv-mail:/sendmail" - if (request_headers.query.saveoff) delete request_headers.query.saveoff; - session_data.deleteSessionData("usenet_draft"); - session_data.deleteSessionData("usenet_draft_attachments"); - session_data.deleteSessionData("mail_draft"); - session_data.deleteSessionData("mail_draft_attachments"); - if (request_headers.query.message_to) delete request_headers.query.message_to; - if (request_headers.query.message_subject) delete request_headers.query.message_subject; - 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 -wtv-expire-all: wtv-mail:/listmail -wtv-expire-all: wtv-mail:/sendmail -Location: ${gourl}`; +if (!session_data.isRegistered()) { + var errpage = wtvshared.doErrorPage("400", "Sending mail and posting to usenet is not available for guest users."); + headers = errpage[0]; + data = errpage[1]; } 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; + 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?came-from=" + encodeURIComponent(request_headers.request_url); + } else if (request_headers.query.clear == "true") { + } else if (request_headers.query.clear == "true") { + if (request_headers.Referer) + gourl = request_headers.Referer.replace(/[\?\&]clear\=true/, ''); + else + gourl = "wtv-mail:/sendmail" + if (request_headers.query.saveoff) delete request_headers.query.saveoff; + session_data.deleteSessionData("usenet_draft"); + session_data.deleteSessionData("usenet_draft_attachments"); + session_data.deleteSessionData("mail_draft"); + session_data.deleteSessionData("mail_draft_attachments"); + if (request_headers.query.message_to) delete request_headers.query.message_to; + if (request_headers.query.message_subject) delete request_headers.query.message_subject; + 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 + wtv-expire-all: wtv-mail:/listmail + wtv-expire-all: wtv-mail:/sendmail + Location: ${gourl}`; } 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 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 { + 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_body = request_headers.query.message_body || 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_title = request_headers.query.message_title || null; - var no_signature = false; + var msg_subject = msg_subject || request_headers.query.message_subject || 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 msg_url = request_headers.query.message_url || null; + var msg_url_title = request_headers.query.message_title || null; + var no_signature = false; - mail_draft_data = {}; - mail_draft_attachments = {}; - if (!wtvshared.parseBool(request_headers.query.discuss)) { - mail_draft_data = session_data.getSessionData("mail_draft"); - mail_draft_attachments = session_data.getSessionData("mail_draft_attachments") || {}; - if (mail_draft_data && !wtvshared.parseBool(request_headers.query.discuss)) { - 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.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.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; - } - } 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; - } - } - - if (request_headers.query.togglesign == "true") no_signature = false; - 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`; - data = message_snapshot_data; - } else if (message_voicemail_data && request_headers.query.get_gab) { - headers = `200 OK -Content-Type: audio/wav`; - data = message_voicemail_data; - } else { - - var username = session_data.getSessionData("subscriber_username"); - var userdisplayname = wtvshared.htmlEntitize(session_data.getSessionData("subscriber_name")); - var address = username + "@" + minisrv_config.config.service_name //minisrv_config.config.domain_name - var notImplementedAlert = new clientShowAlert({ - 'image': minisrv_config.config.service_logo, - 'message': "This feature is not available.", - 'buttonlabel1': "Okay", - 'buttonaction1': "client:donothing", - 'noback': true, - }).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) { - var from_addr = address; - var signature = session_data.getSessionData("subscriber_signature") || null; - if (typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) { - var attachments = []; - - - if (message_snapshot_data) { - var attachment = { - 'mime': 'image/jpeg', - 'filename': 'snapshot.jpg' - } - if (typeof message_snapshot_data == "object") { - attachment.content = new Buffer.from(message_snapshot_data).toString('base64'); - attachment.is_base64 = true; - } else - attachment.content = message_snapshot_data; - - attachments.push(attachment); - } - - if (message_voicemail_data) { - var attachment = { - 'mime': 'audio/wav', - 'filename': 'voicemail.wav' - } - - if (typeof message_voicemail_data == "object") { - attachment.content = new Buffer.from(message_voicemail_data).toString('base64'); - attachment.is_base64 = true; - } else - attachment.content = message_voicemail_data; - - attachments.push(attachment); - } - - if (newsgroup !== null) { - 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) - 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('') >= 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('') >= 0) { - // usenet attachments - var tuples = []; - if (msg_body.indexOf('') >= 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-mail:/sendmail -Location: wtv-news:/news?group=${newsgroup}`; - sendToClient(socket, headers, ''); - }).catch((e) => { - var err = this.wtvshared.doErrorPage(500, null, e.toString()) - sendToClient(socket, err[0], err[1]); - }); - - - } else { - 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 { - 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:/sendmail -Location: wtv-mail:/listmail`; - } - } - - } else if (request_headers.query.saveoff) { - var mail_draft_data = { - to_addr: to_addr, - msg_subject: msg_subject, - msg_body: msg_body, - no_signature: no_signature, - msg_url: msg_url, - msg_url_title: msg_url_title, - } - if (newsgroup) mail_draft_data.article = article; - session_data.setSessionData((newsgroup) ? "usenet_draft" : "mail_draft", mail_draft_data); - headers = `200 OK -Content-type: text/html -wtv-expire-all: wtv-mail:/sendmail`; + mail_draft_data = {}; + mail_draft_attachments = {}; + if (!wtvshared.parseBool(request_headers.query.discuss)) { + mail_draft_data = session_data.getSessionData("mail_draft"); + mail_draft_attachments = session_data.getSessionData("mail_draft_attachments") || {}; + if (mail_draft_data && !wtvshared.parseBool(request_headers.query.discuss)) { + 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.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.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; } - } else { + } 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; + } + } + if (request_headers.query.togglesign == "true") no_signature = false; + 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: text/html`; - var mail_draft_data = session_data.getSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments") || {}; - if (request_headers.query.snapping == "false") { - headers += "\nwtv-expire-all: cache:snapshot.jpg"; - 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); - } + Content-Type: image/jpeg`; + data = message_snapshot_data; + } else if (message_voicemail_data && request_headers.query.get_gab) { + headers = `200 OK + Content-Type: audio/wav`; + data = message_voicemail_data; + } else { - if (request_headers.query.gabbing == "false") { - headers += "\nwtv-expire-all: cache:voicemail.wav"; - 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); - } + var username = session_data.getSessionData("subscriber_username"); + var userdisplayname = wtvshared.htmlEntitize(session_data.getSessionData("subscriber_name")); + var address = username + "@" + minisrv_config.config.service_name //minisrv_config.config.domain_name + var notImplementedAlert = new clientShowAlert({ + 'image': minisrv_config.config.service_logo, + 'message': "This feature is not available.", + 'buttonlabel1': "Okay", + 'buttonaction1': "client:donothing", + 'noback': true, + }).getURL(); - if (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); - } + 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 signature = session_data.getSessionData("subscriber_signature") || null; + if (typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) { + var attachments = []; - if (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); - } - var message_colors = null; - if (no_signature) message_colors = session_data.mailstore.getSignatureColors(null, true); - else message_colors = session_data.mailstore.getSignatureColors(session_data.getSessionData("subscriber_signature"), true); - data = ` - - - - - - -${pageTitle} - - - -
- - -${(request_headers.query.article) ? `` : ''} - - - - - -
- - - -
- -
- - - - - -
- - - - - - - - -
-
- - -`; - if (newsgroup) { - data += `
-
Group list`; - } else { - data += `Mail list`; - } + if (message_snapshot_data) { + var attachment = { + 'mime': 'image/jpeg', + 'filename': 'snapshot.jpg' + } + if (typeof message_snapshot_data == "object") { + attachment.content = new Buffer.from(message_snapshot_data).toString('base64'); + attachment.is_base64 = true; + } else + attachment.content = message_snapshot_data; -data += `
`; - if (!newsgroup) { - data += ` -		 -
-
- - - - -
-
Address -
`; - } -data += ` -		 -
-
- - - - -
-
Photo -
-		 -
-
- - + attachments.push(attachment); + } - - -
-
Recording -
-		 -
-
- - - - -
-
Erase -
-		 -
-
- -
-		 -
- - - - - - -
- -
- -
- - -
- - - - - -
-
- - -
- - -
- - - -${pageTitle} - - - - -
-
-
- - - - -
- - -
- - - - - - -
-
- - -
- - - - - - - - - -
-From:  - - - -
-${address} -
 -(${userdisplayname}) -
- -
`; - if (!request_headers.query.discuss) { - data += 'To:'; - } else { - data += 'To:'; - } - data += `  - - -
- -
-Subject:  - - -
- -
- -
-`; - if (session_data.getSessionData("subscriber_signature") && session_data.getSessionData("subscriber_signature") != "" && !no_signature) { - data += wtvshared.sanitizeSignature(session_data.getSessionData("subscriber_signature")); - } - if (msg_url) { - data += ` - -Included Page: ${wtvshared.htmlEntitize(msg_url_title).replace(/'/gi, "'")}`; - } - data += ` -		 - -
- - -
-
-
- -
- - -
`; - if (!session_data.getSessionData("subscriber_signature") || session_data.getSessionData("subscriber_signature") == "") { - data += ` `; - } else if (no_signature) { - data += ` - Add signature  -
`; - } else { - data += ` - Remove signature  -
`; - } - data += ` -		 - - -
- -`; + if (message_voicemail_data) { + var attachment = { + 'mime': 'audio/wav', + 'filename': 'voicemail.wav' + } - if ((request_headers.query.snapping && request_headers.query.snapping !== 'false') || mail_draft_attachments.message_snapshot_data) { - data += `
- -
- - - - - - - - -
- - - -
- - - - - - - - - - - - - - -
`; - if (!mail_draft_attachments.message_snapshot_data) { - data += ` -`; + if (typeof message_voicemail_data == "object") { + attachment.content = new Buffer.from(message_voicemail_data).toString('base64'); + attachment.is_base64 = true; + } else + attachment.content = message_voicemail_data; + + attachments.push(attachment); + } + + if (newsgroup !== null) { + 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) + 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('') >= 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('') >= 0) { + // usenet attachments + var tuples = []; + if (msg_body.indexOf('') >= 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-mail:/sendmail + Location: wtv-news:/news?group=${newsgroup}`; + sendToClient(socket, headers, ''); + }).catch((e) => { + var err = this.wtvshared.doErrorPage(500, null, e.toString()) + sendToClient(socket, err[0], err[1]); + }); + + + } else { + 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 { + 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:/sendmail + Location: wtv-mail:/listmail`; + } + } + + } else if (request_headers.query.saveoff) { + var mail_draft_data = { + to_addr: to_addr, + msg_subject: msg_subject, + msg_body: msg_body, + no_signature: no_signature, + msg_url: msg_url, + msg_url_title: msg_url_title, + } + if (newsgroup) mail_draft_data.article = article; + session_data.setSessionData((newsgroup) ? "usenet_draft" : "mail_draft", mail_draft_data); + headers = `200 OK + Content-type: text/html + wtv-expire-all: wtv-mail:/sendmail`; + } + } else { + + headers = `200 OK + Content-type: text/html`; + var mail_draft_data = session_data.getSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments") || {}; + if (request_headers.query.snapping == "false") { + headers += "\nwtv-expire-all: cache:snapshot.jpg"; + 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); } - data += ` -
- -
-
- -
- - - Detach  -
-
- -
- - - -`; - } + if (request_headers.query.gabbing == "false") { + headers += "\nwtv-expire-all: cache:voicemail.wav"; + 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); + } - if ((request_headers.query.gabbing && request_headers.query.gabbing !== 'false') || mail_draft_attachments.message_voicemail_data) { - data += ` -
- - - -
- -
- -
- - - - - - -
- - - -
- - - - - - - - - - - - - - -
- -${(!mail_draft_attachments.message_voicemail_data) ? '' : ''} -
- -
-  Recording - - - Detach  -
- -
- - - -`; + if (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); + } + + if (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); + } + var message_colors = null; + if (no_signature) message_colors = session_data.mailstore.getSignatureColors(null, true); + else message_colors = session_data.mailstore.getSignatureColors(session_data.getSessionData("subscriber_signature"), true); + + data = ` + + + + + + + ${pageTitle} + + + + + + + ${(request_headers.query.article) ? `` : ''} + + + +
- - - -
- -
+ +
+ + + +
+ +
+ + + + + +
+ + + + + + + + +
+
+ + + `; + if (newsgroup) { + data += `
+
Group list`; + } else { + data += `Mail list`; + } + + data += `
`; + if (!newsgroup) { + data += ` + 		+
+
+ + + + +
+
Address +
`; + } + data += ` + 		+
+
+ + + + +
+
Photo +
+ 		+
+
+ + + + + +
+
Recording +
+ 		+
+
+ + + + +
+
Erase +
+ 		+
+
+ +
+ 		+
+ + + + + + +
+ +
+ +
+ + +
+ + + + + +
+
+ + +
+ + +
+ + + + ${pageTitle} + + + + +
+
+
+ + + + +
+ + +
+ + + + + + +
+
+ + +
+ + + + + + + + + +
+ From:  + + + +
+ ${address} +
+ (${userdisplayname}) +
+ +
`; + if (!request_headers.query.discuss) { + data += 'To:'; + } else { + data += 'To:'; + } + data += `  + + +
+ +
+ Subject:  + + +
+ +
+ +
+ `; + if (session_data.getSessionData("subscriber_signature") && session_data.getSessionData("subscriber_signature") != "" && !no_signature) { + data += wtvshared.sanitizeSignature(session_data.getSessionData("subscriber_signature")); + } + if (msg_url) { + data += ` + + Included Page: ${wtvshared.htmlEntitize(msg_url_title).replace(/'/gi, "'")}`; + } + data += ` + 		+ +
+ + +
+
+
+ +
+ + +
`; + if (!session_data.getSessionData("subscriber_signature") || session_data.getSessionData("subscriber_signature") == "") { + data += ` `; + } else if (no_signature) { + data += ` +  Add signature  +
`; + } else { + data += ` +  Remove signature  +
`; + } + data += ` + 		+ + +
+ + `; + + if ((request_headers.query.snapping && request_headers.query.snapping !== 'false') || mail_draft_attachments.message_snapshot_data) { + data += `
+ +
+ + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + +
`; + if (!mail_draft_attachments.message_snapshot_data) { + data += ` + `; + } + + data += ` +
+ +
+
+ +
+ + +  Detach  +
+
+ +
+ + + + `; + } + + if ((request_headers.query.gabbing && request_headers.query.gabbing !== 'false') || mail_draft_attachments.message_voicemail_data) { + data += ` +
+ + + +
+ +
+ +
+ + + + + + +
+ + + +
+ + + + + + + + + + + + + + +
+ + ${(!mail_draft_attachments.message_voicemail_data) ? '' : ''} +
+ +
+   Recording + + +  Detach  +
+ +
+ + + + `; + } + data += ` + + +
+ + + +
+ +
+ + + `; } - data += ` - -
- - -`; } } } \ No newline at end of file