imapflow 1.6.5 → 1.6.6

package/test/copyuid-parser-test.js

@@ -151,3 +151,23 @@ module.exports['CopyUID Parser: uidValidity zero is stored as BigInt(0)'] = test
     test.equal(map.uidMap.get(1), 100);
     test.done();
 };
+
+// ============================================
+// Hostile server input
+// ============================================
+
+module.exports['CopyUID Parser: non-decimal uidValidity is ignored, uidMap still parsed'] = test => {
+    // isNaN() passed values like "1e5" and "Infinity" through, and BigInt() then threw,
+    // losing the whole COPYUID result
+    let map = {};
+    parseCopyUid(makeResponse([{ value: 'COPYUID' }, { value: '1e5' }, { value: '1' }, { value: '100' }]), map);
+    test.equal(map.uidValidity, undefined);
+    test.ok(map.uidMap instanceof Map);
+    test.equal(map.uidMap.get(1), 100);
+
+    let map2 = {};
+    parseCopyUid(makeResponse([{ value: 'COPYUID' }, { value: 'Infinity' }, { value: '1' }, { value: '100' }]), map2);
+    test.equal(map2.uidValidity, undefined);
+    test.equal(map2.uidMap.get(1), 100);
+    test.done();
+};

package/test/imap-flow-coverage-test.js

@@ -591,9 +591,11 @@ module.exports['Coverage: reader caps very large throttle backoff'] = async test
     let readerPromise = runReaderWith(client, ['A1 BAD Request is throttled. Suggested Backoff Time: 999999999 milliseconds']);
     // give the reader a tick to register the throttle timer, then abort it
     await drain();
-    if (typeof client._throttleAbort === 'function') {
-        client._throttleAbort(true);
+    for (let entry of client._throttleWaits) {
+        clearTimeout(entry.timer);
+        entry.resolve(true);
     }
+    client._throttleWaits.clear();
     await readerPromise;
     test.ok(rejected);
     test.done();

package/test/imap-flow-fetch-download-test.js

@@ -852,3 +852,29 @@ module.exports['DownloadMany: decodes base64 and quoted-printable parts'] = asyn
     test.equal(res['3'].meta.disposition, 'attachment');
     test.done();
 };
+
+module.exports['Download: a buffering transform cannot defeat maxBytes'] = async test => {
+    // format=flowed unwrapping and the Japanese charset decoder both hold their whole input
+    // before emitting anything, so the limiter at the tail of the pipeline reports
+    // `limited === false` however much the server sends. Without a bound of their own the fetch
+    // loop would keep pulling the entire part.
+    for (let contentType of ['text/plain; format=flowed', 'text/plain; charset=iso-2022-jp']) {
+        let client = makeClient();
+        let mime = Buffer.from(`Content-Type: ${contentType}\r\nContent-Disposition: inline\r\n\r\n`);
+        let calls = 0;
+        client.fetchOne = async () => {
+            calls++;
+            let bodyParts = new Map();
+            bodyParts.set('2.mime', mime);
+            // full-size chunks keep hasMore true; the loop must stop on its own, not run dry
+            bodyParts.set('2', calls <= 40 ? Buffer.alloc(1024, 0x61) : Buffer.alloc(1));
+            return { uid: 1, size: 1024 * 1024, bodyParts };
+        };
+
+        let { content } = await client.download('1', '2', { chunkSize: 1024, maxBytes: 512 });
+        let data = await collect(content);
+        test.ok(data.length <= 512, `${contentType}: delivered ${data.length} bytes, expected no more than 512`);
+        test.ok(calls <= 3, `${contentType}: the fetch loop must stop at the bound, made ${calls} calls`);
+    }
+    test.done();
+};

package/test/imap-flow-methods-test.js

@@ -795,3 +795,95 @@ module.exports['Methods: autoEnable does not retry when disableIMAP4rev2 already
     test.equal(calls.length, 1);
     test.done();
 };
