Haraka 3.1.0 → 3.1.2

package/test/logger.js

@@ -1,9 +1,9 @@
 const assert = require('node:assert')
-const util = require('node:util');
+const util = require('node:util')
 
 const _set_up = (done) => {
-    this.logger = require('../logger');
-    done();
+    this.logger = require('../logger')
+    done()
 }
 
 describe('logger', () => {
@@ -11,248 +11,267 @@ describe('logger', () => {
 
     describe('init', () => {
         it('logger', () => {
-            assert.ok(this.logger);
+            assert.ok(this.logger)
         })
     })
 
     describe('log', () => {
         it('log', () => {
-            this.logger.deferred_logs = [];
-            assert.equal(0, this.logger.deferred_logs.length);
-            assert.ok(this.logger.log('WARN','test warning'));
-            assert.equal(1, this.logger.deferred_logs.length);
+            this.logger.deferred_logs = []
+            assert.equal(0, this.logger.deferred_logs.length)
+            assert.ok(this.logger.log('WARN', 'test warning'))
+            assert.equal(1, this.logger.deferred_logs.length)
         })
 
         it('log, w/deferred', () => {
-            this.logger.plugins = { plugin_list: true };
-            this.logger.deferred_logs.push( { level: 'INFO', data: 'log test info'} );
-            assert.ok(this.logger.log('INFO', 'another test info'));
+            this.logger.plugins = { plugin_list: true }
+            this.logger.deferred_logs.push({
+                level: 'INFO',
+                data: 'log test info',
+            })
+            assert.ok(this.logger.log('INFO', 'another test info'))
         })
 
         it('log in logfmt', () => {
-            this.logger.deferred_logs = [];
-            this.logger.format = this.logger.formats.LOGFMT;
-            assert.equal(0, this.logger.deferred_logs.length);
-            assert.ok(this.logger.log('WARN','test warning'));
-            assert.equal(1, this.logger.deferred_logs.length);
+            this.logger.deferred_logs = []
+            this.logger.format = this.logger.formats.LOGFMT
+            assert.equal(0, this.logger.deferred_logs.length)
+            assert.ok(this.logger.log('WARN', 'test warning'))
+            assert.equal(1, this.logger.deferred_logs.length)
         })
 
         it('log in logfmt w/deferred', () => {
-            this.logger.plugins = { plugin_list: true };
-            this.logger.deferred_logs.push( { level: 'INFO', data: 'log test info'} );
-            assert.ok(this.logger.log('INFO', 'another test info'));
+            this.logger.plugins = { plugin_list: true }
+            this.logger.deferred_logs.push({
+                level: 'INFO',
+                data: 'log test info',
+            })
+            assert.ok(this.logger.log('INFO', 'another test info'))
         })
 
         it('log in json', () => {
-            this.logger.deferred_logs = [];
-            this.logger.format = this.logger.formats.JSON;
-            assert.equal(0, this.logger.deferred_logs.length);
-            assert.ok(this.logger.log('WARN','test warning'));
-            assert.equal(1, this.logger.deferred_logs.length);
+            this.logger.deferred_logs = []
+            this.logger.format = this.logger.formats.JSON
+            assert.equal(0, this.logger.deferred_logs.length)
+            assert.ok(this.logger.log('WARN', 'test warning'))
+            assert.equal(1, this.logger.deferred_logs.length)
         })
 
         it('log in json w/deferred', () => {
-            this.logger.plugins = { plugin_list: true };
-            this.logger.deferred_logs.push( { level: 'INFO', data: 'log test info'} );
-            assert.ok(this.logger.log('INFO', 'another test info'));
+            this.logger.plugins = { plugin_list: true }
+            this.logger.deferred_logs.push({
+                level: 'INFO',
+                data: 'log test info',
+            })
+            assert.ok(this.logger.log('INFO', 'another test info'))
         })
     })
 
     describe('level', () => {
         it('both INFO and LOGINFO are log levels', () => {
-            assert.equal(this.logger.levels.INFO, 6);
-            assert.equal(this.logger.levels.LOGINFO, 6);
+            assert.equal(this.logger.levels.INFO, 6)
+            assert.equal(this.logger.levels.LOGINFO, 6)
         })
-
     })
 
     describe('set_format', () => {
         it('set format to DEFAULT', () => {
-            this.logger.format = '';
-            this.logger.set_format('DEFAULT');
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT);
+            this.logger.format = ''
+            this.logger.set_format('DEFAULT')
+            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
         })
 
         it('set format to LOGFMT', () => {
-            this.logger.format = '';
-            this.logger.set_format('LOGFMT');
-            assert.equal(this.logger.format, this.logger.formats.LOGFMT);
+            this.logger.format = ''
+            this.logger.set_format('LOGFMT')
+            assert.equal(this.logger.format, this.logger.formats.LOGFMT)
         })
 
         it('set format to JSON', () => {
-            this.logger.format = '';
-            this.logger.set_format('JSON');
-            assert.equal(this.logger.format, this.logger.formats.JSON);
+            this.logger.format = ''
+            this.logger.set_format('JSON')
+            assert.equal(this.logger.format, this.logger.formats.JSON)
         })
 
         it('set format to DEFAULT if empty', () => {
-            this.logger.format = '';
-            this.logger.set_format('');
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT);
+            this.logger.format = ''
+            this.logger.set_format('')
+            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
         })
 
         it('set format to DEFAULT if lowercase', () => {
-            this.logger.format = '';
-            this.logger.set_format('default');
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT);
+            this.logger.format = ''
+            this.logger.set_format('default')
+            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
         })
 
         it('set format to DEFAULT if invalid', () => {
-            this.logger.format = '';
-            this.logger.set_format('invalid');
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT);
+            this.logger.format = ''
+            this.logger.set_format('invalid')
+            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
         })
-
     })
 
     describe('set_loglevel', () => {
         it('set loglevel to LOGINFO', () => {
-            this.logger.set_loglevel('LOGINFO');
-            assert.equal(this.logger.loglevel, this.logger.levels.LOGINFO);
+            this.logger.set_loglevel('LOGINFO')
+            assert.equal(this.logger.loglevel, this.logger.levels.LOGINFO)
         })
 
         it('set loglevel to INFO', () => {
-            this.logger.set_loglevel('INFO');
-            assert.equal(this.logger.loglevel, this.logger.levels.INFO);
+            this.logger.set_loglevel('INFO')
+            assert.equal(this.logger.loglevel, this.logger.levels.INFO)
         })
 
         it('set loglevel to EMERG', () => {
-            this.logger.set_loglevel('emerg');
-            assert.equal(this.logger.loglevel, this.logger.levels.EMERG);
+            this.logger.set_loglevel('emerg')
+            assert.equal(this.logger.loglevel, this.logger.levels.EMERG)
         })
 
         it('set loglevel to 6', () => {
-            this.logger.set_loglevel(6);
-            assert.equal(this.logger.loglevel, 6);
+            this.logger.set_loglevel(6)
+            assert.equal(this.logger.loglevel, 6)
         })
 
         it('set loglevel to WARN if invalid', () => {
-            this.logger.set_loglevel('invalid');
-            assert.equal(this.logger.loglevel, this.logger.levels.WARN);
+            this.logger.set_loglevel('invalid')
+            assert.equal(this.logger.loglevel, this.logger.levels.WARN)
         })
     })
 
     describe('set_timestamps', () => {
         it('set timestamps to false', () => {
-            this.logger.timestamps = undefined;
-            this.logger.set_timestamps(false);
-            assert.equal(this.logger.timestamps, false);
+            this.logger.timestamps = undefined
+            this.logger.set_timestamps(false)
+            assert.equal(this.logger.timestamps, false)
         })
 
         it('set timestamps to true', () => {
-            this.logger.timestamps = undefined;
-            this.logger.set_timestamps(true);
-            assert.equal(this.logger.timestamps, true);
+            this.logger.timestamps = undefined
+            this.logger.set_timestamps(true)
+            assert.equal(this.logger.timestamps, true)
         })
     })
 
     describe('would_log', () => {
         it('should', () => {
-            this.logger.loglevel = 4;
-            assert.equal(false, this.logger.would_log(7));
-            assert.equal(false, this.logger.would_log(6));
-            assert.equal(false, this.logger.would_log(5));
+            this.logger.loglevel = 4
+            assert.equal(false, this.logger.would_log(7))
+            assert.equal(false, this.logger.would_log(6))
+            assert.equal(false, this.logger.would_log(5))
         })
 
         it('should not', () => {
-            this.logger.loglevel = 4;
-            assert.equal(true, this.logger.would_log(4));
-            assert.equal(true, this.logger.would_log(3));
-            assert.equal(true, this.logger.would_log(2));
-            assert.equal(true, this.logger.would_log(1));
+            this.logger.loglevel = 4
+            assert.equal(true, this.logger.would_log(4))
+            assert.equal(true, this.logger.would_log(3))
+            assert.equal(true, this.logger.would_log(2))
+            assert.equal(true, this.logger.would_log(1))
         })
     })
 
     describe('log_respond', () => {
         it('invalid retval', () => {
-            assert.equal(false, this.logger.log_respond(901));
+            assert.equal(false, this.logger.log_respond(901))
         })
 
         it('valid retval', () => {
-            const data = { level: 'INFO', data: "test data" };
-            assert.equal(true, this.logger.log_respond(900, 'test msg', data));
+            const data = { level: 'INFO', data: 'test data' }
+            assert.equal(true, this.logger.log_respond(900, 'test msg', data))
         })
     })
 
     describe('dump_logs', () => {
         it('empty', () => {
-            assert.ok(this.logger.dump_logs(0));
+            assert.ok(this.logger.dump_logs(0))
         })
 
         it('with deferred', () => {
-            this.logger.deferred_logs.push( { level: 'info', data: 'test info'} );
-            this.logger.deferred_logs.push( { level: 'INFO', data: 'test info, color'} );
-            this.logger.deferred_logs.push( { level: 'WARN', data: 'test warn, color'} );
-            assert.ok(this.logger.dump_logs(0));
-            assert.ok(this.logger.deferred_logs.length === 0);
+            this.logger.deferred_logs.push({
+                level: 'info',
+                data: 'test info',
+            })
+            this.logger.deferred_logs.push({
+                level: 'INFO',
+                data: 'test info, color',
+            })
+            this.logger.deferred_logs.push({
+                level: 'WARN',
+                data: 'test warn, color',
+            })
+            assert.ok(this.logger.dump_logs(0))
+            assert.ok(this.logger.deferred_logs.length === 0)
         })
     })
 
     describe('colors', () => {
         it('colors', () => {
-            assert.ok(this.logger.colors);
+            assert.ok(this.logger.colors)
         })
 
         it('colorize', () => {
-            assert.ok(this.logger.colorize);
-            assert.equal('function', typeof this.logger.colorize);
-            assert.equal('error', this.logger.colorize('bad-color', 'error'));
-            const expected = util.inspect.colors ? '\u001b[34mgood\u001b[39m' : 'good';
-            assert.equal(expected, this.logger.colorize('blue', 'good'));
+            assert.ok(this.logger.colorize)
+            assert.equal('function', typeof this.logger.colorize)
+            assert.equal('error', this.logger.colorize('bad-color', 'error'))
+            const expected = util.inspect.colors ? '\u001b[34mgood\u001b[39m' : 'good'
+            assert.equal(expected, this.logger.colorize('blue', 'good'))
         })
     })
 
     describe('log_if_level', () => {
         it('log_if_level is a function', () => {
-            assert.ok('function' === typeof this.logger.log_if_level);
+            assert.ok('function' === typeof this.logger.log_if_level)
         })
 
         it('log_if_level test log entry', () => {
-            this.logger.loglevel = 9;
-            const f = this.logger.log_if_level('INFO', 'LOGINFO');
-            assert.ok(f);
-            assert.ok('function' === typeof f);
-            assert.ok(f('test info message'));
-            assert.equal(1, this.logger.deferred_logs.length);
+            this.logger.loglevel = 9
+            const f = this.logger.log_if_level('INFO', 'LOGINFO')
+            assert.ok(f)
+            assert.ok('function' === typeof f)
+            assert.ok(f('test info message'))
+            assert.equal(1, this.logger.deferred_logs.length)
             // console.log(this.logger.deferred_logs[0]);
-            assert.equal('INFO', this.logger.deferred_logs[0].level);
+            assert.equal('INFO', this.logger.deferred_logs[0].level)
         })
 
         it('log_if_level null case', () => {
-            this.logger.loglevel = 9;
-            const f = this.logger.log_if_level('INFO', 'LOGINFO');
-            assert.ok(f(null));
-            assert.equal(2, this.logger.deferred_logs.length);
+            this.logger.loglevel = 9
+            const f = this.logger.log_if_level('INFO', 'LOGINFO')
+            assert.ok(f(null))
+            assert.equal(2, this.logger.deferred_logs.length)
         })
 
         it('log_if_level false', () => {
-            this.logger.loglevel = 9;
-            const f = this.logger.log_if_level('INFO', 'LOGINFO');
-            assert.ok(f(false));
-            assert.equal(3, this.logger.deferred_logs.length);
+            this.logger.loglevel = 9
+            const f = this.logger.log_if_level('INFO', 'LOGINFO')
+            assert.ok(f(false))
+            assert.equal(3, this.logger.deferred_logs.length)
         })
 
         it('log_if_level 0', () => {
-            this.logger.loglevel = 9;
-            const f = this.logger.log_if_level('INFO', 'LOGINFO');
-            assert.ok(f(0));
-            assert.equal(4, this.logger.deferred_logs.length);
+            this.logger.loglevel = 9
+            const f = this.logger.log_if_level('INFO', 'LOGINFO')
+            assert.ok(f(0))
+            assert.equal(4, this.logger.deferred_logs.length)
         })
     })
 
     describe('add_log_methods', () => {
         it('ignores non-objects', () => {
-            assert.equal(undefined, this.logger.add_log_methods(''));
-            assert.equal(undefined, this.logger.add_log_methods(function foo (){}));
+            assert.equal(undefined, this.logger.add_log_methods(''))
+            assert.equal(
+                undefined,
+                this.logger.add_log_methods(function foo() {}),
+            )
         })
 
         it('adds functions to an object', () => {
-            const testObj = {};
-            this.logger.add_log_methods(testObj);
-            const levels = ['DATA','PROTOCOL','DEBUG','INFO','NOTICE','WARN','ERROR','CRIT','ALERT','EMERG'];
+            const testObj = {}
+            this.logger.add_log_methods(testObj)
+            const levels = ['DATA', 'PROTOCOL', 'DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERROR', 'CRIT', 'ALERT', 'EMERG']
             for (const level of levels) {
-                assert.ok('function' === typeof(testObj[`log${level.toLowerCase()}`]));
+                assert.ok('function' === typeof testObj[`log${level.toLowerCase()}`])
             }
         })
     })
