imapflow 1.0.184 → 1.0.186

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.0.186](https://github.com/postalsys/imapflow/compare/v1.0.185...v1.0.186) (2025-04-20)
+
+
+### Bug Fixes
+
+* **parsing:** Limit the depth of nested input ([c6cd7ce](https://github.com/postalsys/imapflow/commit/c6cd7cef9f9b8a1ff137a08e8aebf2555e596a23))
+
+## [1.0.185](https://github.com/postalsys/imapflow/compare/v1.0.184...v1.0.185) (2025-04-14)
+
+
+### Bug Fixes
+
+* **search:** add a `not` option for search options ([#281](https://github.com/postalsys/imapflow/issues/281)) ([000686b](https://github.com/postalsys/imapflow/commit/000686b2ace1ef0e21cca64d8e056d1f7f7f8914))
+
 ## [1.0.184](https://github.com/postalsys/imapflow/compare/v1.0.183...v1.0.184) (2025-03-11)
 
 

package/lib/commands/append.js

@@ -9,6 +9,10 @@ module.exports = async (connection, destination, content, flags, idate) => {
         return;
     }
 
+    if (typeof content === 'string') {
+        content = Buffer.from(content);
+    }
+
     if (connection.capabilities.has('APPENDLIMIT')) {
         let appendLimit = connection.capabilities.get('APPENDLIMIT');
         if (typeof appendLimit === 'number' && appendLimit < content.length) {
@@ -40,9 +44,6 @@ module.exports = async (connection, destination, content, flags, idate) => {
 
     let isLiteral8 = false;
     if (connection.capabilities.has('BINARY') && !connection.disableBinary) {
-        if (typeof content === 'string') {
-            content = Buffer.from(content);
-        }
         // Value is literal8 if it contains NULL bytes. The server must support the BINARY extension
         // and if it does not then send the value as a regular literal and hope for the best
         isLiteral8 = content.indexOf(Buffer.from([0])) >= 0;

package/lib/commands/delete.js

@@ -11,7 +11,7 @@ module.exports = async (connection, path) => {
 
     path = normalizePath(connection, path);
 
-    if (connection.states.SELECTED && connection.mailbox.path === path) {
+    if (connection.state === connection.states.SELECTED && connection.mailbox.path === path) {
         await connection.run('CLOSE');
     }
 

package/lib/commands/rename.js

@@ -12,7 +12,7 @@ module.exports = async (connection, path, newPath) => {
     path = normalizePath(connection, path);
     newPath = normalizePath(connection, newPath);
 
-    if (connection.states.SELECTED && connection.mailbox.path === path) {
+    if (connection.state === connection.states.SELECTED && connection.mailbox.path === path) {
         await connection.run('CLOSE');
     }
 

package/lib/handler/token-parser.js

@@ -15,6 +15,8 @@ const STATE_TEXT = 0x007;
 const RE_DIGITS = /^\d+$/;
 const RE_SINGLE_DIGIT = /^\d$/;
 
+const MAX_NODE_DEPTH = 25;
+
 class TokenParser {
     constructor(parent, startPos, str, options) {
         this.str = (str || '').toString();
@@ -116,6 +118,16 @@ class TokenParser {
 
         if (parentNode) {
             node.parentNode = parentNode;
+            node.depth = parentNode.depth + 1;
+        } else {
+            node.depth = 0;
+        }
+
+        if (node.depth > MAX_NODE_DEPTH) {
+            let error = new Error('Too much nesting in IMAP string');
+            error.code = 'MAX_IMAP_NESTING_REACHED';
+            error._imapStr = this.str;
+            throw error;
         }
 
         if (typeof startPos === 'number') {

package/lib/imap-flow.js

@@ -281,6 +281,8 @@ class ImapFlow extends EventEmitter {
         this.socket = false;
         this.writeSocket = false;
 
+        this.isClosed = false;
+
         this.states = states;
         this.state = this.states.NOT_AUTHENTICATED;
 
@@ -391,7 +393,7 @@ class ImapFlow extends EventEmitter {
     }
 
     write(chunk) {
-        if (this.socket.destroyed) {
+        if (!this.socket || this.socket.destroyed) {
             // do not write after connection end or logout
             const error = new Error('Socket is already closed');
             error.code = 'NoConnection';
@@ -507,7 +509,7 @@ class ImapFlow extends EventEmitter {
     }
 
     async exec(command, attributes, options) {
-        if (this.socket.destroyed) {
+        if (!this.socket || this.socket.destroyed) {
             let error = new Error('Connection closed');
             error.code = 'EConnectionClosed';
             throw error;
@@ -873,7 +875,7 @@ class ImapFlow extends EventEmitter {
         };
 
         Object.defineProperty(this.writeSocket, 'destroyed', {
-            get: () => this.socket.destroyed
+            get: () => !this.socket || this.socket.destroyed
         });
 
         // we need to force flush deflated data to socket so we can't
@@ -1990,6 +1992,7 @@ class ImapFlow extends EventEmitter {
      * @property {String} [keyword] Matches messages that have the custom flag set
      * @property {String} [unKeyword] Matches messages that do not have the custom flag set
      * @property {Object.<string, Boolean|String>} [header] Matches messages with header key set if value is `true` (**NB!** not supported by all servers) or messages where header partially matches a string value
+     * @property {SearchObject} [not] A {@link SearchObject} object. It must not match.
      * @property {SearchObject[]} [or] An array of 2 or more {@link SearchObject} objects. At least on of these must match
      */
 
@@ -2480,7 +2483,7 @@ class ImapFlow extends EventEmitter {
 
         let res;
         while ((res = await getNext())) {
-            if (this.isClosed || this.socket.destroyed) {
+            if (this.isClosed || !this.socket || this.socket.destroyed) {
                 let error = new Error('Connection closed');
                 error.code = 'EConnectionClosed';
                 throw error;
@@ -3000,7 +3003,7 @@ class ImapFlow extends EventEmitter {
             return false;
         }
 
-        if (this.socket.destroyed) {
+        if (!this.socket || this.socket.destroyed) {
             const error = new Error('Connection not available');
             error.code = 'NoConnection';
             throw error;
@@ -3069,7 +3072,7 @@ class ImapFlow extends EventEmitter {
         const lock = this.locks.shift();
         const { resolve, reject, path, options, lockId } = lock;
 
-        if (!this.usable || this.socket.destroyed) {
+        if (!this.usable || !this.socket || this.socket.destroyed) {
             this.log.trace({ msg: 'Failed to acquire mailbox lock', path, lockId, idling: this.idling });
             // reject all
             let error = new Error('Connection not available');

package/lib/search-compiler.js

@@ -190,6 +190,19 @@ module.exports.searchCompiler = (connection, query) => {
                     }
                     break;
 
+                case 'NOT':
+                    {   
+                        if (!params[term]) {
+                            break;
+                        }
+
+                        if (typeof params[term] === 'object') {
+                            attributes.push({ type: 'ATOM', value: 'NOT' });
+                            walk(params[term]);
+                        }
+                    }
+                    break;
+                    
                 case 'OR':
                     {
                         if (!params[term] || !Array.isArray(params[term]) || !params[term].length) {

package/lib/tools.js

@@ -849,10 +849,9 @@ const tools = {
     },
 
     packMessageRange(list) {
-        if (typeof uidList === 'string')
-            if (!Array.isArray(list)) {
-                list = [].concat(list || []);
-            }
+        if (!Array.isArray(list)) {
+            list = [].concat(list || []);
+        }
 
         if (!list.length) {
             return '';

package/lib/types.d.ts

@@ -904,6 +904,7 @@ declare type SequenceString = string;
  * @property [keyword] - Matches messages that have the custom flag set
  * @property [unKeyword] - Matches messages that do not have the custom flag set
  * @property [header] - Matches messages with header key set if value is `true` (**NB!** not supported by all servers) or messages where header partially matches a string value
+ * @property [not] - A {@link SearchObject} object. It must not match.
  * @property [or] - An array of 2 or more {@link SearchObject} objects. At least on of these must match
  */
 declare type SearchObject = {
@@ -940,6 +941,7 @@ declare type SearchObject = {
     header?: {
         [key: string]: Boolean | String;
     };
+    not?: SearchObject;
     or?: SearchObject[];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.0.184",
+    "version": "1.0.186",
     "description": "IMAP Client for Node",
     "main": "./lib/imap-flow.js",
     "scripts": {

package/test/bodystructure-test.js

@@ -1125,8 +1125,6 @@ module.exports['Process non-standard unicode filename property'] = test => {
 
     let bodyStruct = parseBodystructure(attribute);
 
-    console.log(JSON.stringify(bodyStruct, false, 2));
-
     test.deepEqual(bodyStruct.childNodes[1].dispositionParameters.filename, 'Trang_ghi_âm (8) (1).xlsx');
     test.done();
 };

package/test/imap-parser-test.js

@@ -981,7 +981,6 @@ module.exports['IMAP Parser, NO with a dot'] = test =>
 module.exports['IMAP Parser, no tag or response (Exchange)'] = test =>
     asyncWrapper(test, async test => {
         let parsed = await parser('Server Unavailable. 15');
-        console.log(parsed);
         test.equal(parsed.command, 'BAD');
         test.deepEqual(parsed.attributes, [{ type: 'TEXT', value: 'Server Unavailable. 15' }]);
     });
@@ -1237,3 +1236,16 @@ module.exports['IMAP Parser, FETCH with BODYSTRUCTURE'] = test =>
             ]
         ]);
     });
+
+module.exports['IMAP Parser, FETCH with BODYSTRUCTURE'] = test =>
+    asyncWrapper(test, async test => {
+        try {
+            let parsed = await parser('* 1 FETCH (UID 1 (((((((((((((((((((((((((');
+            test.ok(!parsed);
+        } catch (err) {
+            test.ok(err);
+            if (err.code !== 'MAX_IMAP_NESTING_REACHED') {
+                throw err;
+            }
+        }
+    });