+
+module.exports['Methods: untaggedExpunge refuses an unusable sequence number'] = async test => {
+    // Same bound untaggedExists() applies: an overflowing or non-decimal value must not
+    // decrement the live message count
+    let client = makeClient();
+    client.mailbox.exists = 10;
+    let events = [];
+    client.on('expunge', e => events.push(e));
+
+    await client.untaggedExpunge(false);
+    for (let bad of ['9'.repeat(400), '1e5', '0', 'abc', '']) {
+        await client.untaggedExpunge({ command: bad });
+    }
+    test.equal(client.mailbox.exists, 10, 'the live message count must be left alone');
+    test.equal(events.length, 0);
+
+    await client.untaggedExpunge({ command: '3' });
+    test.equal(client.mailbox.exists, 9, 'a usable sequence number is still applied');
+    test.equal(events.length, 1);
+    test.equal(events[0].seq, 3);
+    test.done();
+};
+
+module.exports['Methods: untaggedVanished survives a malformed response'] = async test => {
+    // "* VANISHED (EARLIER)" leaves no sequence set at all. Throwing here would abort the
+    // handler for the whole response, and handleResponse only warns - so every expunge the
+    // response did carry would be dropped and the client's mailbox view would go stale.
+    let client = makeClient();
+    let events = [];
+    client.on('expunge', e => events.push(e));
+
+    await client.untaggedVanished({ attributes: [[{ value: 'EARLIER' }]] });
+    await client.untaggedVanished({ attributes: [] });
+    await client.untaggedVanished({});
+    await client.untaggedVanished({ attributes: [[{ value: 'EARLIER' }], null] });
+
+    test.equal(events.length, 0, 'nothing to report, and nothing thrown');
+
+    // a well-formed response still works after the malformed ones
+    await client.untaggedVanished({ attributes: [[{ value: 'EARLIER' }], { value: '5:6' }] });
+    test.equal(events.length, 2);
+    test.equal(events[0].uid, 5);
+    test.equal(events[0].earlier, true);
+    test.done();
+};
+
+module.exports['Methods: untaggedExists refuses an overflowing count'] = async test => {
+    // Number('9'.repeat(400)) is Infinity: resolveRange('*') would then compile the literal
+    // string "Infinity" and every range-based command would fail until the next SELECT
+    let client = makeClient();
+    client.mailbox = { path: 'INBOX', exists: 5 };
+    let events = [];
+    client.on('exists', e => events.push(e));
+
+    await client.untaggedExists(false);
+    await client.untaggedExists({});
+    for (let bad of ['9'.repeat(400), '1e5', '-1', 'abc', '1.5', '']) {
+        await client.untaggedExists({ command: bad });
+    }
+    test.equal(client.mailbox.exists, 5, 'the live message count must be left alone');
+    test.equal(events.length, 0);
+
+    await client.untaggedExists({ command: '7' });
+    test.equal(client.mailbox.exists, 7, 'a usable count is still applied');
+    test.equal(events.length, 1);
+    test.done();
+};
+
+module.exports['Methods: throttleWait caps the delay and close() aborts it'] = async test => {
+    let client = makeClient();
+
+    // A server hint is unbounded; the wait may never outlive the client either
+    let started = Date.now();
+    let pending = client.throttleWait(7 * 24 * 3600 * 1000);
+    test.equal(client._throttleWaits.size, 1, 'the wait is tracked so close() can reach it');
+
+    client.close();
+    test.equal(await pending, true, 'an aborted wait reports true');
+    test.equal(client._throttleWaits.size, 0, 'the tracked wait is released');
+    test.ok(Date.now() - started < 5000, 'close() must not wait out the delay');
+
+    // normal expiry reports false and releases the entry. The back-off timer is deliberately
+    // unref'd, so the test has to hold the event loop open itself - in a real session the
+    // socket does that.
+    let client2 = makeClient();
+    let keepAlive = setTimeout(() => {}, 1000);
+    test.equal(await client2.throttleWait(1), false);
+    clearTimeout(keepAlive);
+    test.equal(client2._throttleWaits.size, 0);
+    client2.close();
+    test.done();
+};

package/test/imap-stream-edge-cases-test.js

@@ -528,3 +528,139 @@ module.exports['Literal marker still accepts sizes at the digit-length bound'] =
     test.equal(ok.literalWaiting, 1024);
     test.done();
 };
