domma-cms 1.6.37 → 1.6.39

package/plugins/support/tests/shape.test.js

@@ -5,7 +5,7 @@ import {
     addTurn, buildMessagePayload, buildTicketPayload, cleanRequest, cleanUpdate, contactCard, createThrottle, lastDommaAt,
     receivedTicket, senderView, telHref, toCustomerEmail, toDommaEmail
 } from '../lib/shape.js';
-import {applyShelf, createOutbox, flush, mergeTickets} from '../lib/sender.js';
+import {applyShelf, createOutbox, flush, keepFiles, mergeTickets} from '../lib/sender.js';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -18,7 +18,7 @@ test('a request needs a subject and a message; unknown choices fall back', () =>
     assert.equal(cleanRequest({body: 'x'}).error, 'Give it a short subject.');
     assert.equal(cleanRequest({subject: 'x'}).error, 'Tell us what you need.');
     const {request} = cleanRequest({subject: '  Site\n down ', body: ' help\r\nplease ', category: 'nope', priority: 'panic', where: '/shop'});
-    assert.deepEqual(request, {category: 'help', priority: 'normal', subject: 'Site down', body: 'help\nplease', where: '/shop'});
+    assert.deepEqual(request, {category: 'help', priority: 'normal', subject: 'Site down', body: 'help\nplease', where: '/shop', attachments: []});
     assert.equal(cleanRequest({subject: 's', body: 'b', priority: 'urgent'}).request.priority, 'urgent');
 });
 
@@ -187,3 +187,77 @@ test('review: a request removed while a send is in flight is not half-deleted, a
         assert.ok(!posted.includes('T3') && !posted.includes('M3'));
     } finally { fs.rmSync(dir, {recursive: true, force: true}); }
 });
+
+// ---- Attachments (1.1.4) ----
+
+import {ATTACHMENTS, attachmentsOf, cleanAttachment, cleanAttachments, cleanMessage} from '../lib/shape.js';
+
+const FID = '0f8fad5b-d9cb-469f-a165-70867728950e';
+const file = (n = 1, extra = {}) => ({id: `${FID.slice(0, -1)}${n}`, name: `shot${n}.png`, type: 'image/png', size: 10, ...extra});
+
+test('an attachment: a known type, a server-made id, a size within the cap', () => {
+    assert.deepEqual(cleanAttachment(file(1, {junk: 1})), {id: file(1).id, name: 'shot1.png', type: 'image/png', size: 10});
+    assert.equal(cleanAttachment(file(1, {type: 'image/svg+xml'})), null, 'SVG can carry script');
+    assert.equal(cleanAttachment(file(1, {type: 'text/html'})), null);
+    assert.equal(cleanAttachment(file(1, {id: '../../x'})), null);
+    assert.equal(cleanAttachment(file(1, {size: ATTACHMENTS.maxBytes + 1})), null);
+    assert.equal(cleanAttachment(file(1, {name: '/etc/"passwd'})).name, '_passwd');
+    assert.equal(cleanAttachments([file(1), file(2), file(3), file(4), file(1)]).length, 3, 'three at most, each once');
+});
+
+test('files ride on a message: announced not stored, carried by a follow-up, shown to the site', () => {
+    const {request} = cleanRequest({subject: 's', body: 'b', attachments: [file(1), {id: 'nope'}]});
+    assert.equal(request.attachments.length, 1);
+    const {data} = receivedTicket(buildTicketPayload({request, user: {name: 'Ann'}, ref: 'r1'}), 'acme', T0);
+    assert.equal(data.messages[0].attachments[0].stored, false);
+    assert.equal(cleanMessage({body: '', attachments: [file(2)]}).error, 'Write a message first.', 'files go with words');
+    const msg = buildMessagePayload({ticketRef: 'r1', ref: 'm1', body: 'and this', attachments: [file(2)]});
+    assert.equal(msg.attachments.length, 1);
+    assert.equal(buildMessagePayload({ticketRef: 'r1', ref: 'm2', close: true, attachments: [file(3)]}).attachments, undefined, 'a close carries none');
+    const next = addTurn(data, {from: 'customer', name: 'Ann', body: 'and this', id: 'm1', at: T1, attachments: msg.attachments}).data;
+    assert.deepEqual(attachmentsOf(next).map(a => [a.name, a.messageId, a.stored]), [['shot1.png', 'r1', false], ['shot2.png', 'm1', false]]);
+    const view = senderView({id: 'e1', data: next});
+    assert.deepEqual(view.messages[1].attachments, [{id: file(2).id, name: 'shot2.png', type: 'image/png', size: 10, stored: false}]);
+    assert.equal(view.messages[0].attachments[0].messageId, undefined);
+});
+
+test('a sent message stays in the outbox until its files have gone', () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'sp-files-'));
+    try {
+        const ob = createOutbox(dir);
+        ob.add('ticket', {ref: 'r1', subject: 's', body: 'b', attachments: [file(1)]});
+        ob.mark('r1', {state: 'sent'});
+        const remote = [{ref: 'r1', subject: 's', status: 'open', messages: [{id: 'r1', from: 'customer', body: 'b', at: T0}]}];
+        ob.remember(remote);
+        assert.equal(ob.all().length, 1, 'kept: its file has not gone');
+        assert.ok(ob.fileIds().has(file(1).id));
+        ob.fileSent('r1', file(1).id);
+        ob.remember(remote);
+        assert.equal(ob.all().length, 0, 'now done with');
+        assert.ok(ob.fileIds().has(file(1).id), 'the file itself is still wanted: the thread shows it');
+    } finally { fs.rmSync(dir, {recursive: true, force: true}); }
+});
+
+test('files kept for the thread go when the manager no longer has their request', () => {
+    const remote = [{ref: 't1', messages: [{id: 'm1', attachments: [{id: 'f1'}]}, {id: 'm2'}]}];
+    const items = [{ref: 'm9', payload: {attachments: [{id: 'f3'}]}}];
+    assert.deepEqual(keepFiles(['f1', 'f2', 'f3'], remote, items), ['f1', 'f3'], 'f2 was on a request deleted at the manager');
+    assert.deepEqual(keepFiles(['f1'], [], []), []);
+    assert.deepEqual(keepFiles(undefined, remote), []);
+});
+
+test('remember(): a deleted request takes its files out of the keep list', () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'sup-outbox-'));
+    try {
+        const box = createOutbox(dir);
+        box.add('ticket', {ref: 't1', attachments: [{id: 'f1'}]});
+        box.mark('t1', {state: 'sent'});
+        box.fileSent('t1', 'f1');
+        box.remember([{ref: 't1', messages: [{id: 't1', attachments: [{id: 'f1'}]}]}], null);
+        assert.ok(box.fileIds().has('f1'), 'still on the manager: kept');
+        box.remember([], null);
+        assert.equal(box.fileIds().has('f1'), false, 'deleted on the manager: no longer kept');
+    } finally {
+        fs.rmSync(dir, {recursive: true, force: true});
+    }
+});

