From 9bea13151c5fd4642c20dcc8adc73474b73368d2 Mon Sep 17 00:00:00 2001 From: zefie Date: Thu, 13 Oct 2022 23:54:39 -0400 Subject: [PATCH] fix 301 and 302 not redirecting in http(s) proxy - also add experimental beta mail signature preview option --- .../ServiceVault/wtv-mail/get-signature.js | 7 +++++++ .../ServiceVault/wtv-setup/mail-signature.js | 11 ++++++++--- zefie_wtvp_minisrv/app.js | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js index f18d5cdf..a3108c02 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js @@ -6,12 +6,19 @@ var messageid = request_headers.query.message_id || null; if (!messageid) { // get user signature data = session_data.getSessionData("subscriber_signature"); + if (request_headers.query.demotext) data += "
" + request_headers.query.demotext; } else { // get message signature var message = session_data.mailstore.getMessageByID(messageid); if (!message) errpage = wtvshared.doErrorPage(400, "Invalid Message ID"); data = message.signature } + +if (request_headers.query.sanitize) { + var message_colors = session_data.mailstore.getSignatureColors(data) + data = wtvshared.sanitizeSignature(data).replace("", ``); + +} if (!errpage) { headers = `200 OK wtv-trusted: false diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js index 3f8af98a..c71b99e0 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js @@ -99,13 +99,18 @@ font=proportional>${session_data.getSessionData("subscriber_signature") || ""} +${(request_headers.query.preview) ? `Signature Preview:

edit it here.`)}" height=40>

` : ''} - - + +
+ + +
+ - +
diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 12020e24..839a0512 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -812,6 +812,7 @@ async function doHTTPProxy(socket, request_headers) { port: request_data.port, path: request_data.path, method: request_data.method, + followAllRedirects: true, headers: { "User-Agent": request_headers["User-Agent"] || "WebTV" }