+
+module.exports['Response assembly enforces the cumulative size cap'] = test => {
+    // The per-line and per-literal caps alone cannot stop a response spread across many
+    // tokens: under a 40-byte response budget, a 25-byte marker line plus a declared
+    // 10-byte literal fits (35), but the next marker line (16 bytes + 10 declared) must
+    // trip the cap - before the second literal's bytes are even read
+    const stream = new ImapStream({ cid: 'test', maxResponseSize: 40 });
+    let streamErr = null;
+    stream.on('error', err => {
+        streamErr = err;
+    });
+    stream.resume();
+
+    stream.write(Buffer.from('* 1 FETCH (BODY[1] {10}\r\n'));
+    stream.write(Buffer.from('0123456789'));
+    stream.write(Buffer.from(' BODY[2] {10}\r\n0123456789)\r\n'));
+
+    setTimeout(() => {
+        test.ok(streamErr, 'an oversized cumulative response must fail the stream');
+        test.equal(streamErr && streamErr.code, 'ResponseTooLarge');
+        test.ok(stream.destroyed, 'the stream must fail closed instead of parsing the rejected payload');
+        test.done();
+    }, 100);
+};
+
+// Resolves once the stream has settled - on its first 'error', or on 'end' when it is
+// consumed to completion. Waiting for the real signal keeps these tests off fixed sleeps.
+const settle = stream =>
+    new Promise(resolve => {
+        stream.once('error', err => resolve(err));
+        stream.once('end', () => resolve(null));
+    });
+
+module.exports['Response size budget resets between responses'] = async test => {
+    // The counter tracks a single response, not the whole session. Each response here fits
+    // the 40-byte budget on its own but the two together do not, so a counter that failed to
+    // reset would trip the cap on the second one - which is what makes this test detect the
+    // regression rather than merely pass alongside it.
+    const line = '* OK ' + 'a'.repeat(23) + '\r\n'; // 30 bytes, two of them exceed the budget
+    const stream = new ImapStream({ cid: 'test', maxResponseSize: 40 });
+    let streamErr = null;
+    let count = 0;
+    stream.on('error', err => {
+        streamErr = err;
+    });
+    stream.on('data', cmd => {
+        count++;
+        cmd.next();
+    });
+
+    test.ok(line.length <= 40 && line.length * 2 > 40, 'each response fits the budget, the pair does not');
+
+    stream.write(Buffer.from(line + line));
+    stream.end();
+
+    await settle(stream);
+    test.ifError(streamErr);
+    test.equal(count, 2);
+    test.done();
+};
+
+module.exports['Response size cap defaults above the literal cap'] = test => {
+    // The response total also carries the literal marker line and the rest of the framing, so
+    // a default equal to the literal cap would make a literal of exactly the maximum permitted
+    // size impossible to receive
+    const stream = new ImapStream({ cid: 'test' });
+    test.equal(stream.maxResponseSize, 2 * 1024 * 1024 * 1024);
+    test.ok(stream.maxResponseSize > stream.maxLiteralSize, 'the response cap must leave headroom above the literal cap');
+    test.done();
+};
+
+module.exports['A literal of exactly maxLiteralSize is accepted when the response cap leaves headroom'] = async test => {
+    const stream = new ImapStream({ cid: 'test', maxLiteralSize: 100, maxResponseSize: 200 });
+    let streamErr = null;
+    let received = null;
+    stream.on('error', err => {
+        streamErr = err;
+    });
+    stream.on('data', cmd => {
+        received = cmd;
+        cmd.next();
+    });
+
+    stream.write(Buffer.from('* 1 FETCH (BODY[] {100}\r\n'));
+    stream.write(Buffer.from('x'.repeat(100)));
+    stream.write(Buffer.from(')\r\n'));
+    stream.end();
+
+    await settle(stream);
+    test.ifError(streamErr);
+    test.ok(received, 'a literal at exactly the configured maximum must be delivered');
+    test.equal(received.literals.length, 1);
+    test.equal(received.literals[0].length, 100);
+    test.done();
+};
+
+module.exports['An unterminated line is bounded by the response budget'] = async test => {
+    // maxResponseSize is only committed when a line completes, so an in-progress line has to
+    // be measured against the remaining budget separately - otherwise a response cap lowered
+    // to bound parser memory buys nothing while a server streams a line that never ends
+    const stream = new ImapStream({ cid: 'test', maxResponseSize: 64 });
+    stream.resume();
+
+    stream.write(Buffer.from('x'.repeat(1024))); // no line terminator anywhere
+
+    let err = await settle(stream);
+    test.ok(err, 'an unterminated line beyond the response budget must fail the stream');
+    test.equal(err.code, 'ResponseTooLarge');
+    test.ok(stream.lineBytes <= 64, 'no more than the budget may stay buffered');
+    test.done();
+};
+
+module.exports['Infinity disables a parser size cap'] = test => {
+    // A cap that cannot be disabled forces a caller who knows their server onto the default
+    const stream = new ImapStream({ cid: 'test', maxResponseSize: Infinity, maxLiteralSize: Infinity, maxLineLength: Infinity });
+    test.equal(stream.maxResponseSize, Infinity);
+    test.equal(stream.maxLiteralSize, Infinity);
+    test.equal(stream.maxLineLength, Infinity);
+    test.done();
+};
+
+module.exports['A marker line that fits the budget can still be refused for its literal'] = async test => {
+    // The line is measured against the budget as it is assembled, but the declared literal is
+    // only charged once the marker line completes - so the cap has to be enforced in both places
+    const stream = new ImapStream({ cid: 'test', maxResponseSize: 40 });
+    stream.resume();
+
+    // 25-byte marker line fits on its own; the 30 declared literal bytes push the total past 40
+    stream.write(Buffer.from('* 1 FETCH (BODY[1] {30}\r\n'));
+
+    let err = await settle(stream);
+    test.ok(err, 'the declared literal must be charged before its bytes arrive');
+    test.equal(err.code, 'ResponseTooLarge');
+    test.equal(err.responseSize, 55);
+    test.done();
+};