package/server/routes/outreach-public.js

@@ -40,7 +40,7 @@ const badLink = () => page('Unsubscribe', '<h1>That link is not right.</h1><p>Us
 
 /** The confirm page: the same e and k, posted back by one button. */
 function confirmPage(email, e, k) {
-    return page('Unsubscribe', `<h1>Unsubscribe?</h1><p>${esc(email)} will get no more campaign or survey emails from this site.</p>`
+    return page('Unsubscribe', `<h1>Unsubscribe?</h1><p>${esc(email)} will get no more campaign, survey or onboarding emails from this site.</p>`
         + `<form method="post" action="${UNSUBSCRIBE_PATH}"><input type="hidden" name="e" value="${esc(e)}"><input type="hidden" name="k" value="${esc(k)}">`
         + `<button type="submit" class="btn btn-primary">Unsubscribe</button></form>`);
 }
@@ -107,6 +107,6 @@ export async function outreachPublicRoutes(fastify, opts = {}) {
         if (!opts.col) await ensureList();
         await suppression.add(email, 'unsubscribe-link');
         return html(reply).send(page('Unsubscribed',
-            `<h1>You are unsubscribed.</h1><p>${esc(email)} will get no more campaign or survey emails from this site.</p>`));
+            `<h1>You are unsubscribed.</h1><p>${esc(email)} will get no more campaign, survey or onboarding emails from this site.</p>`));
     });
 }

package/server/services/request-log.js

@@ -12,7 +12,9 @@
  */
 
 /** Parameter names redacted whatever their case. */
-const SENSITIVE = new Set(['token', 't', 'key', 'hostkey', 'invitekey']);
+// `code` and `state`: an OAuth2 callback (the mail sign-in) carries a live
+// authorisation code and its one-time ticket in the query string.
+const SENSITIVE = new Set(['token', 't', 'key', 'hostkey', 'invitekey', 'code', 'state']);
 
 /** Anything with secret or password in the name is redacted too. */
 const SENSITIVE_PATTERN = /secret|password|passwd/i;