-})
+})

package/test/outbound/hmail.js

@@ -1,15 +1,17 @@
-
 const assert = require('node:assert')
-const fs   = require('node:fs')
+const fs = require('node:fs')
 const path = require('node:path')
 
-const Hmail = require('../../outbound/hmail');
-const outbound = require('../../outbound/index');
-
+const Hmail = require('../../outbound/hmail')
+const outbound = require('../../outbound/index')
 
 describe('outbound/hmail', () => {
     beforeEach((done) => {
-        this.hmail = new Hmail('1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka', 'test/queue/1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka', {});
+        this.hmail = new Hmail(
+            '1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
+            'test/queue/1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
+            {},
+        )
         done()
     })
 
@@ -33,7 +35,9 @@ describe('outbound/hmail', () => {
     })
     it('force_tls', (done) => {
         this.hmail.todo = { domain: 'miss.example.com' }
-        this.hmail.obtls.cfg = { force_tls_hosts: ['1.2.3.4', 'hit.example.com'] }
+        this.hmail.obtls.cfg = {
+            force_tls_hosts: ['1.2.3.4', 'hit.example.com'],
+        }
         assert.equal(this.hmail.get_force_tls({ exchange: '1.2.3.4' }), true)
         assert.equal(this.hmail.get_force_tls({ exchange: '1.2.3.5' }), false)
         this.hmail.todo = { domain: 'hit.example.com' }
@@ -44,82 +48,92 @@ describe('outbound/hmail', () => {
 
 describe('outbound/hmail.HMailItem', () => {
     it('normal queue file', (done) => {
-        this.hmail = new Hmail('1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka', 'test/queue/1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka', {});
+        this.hmail = new Hmail(
+            '1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
+            'test/queue/1508455115683_1508455115683_0_90253_9Q4o4V_1_haraka',
+            {},
+        )
         this.hmail.on('ready', () => {
             // console.log(this.hmail);
             assert.ok(this.hmail)
             done()
         })
-        this.hmail.on('error', err => {
+        this.hmail.on('error', (err) => {
             console.log(err)
             assert.equal(err, undefined)
             done()
         })
     })
     it('normal TODO w/multibyte chars loads w/o error', (done) => {
-        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_1_qfile', 'test/fixtures/todo_qfile.txt', {});
+        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_1_qfile', 'test/fixtures/todo_qfile.txt', {})
         this.hmail.on('ready', () => {
             // console.log(this.hmail);
             assert.ok(this.hmail)
             done()
         })
-        this.hmail.on('error', err => {
+        this.hmail.on('error', (err) => {
             console.log(err)
             assert.equal(err, undefined)
             done()
         })
     })
     it('too short TODO length declared', (done) => {
-        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_1_haraka', 'test/queue/1507509981169_1507509981169_0_61403_e0Y0Ym_1_haraka', {});
+        this.hmail = new Hmail(
+            '1507509981169_1507509981169_0_61403_e0Y0Ym_1_haraka',
+            'test/queue/1507509981169_1507509981169_0_61403_e0Y0Ym_1_haraka',
+            {},
+        )
         this.hmail.on('ready', () => {
             // console.log(this.hmail);
             assert.ok(this.hmail)
-            done();
+            done()
         })
         this.hmail.on('error', (err) => {
-            console.log(err);
-            assert.ok(err);
-            done();
+            console.log(err)
+            assert.ok(err)
+            done()
         })
     })
     it('too long TODO length declared', (done) => {
-        this.hmail = new Hmail('1508269674999_1508269674999_0_34002_socVUF_1_haraka', 'test/queue/1508269674999_1508269674999_0_34002_socVUF_1_haraka', {});
+        this.hmail = new Hmail(
+            '1508269674999_1508269674999_0_34002_socVUF_1_haraka',
+            'test/queue/1508269674999_1508269674999_0_34002_socVUF_1_haraka',
+            {},
+        )
         this.hmail.on('ready', () => {
             // console.log(this.hmail);
             assert.ok(this.hmail)
-            done();
+            done()
         })
         this.hmail.on('error', (err) => {
-            console.log(err);
-            assert.ok(err);
-            done();
+            console.log(err)
+            assert.ok(err)
+            done()
         })
     })
     it('zero-length file load skip w/o crash', (done) => {
-        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_zero', 'test/queue/zero-length', {});
+        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_zero', 'test/queue/zero-length', {})
         this.hmail.on('ready', () => {
             assert.ok(this.hmail)
-            done();
+            done()
         })
         this.hmail.on('error', (err) => {
-            console.error(err);
-            assert.ok(err);
-            done();
+            console.error(err)
+            assert.ok(err)
+            done()
         })
     })
     it('lifecycle, reads and writes a haraka queue file', (done) => {
-
-        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_qfile', 'test/fixtures/todo_qfile.txt', {});
+        this.hmail = new Hmail('1507509981169_1507509981169_0_61403_e0Y0Ym_2_qfile', 'test/fixtures/todo_qfile.txt', {})
 
         this.hmail.on('error', (err) => {
             // console.log(err);
-            assert.equals(err, undefined);
-            done();
+            assert.equals(err, undefined)
+            done()
         })
 
         this.hmail.on('ready', () => {
-
-            const tmpfile = path.resolve('test', 'test-queue', 'delete-me');
+            const tmpfile = path.resolve('test', 'test-queue', 'delete-me')
             const ws = new fs.createWriteStream(tmpfile)
 
             outbound.build_todo(this.hmail.todo, ws, () => {
@@ -128,12 +142,12 @@ describe('outbound/hmail.HMailItem', () => {
                 // assert.equals(this.hmail.todo.message_stream.headers.length, 22);
 
                 const ds = this.hmail.data_stream()
-                ds.pipe(ws, { dot_stuffing: true });
+                ds.pipe(ws)
 
                 ws.on('close', () => {
                     // console.log(this.hmail.todo)
-                    assert.equal(fs.statSync(tmpfile).size, 4204);
-                    done();
+                    assert.equal(fs.statSync(tmpfile).size, 4204)
+                    done()
                 })
             })
         })