package/test/jp-decoder-test.js

@@ -245,3 +245,60 @@ module.exports['JPDecoder: handles EUC-JP charset'] = async test => {
     test.ok(result.length > 0);
     test.done();
 };
+
+// ============================================
+// maxBytes buffering bound
+// ============================================
+
+module.exports['JPDecoder: buffers at most maxBytes'] = test => {
+    // The whole-input buffering must honor the caller's download limit: without the
+    // bound a server could defeat maxBytes just by labelling a part with a Japanese
+    // charset, since nothing is emitted (and limited) until _flush
+    let decoder = new JPDecoder('iso-2022-jp', 8);
+    decoder.resume();
+
+    decoder.write(Buffer.from('hello '));
+    decoder.write(Buffer.from('world'));
+
+    test.equal(decoder.chunklen, 8);
+    test.equal(Buffer.concat(decoder.chunks).toString(), 'hello wo');
+    decoder.end();
+    test.done();
+};
+
+module.exports['JPDecoder: a fractional maxBytes still bounds the decoder'] = test => {
+    // A computed limit (a percentage of a budget, say) is not an integer, and silently turning
+    // that into "no limit at all" is exactly the exposure the bound exists to close
+    const decoder = new JPDecoder('sjis', 512.5);
+    test.equal(decoder.maxBytes, 512, 'a fractional bound is floored to a whole byte count');
+    decoder.resume();
+    decoder.write(Buffer.alloc(1024, 0x61));
+    test.equal(decoder.chunklen, 512, 'nothing beyond the bound is buffered');
+    test.equal(decoder.limited, true, 'the decoder reports that it is full');
+    decoder.end();
+    test.done();
+};
+
+module.exports['JPDecoder: a non-numeric maxBytes leaves the decoder unbounded'] = test => {
+    test.equal(new JPDecoder('sjis').maxBytes, Infinity);
+    test.equal(new JPDecoder('sjis', Infinity).maxBytes, Infinity);
+    test.equal(new JPDecoder('sjis', 'lots').maxBytes, Infinity);
+    test.equal(new JPDecoder('sjis', -1).maxBytes, Infinity);
+    test.equal(new JPDecoder('sjis').limited, false);
+    test.done();
+};
+
+module.exports['JPDecoder: reports limited once the bound is reached'] = test => {
+    // The decoder emits nothing until _flush, so a limiter downstream cannot tell that it is
+    // full - the download loop reads this flag instead to stop pulling from the server
+    const decoder = new JPDecoder('sjis', 10);
+    decoder.resume();
+    test.equal(decoder.limited, false);
+    decoder.write(Buffer.alloc(4, 0x61));
+    test.equal(decoder.limited, false, 'not full yet');
+    decoder.write(Buffer.alloc(6, 0x61));
+    test.equal(decoder.limited, true);
+    test.equal(decoder.chunklen, 10);
+    decoder.end();
+    test.done();
+};

package/test/limited-passthrough-test.js

@@ -273,3 +273,27 @@ module.exports['LimitedPassthrough: single byte writes'] = async test => {
     test.equal(result.toString(), 'abc');
     test.done();
 };
+
+module.exports['LimitedPassthrough: a fractional maxBytes is floored so limited is reachable'] = async test => {
+    // With a fractional bound `processed` can only ever reach its floor, so `limited` would
+    // never flip - and the download loop polls exactly that flag to stop pulling
+    let stream = new LimitedPassthrough({ maxBytes: 512.5 });
+    test.equal(stream.maxBytes, 512);
+
+    let chunks = [];
+    stream.on('data', chunk => chunks.push(chunk));
+    stream.write(Buffer.alloc(1024, 0x61));
+    stream.end();
+    await new Promise(resolve => stream.on('end', resolve));
+
+    test.equal(Buffer.concat(chunks).length, 512);
+    test.equal(stream.limited, true, 'the limiter must report that it is full');
+    test.done();
+};
+
+module.exports['LimitedPassthrough: a numeric-string maxBytes is honored'] = test => {
+    test.equal(new LimitedPassthrough({ maxBytes: '100' }).maxBytes, 100);
+    test.equal(new LimitedPassthrough({ maxBytes: 'lots' }).maxBytes, Infinity);
+    test.equal(new LimitedPassthrough({ maxBytes: -5 }).maxBytes, Infinity);
+    test.done();
+};

package/test/parser-limits-test.js

@@ -9,6 +9,7 @@
 
 const { ImapStream } = require('../lib/handler/imap-stream');
 const { parser } = require('../lib/handler/imap-handler');
+const { MAX_LINE_SIZE, MAX_LITERAL_SIZE, MAX_RESPONSE_SIZE } = require('../lib/handler/limits');
 
 // Collects every emitted command payload and the first stream error. `error` resolves once the
 // stream fails; `settled` resolves once processing has quiesced (error or writable end).
@@ -272,3 +273,20 @@ module.exports['Parser limits: maxLiteralSize 0 rejects any non-empty inline lit
     test.equal(err.maxSize, 0);
     test.done();
 };
+
+module.exports['Parser limits: a junk limit falls back to the default'] = test => {
+    // Without validation an unusable value is honored as-is, and every comparison against it is
+    // false - so a caller who mistypes a limit silently gets no bound at all, or (for a negative
+    // value) a bound that rejects everything
+    for (let junk of ['4096', 'abc', 1.5, -1, -Infinity, null, {}, [], NaN, true]) {
+        const stream = new ImapStream({ cid: 'test', maxLineLength: junk, maxLiteralSize: junk, maxResponseSize: junk });
+        test.equal(stream.maxLineLength, MAX_LINE_SIZE, `maxLineLength ${JSON.stringify(junk)} must fall back`);
+        test.equal(stream.maxLiteralSize, MAX_LITERAL_SIZE, `maxLiteralSize ${JSON.stringify(junk)} must fall back`);
+        test.equal(stream.maxResponseSize, MAX_RESPONSE_SIZE, `maxResponseSize ${JSON.stringify(junk)} must fall back`);
+    }
+
+    // an explicit 0 is a real limit, not a missing one, and must not be swallowed
+    const zero = new ImapStream({ cid: 'test', maxLiteralSize: 0 });
+    test.equal(zero.maxLiteralSize, 0);
+    test.done();
+};

package/test/reliability-improvements-test.js

@@ -422,14 +422,14 @@ module.exports['Reliability: throttle back-off aborts promptly on close()'] = as
 
     // Let reader() reach the (tracked) back-off wait.
     await new Promise(r => setTimeout(r, 50));
-    test.ok(client._throttleTimer, 'back-off timer is tracked while waiting');
+    test.equal(client._throttleWaits.size, 1, 'back-off wait is tracked while waiting');
 
     client.close();
     await new Promise(r => setImmediate(r));
 
     test.ok(rejected, 'request rejected promptly after close()');
     test.equal(rejected.code, 'NoConnection', 'rejected with connection error, not ETHROTTLE');
-    test.equal(client._throttleTimer, null, 'throttle timer cleared on close()');
+    test.equal(client._throttleWaits.size, 0, 'throttle wait cleared on close()');
     test.ok(Date.now() - start < 5000, 'settled well under the 5-minute cap');
 
     await readerDone;
@@ -457,7 +457,7 @@ module.exports['Reliability: throttle back-off still rejects ETHROTTLE on normal
     test.ok(rejected, 'request rejected after the back-off elapses');
     test.equal(rejected.code, 'ETHROTTLE', 'normal expiry still rejects ETHROTTLE');
     test.equal(rejected.throttleReset, 50, 'throttleReset preserved');
-    test.equal(client._throttleTimer, null, 'throttle timer cleared after normal expiry');
+    test.equal(client._throttleWaits.size, 0, 'throttle wait cleared after normal expiry');
 
     await readerDone;
     client.close();

package/test/timer-policy-test.js

@@ -208,7 +208,33 @@ module.exports['Timers: the throttle back-off timer is unrefd and cleared'] = as
 
         // history() returns snapshots, so re-read it after close()
         test.ok(timers.history().find(timer => timer.id === backoff.id).cleared, 'close() clears the back-off timer');
-        test.equal(client._throttleTimer, null);
+        test.equal(client._throttleWaits.size, 0);
+        test.done();
+    });
+};
+
+module.exports['Timers: throttleWait caps a server-suggested back-off'] = async test => {
+    // The delay comes straight from a server hint (a Microsoft 365 "Suggested Backoff Time"),
+    // which is unbounded. Asserted on the armed timer rather than by waiting it out.
+    await withFakeTimers(async timers => {
+        let client = makeClient({ port: 1 });
+
+        let pending = client.throttleWait(7 * 24 * 3600 * 1000); // a week
+        let armed = timers.history()[timers.history().length - 1];
+        test.equal(armed.delay, 5 * 60 * 1000, 'the back-off is capped at five minutes');
+        test.ok(armed.unrefd, 'the back-off timer must not keep the process alive');
+
+        client.close();
+        test.equal(await pending, true, 'close() aborts the wait');
+        test.ok(timers.history().find(timer => timer.id === armed.id).cleared, 'close() clears the timer');
+
+        // a delay under the cap is honored as given, and junk becomes an immediate wait
+        let client2 = makeClient({ port: 1 });
+        client2.throttleWait(1500);
+        test.equal(timers.history()[timers.history().length - 1].delay, 1500);
+        client2.throttleWait('nonsense');
+        test.equal(timers.history()[timers.history().length - 1].delay, 0);
+        client2.close();
         test.done();
     });
 };

package/test/tools-test.js

@@ -1503,8 +1503,9 @@ module.exports['Tools: formatMessageResponse handles NIL, Buffer and unknown key
         literals: [Buffer.from('999')]
     });
     let r = await tools.formatMessageResponse(untagged, { path: 'INBOX' });
-    test.equal(r.uid, 0); // NIL value -> getString returns false -> Number(false) = 0
-    test.equal(r.size, 0);
+    test.equal(r.uid, undefined); // a NIL UID is left unset rather than reported as UID 0
+    test.equal(r.size, 0); // size keeps its 0 default
+
     test.equal(r.emailId, '999'); // Buffer literal value -> getString stringifies it
     test.equal(r.source, false); // BODY[] NIL -> getBuffer returns false
     test.done();
@@ -1749,3 +1750,151 @@ module.exports['Tools: packMessageRange dedupes duplicate values'] = test => {
     test.equal(tools.packMessageRange([5, 5, 5]), '5');
     test.done();
 };
+
+// ============================================
+// Security regression tests: hostile server input
+// ============================================
+
+module.exports['Tools: getStructuredParams drops __proto__ continuation parameters'] = test => {
+    // A parameter named "__proto__*0*" groups under "__proto__": without a guard the
+    // grouping wrote attacker-controlled values onto Object.prototype (and then threw)
+    let result = tools.getStructuredParams([{ value: '__proto__*0*' }, { value: "utf-8''polluted" }]);
+    test.deepEqual(result, {});
+    test.equal({}.charset, undefined, 'Object.prototype must stay clean');
+    test.done();
+};
+
+module.exports['Tools: getStructuredParams drops a plain __proto__ parameter'] = test => {
+    // A plain "__proto__" parameter never reaches the output and never touches the prototype.
+    // The string value alone cannot pollute (the __proto__ setter ignores primitives) - the
+    // object-valued continuation form above is the case the live guard covers - so this
+    // pins the output contract: the parameter is dropped, the rest of the list survives.
+    let result = tools.getStructuredParams([{ value: '__proto__' }, { value: 'polluted' }, { value: 'a' }, { value: 'b' }]);
+    test.deepEqual(result, { a: 'b' });
+    test.ok(!Object.prototype.hasOwnProperty.call(result, '__proto__'), 'no own __proto__ property is created');
+    test.equal(Object.getPrototypeOf(result), Object.prototype, 'the prototype must stay untouched');
+    test.done();
+};
+
+module.exports['Tools: formatMessageResponse ignores a non-numeric MODSEQ'] = async test => {
+    // BigInt() throws on garbage, and the throw used to drop the whole message
+    // from the result set - a malformed MODSEQ must be skipped instead
+    let untagged = await parser('* 1 FETCH (UID 1 MODSEQ (abc) FLAGS (\\Seen))');
+    let result = await tools.formatMessageResponse(untagged, {});
+    test.equal(result.uid, 1);
+    test.equal(result.modseq, undefined);
+    test.ok(result.flags.has('\\Seen'));
+
+    // an unparenthesized MODSEQ yields no usable value either
+    let untagged2 = await parser('* 1 FETCH (UID 1 MODSEQ 123)');
+    let result2 = await tools.formatMessageResponse(untagged2, {});
+    test.equal(result2.uid, 1);
+    test.equal(result2.modseq, undefined);
+    test.done();
+};
+
+module.exports['Tools: parseEnvelope skips NIL address entries'] = test => {
+    // A NIL inside an address list used to throw on the dereference, dropping the message
+    let entry = [
+        null, // date
+        null, // subject
+        [null, [{ value: 'Name' }, null, { value: 'user' }, { value: 'example.com' }]], // from: NIL entry + valid entry
+        [], // sender
+        [], // reply-to
+        [], // to
+        [], // cc
+        [], // bcc
+        null, // in-reply-to
+        null // message-id
+    ];
+
+    let result = tools.parseEnvelope(entry);
+    test.equal(result.from.length, 1);
+    test.equal(result.from[0].address, 'user@example.com');
+    test.done();
+};
+
+// ============================================
+// Bounded parsing of untrusted numeric values
+// ============================================
+
+module.exports['Tools: expandRange returns nothing for a non-string range'] = test => {
+    // untaggedVanished() leaves the sequence set as `false` when the response carries only the
+    // (EARLIER) tag, and throwing here would abort the handler for the rest of the response
+    test.deepEqual(tools.expandRange(false), []);
+    test.deepEqual(tools.expandRange(undefined), []);
+    test.deepEqual(tools.expandRange(null), []);
+    test.deepEqual(tools.expandRange(123), []);
+    test.deepEqual(tools.expandRange(['1:3']), []);
+    test.deepEqual(tools.expandRange('1:3'), [1, 2, 3], 'a real range still expands');
+    test.done();
+};
+
+module.exports['Tools: isDecimalString accepts only bounded digit runs'] = test => {
+    test.equal(tools.isDecimalString('12', 10), true);
+    test.equal(tools.isDecimalString('1234567890', 10), true);
+    test.equal(tools.isDecimalString('12345678901', 10), false, 'one digit past the bound is rejected');
+    test.equal(tools.isDecimalString('', 10), false);
+    test.equal(tools.isDecimalString('1e5', 10), false);
+    test.equal(tools.isDecimalString(' 12 ', 10), false);
+    test.equal(tools.isDecimalString('0x10', 10), false);
+    test.equal(tools.isDecimalString('-1', 10), false);
+    test.equal(tools.isDecimalString('1.5', 10), false);
+    test.equal(tools.isDecimalString(12, 10), false, 'only strings are accepted');
+    test.equal(tools.isDecimalString(null, 10), false);
+    test.done();
+};
+
+module.exports['Tools: parseBigIntValue rejects everything BigInt would throw on'] = test => {
+    // isNaN() passes '1e5', ' 12 ' and 'Infinity'; BigInt() throws on all three, and the throw
+    // propagates out of a response handler that was only trying to read one field
+    test.equal(tools.parseBigIntValue('9122'), 9122n);
+    for (let bad of ['1e5', ' 12 ', 'Infinity', 'none', '', '-1', '1.5', null, undefined, 12, ['1']]) {
+        test.equal(tools.parseBigIntValue(bad), false, `${JSON.stringify(bad)} must be rejected`);
+    }
+    test.done();
+};
+
+module.exports['Tools: parseBigIntValue bounds the digit count before converting'] = test => {
+    // BigInt() on a multi-megabyte digit run costs hundreds of milliseconds of non-yielding
+    // CPU, and a response line may carry up to maxLineLength digits
+    test.equal(tools.parseBigIntValue('9'.repeat(19)), BigInt('9'.repeat(19)), '63-bit values still fit the default bound');
+    test.equal(tools.parseBigIntValue('9'.repeat(20)), false);
+    test.equal(tools.parseBigIntValue('9'.repeat(400000)), false);
+    test.equal(tools.parseBigIntValue('12345678901', tools.MAX_UINT32_DIGITS), false, 'a tighter bound can be requested');
+    test.done();
+};
+
+module.exports['Tools: parseUintValue rejects values outside the safe integer range'] = test => {
+    test.equal(tools.parseUintValue('1000'), 1000);
+    test.equal(tools.parseUintValue('0'), 0);
+    test.equal(tools.parseUintValue('9'.repeat(19)), false, 'a value past 2^53-1 is refused, not rounded');
+    test.equal(tools.parseUintValue('9'.repeat(400)), false, 'a digit run that would coerce to Infinity is refused');
+    for (let bad of ['1e3', '0x10', ' 12 ', '-5', '1.5', '']) {
+        test.equal(tools.parseUintValue(bad), false, `${JSON.stringify(bad)} must be rejected`);
+    }
+    test.done();
+};
+
+module.exports['Tools: expandRange caps the total expansion, not just each range'] = test => {
+    // A per-range bound alone is multiplied by an unbounded number of ranges. With the budget
+    // already spent inside the second range, the two after it must be abandoned rather than
+    // expanded on top of it.
+    let result = tools.expandRange('1:16777215,16777215:16777220,1:5,7');
+    test.equal(result.length, tools.EXPANDED_RANGE_LIMIT);
+    test.equal(result[0], 1);
+    // the second range gets the single remaining entry, and the two after it never start
+    test.equal(result[result.length - 1], 16777215);
+    test.done();
+};
+
+module.exports['Tools: formatMessageResponse drops an unusable sequence number'] = async test => {
+    // Number('9'.repeat(400)) is Infinity, and a seq of Infinity indexes into nothing
+    let untagged = await parser('* 1 FETCH (UID 5)');
+    let ok = await tools.formatMessageResponse(untagged, { path: 'INBOX' });
+    test.equal(ok.seq, 1);
+
+    let overflowing = await tools.formatMessageResponse({ command: '9'.repeat(400), attributes: [] }, { path: 'INBOX' });
+    test.equal(overflowing.seq, undefined);
+    test.done();
+};