Haraka 3.1.1 → 3.1.3

package/test/plugins/rcpt_to.in_host_list.js

@@ -1,60 +1,59 @@
-'use strict';
+'use strict'
 const assert = require('node:assert')
 
-const { Address }  = require('address-rfc2821');
-const fixtures     = require('haraka-test-fixtures');
+const { Address } = require('address-rfc2821')
+const fixtures = require('haraka-test-fixtures')
 
 const _set_up = (done) => {
+    this.plugin = new fixtures.plugin('rcpt_to.in_host_list')
+    this.plugin.inherits('rcpt_to.host_list_base')
+    this.plugin.cfg = {}
+    this.plugin.host_list = {}
 
-    this.plugin = new fixtures.plugin('rcpt_to.in_host_list');
-    this.plugin.inherits('rcpt_to.host_list_base');
-    this.plugin.cfg = {};
-    this.plugin.host_list = {};
-
-    this.connection = fixtures.connection.createConnection();
+    this.connection = fixtures.connection.createConnection()
     this.connection.transaction = {
         results: new fixtures.results(this.connection),
         notes: {},
-    };
+    }
 
-    done();
+    done()
 }
 
 describe('in_host_list', () => {
     beforeEach(_set_up)
 
     it('miss', () => {
-        assert.equal(this.plugin.in_host_list('test.com'), false);
+        assert.equal(this.plugin.in_host_list('test.com'), false)
     })
 
     it('hit', () => {
-        this.plugin.host_list['test.com'] = true;
-        assert.equal(this.plugin.in_host_list('test.com'), true);
+        this.plugin.host_list['test.com'] = true
+        assert.equal(this.plugin.in_host_list('test.com'), true)
     })
 
     describe('in_host_regex', () => {
         beforeEach(_set_up)
 
         it('undef', () => {
-            assert.equal(this.plugin.in_host_regex('test.com'), false);
+            assert.equal(this.plugin.in_host_regex('test.com'), false)
         })
 
         it('miss', () => {
-            this.plugin.host_list_regex=['miss.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            assert.equal(this.plugin.in_host_regex('test.com'), false);
+            this.plugin.host_list_regex = ['miss.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            assert.equal(this.plugin.in_host_regex('test.com'), false)
         })
 
         it('exact hit', () => {
-            this.plugin.host_list_regex=['test.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            assert.equal(this.plugin.in_host_regex('test.com'), true);
+            this.plugin.host_list_regex = ['test.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            assert.equal(this.plugin.in_host_regex('test.com'), true)
         })
 
         it('re hit', () => {
-            this.plugin.host_list_regex=['.*est.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            assert.equal(this.plugin.in_host_regex('test.com'), true);
+            this.plugin.host_list_regex = ['.*est.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            assert.equal(this.plugin.in_host_regex('test.com'), true)
         })
     })
 
@@ -62,59 +61,79 @@ describe('in_host_list', () => {
         beforeEach(_set_up)
 
         it('null sender', (done) => {
-            this.connection.relaying=true;
-            this.plugin.hook_mail((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-                done();
-            }, this.connection, [new Address('<>')]);
+            this.connection.relaying = true
+            this.plugin.hook_mail(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                    done()
+                },
+                this.connection,
+                [new Address('<>')],
+            )
         })
 
         it('miss', (done) => {
-            this.plugin.host_list = { 'miss.com': true };
-            this.plugin.hook_mail((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-                const res = this.connection.transaction.results.get('rcpt_to.in_host_list');
-                assert.notEqual(-1, res.msg.indexOf('mail_from!local'));
-                done();
-            }, this.connection, [new Address('<user@example.com>')]);
+            this.plugin.host_list = { 'miss.com': true }
+            this.plugin.hook_mail(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                    const res = this.connection.transaction.results.get('rcpt_to.in_host_list')
+                    assert.notEqual(-1, res.msg.indexOf('mail_from!local'))
+                    done()
+                },
+                this.connection,
+                [new Address('<user@example.com>')],
+            )
         })
 
         it('hit', (done) => {
-            this.plugin.host_list = { 'example.com': true };
-            this.plugin.hook_mail((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-                const res = this.connection.transaction.results.get('rcpt_to.in_host_list');
-                assert.notEqual(-1, res.pass.indexOf('mail_from'));
-                done();
-            }, this.connection, [new Address('<user@example.com>')]);
+            this.plugin.host_list = { 'example.com': true }
+            this.plugin.hook_mail(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                    const res = this.connection.transaction.results.get('rcpt_to.in_host_list')
+                    assert.notEqual(-1, res.pass.indexOf('mail_from'))
+                    done()
+                },
+                this.connection,
+                [new Address('<user@example.com>')],
+            )
         })
 
         it('hit, regex, exact', (done) => {
-            this.plugin.host_list_regex = ['example.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            this.plugin.hook_mail((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-                const res = this.connection.transaction.results.get('rcpt_to.in_host_list');
-                assert.notEqual(-1, res.pass.indexOf('mail_from'));
-                done();
-            }, this.connection, [new Address('<user@example.com>')]);
+            this.plugin.host_list_regex = ['example.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            this.plugin.hook_mail(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                    const res = this.connection.transaction.results.get('rcpt_to.in_host_list')
+                    assert.notEqual(-1, res.pass.indexOf('mail_from'))
+                    done()
+                },
+                this.connection,
+                [new Address('<user@example.com>')],
+            )
         })
 
         it('hit, regex, pattern', (done) => {
-            this.plugin.host_list_regex = ['.*mple.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            this.plugin.hook_mail((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-                const res = this.connection.transaction.results.get('rcpt_to.in_host_list');
-                // console.log(res);
-                assert.notEqual(-1, res.pass.indexOf('mail_from'));
-                done();
-            }, this.connection, [new Address('<user@example.com>')]);
+            this.plugin.host_list_regex = ['.*mple.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            this.plugin.hook_mail(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                    const res = this.connection.transaction.results.get('rcpt_to.in_host_list')
+                    // console.log(res);
+                    assert.notEqual(-1, res.pass.indexOf('mail_from'))
+                    done()
+                },
+                this.connection,
+                [new Address('<user@example.com>')],
+            )
         })
     })
 
@@ -123,71 +142,99 @@ describe('in_host_list', () => {
 
         it('missing txn', (done) => {
             // sometimes txn goes away, make sure it's handled
-            delete this.connection.transaction;
-            this.plugin.hook_rcpt((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-            }, this.connection, [new Address('test@test.com')]);
-            assert.ok(true);
-            done();
+            delete this.connection.transaction
+            this.plugin.hook_rcpt(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                },
+                this.connection,
+                [new Address('test@test.com')],
+            )
+            assert.ok(true)
+            done()
         })
 
         it('hit list', (done) => {
-            this.plugin.host_list = { 'test.com': true };
-            this.plugin.hook_rcpt((rc, msg) => {
-                assert.equal(OK, rc);
-                assert.equal(undefined, msg);
-                done();
-            }, this.connection, [new Address('test@test.com')]);
+            this.plugin.host_list = { 'test.com': true }
+            this.plugin.hook_rcpt(
+                (rc, msg) => {
+                    assert.equal(OK, rc)
+                    assert.equal(undefined, msg)
+                    done()
+                },
+                this.connection,
+                [new Address('test@test.com')],
+            )
         })
 
         it('miss list', (done) => {
-            this.plugin.host_list = { 'miss.com': true };
-            this.plugin.hook_rcpt((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-                done();
-            }, this.connection, [new Address('test@test.com')]);
+            this.plugin.host_list = { 'miss.com': true }
+            this.plugin.hook_rcpt(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                    done()
+                },
+                this.connection,
+                [new Address('test@test.com')],
+            )
         })
 
         it('hit regex, exact', (done) => {
-            this.plugin.host_list_regex=['test.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            this.plugin.hook_rcpt((rc, msg) => {
-                assert.equal(OK, rc);
-                assert.equal(undefined, msg);
-                done();
-            }, this.connection, [new Address('test@test.com')]);
+            this.plugin.host_list_regex = ['test.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            this.plugin.hook_rcpt(
+                (rc, msg) => {
+                    assert.equal(OK, rc)
+                    assert.equal(undefined, msg)
+                    done()
+                },
+                this.connection,
+                [new Address('test@test.com')],
+            )
         })
 
         it('hit regex, pattern', (done) => {
-            this.plugin.host_list_regex=['.est.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            this.plugin.hook_rcpt((rc, msg) => {
-                assert.equal(OK, rc);
-                assert.equal(undefined, msg);
-                done();
-            }, this.connection, [new Address('test@test.com')]);
+            this.plugin.host_list_regex = ['.est.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            this.plugin.hook_rcpt(
+                (rc, msg) => {
+                    assert.equal(OK, rc)
+                    assert.equal(undefined, msg)
+                    done()
+                },
+                this.connection,
+                [new Address('test@test.com')],
+            )
         })
 
         it('miss regex, pattern', (done) => {
-            this.plugin.host_list_regex=['a.est.com'];
-            this.plugin.hl_re = new RegExp (`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i');
-            this.plugin.hook_rcpt((rc, msg) => {
-                assert.equal(undefined, rc);
-                assert.equal(undefined, msg);
-                done();
-            }, this.connection, [new Address('test@test.com')]);
+            this.plugin.host_list_regex = ['a.est.com']
+            this.plugin.hl_re = new RegExp(`^(?:${this.plugin.host_list_regex.join('|')})$`, 'i')
+            this.plugin.hook_rcpt(
+                (rc, msg) => {
+                    assert.equal(undefined, rc)
+                    assert.equal(undefined, msg)
+                    done()
+                },
+                this.connection,
+                [new Address('test@test.com')],
+            )
         })
 
         it('rcpt miss, relaying to local sender', (done) => {
-            this.connection.relaying=true;
-            this.connection.transaction.notes = { local_sender: true };
-            this.plugin.hook_rcpt((rc, msg) => {
-                assert.equal(OK, rc);
-                assert.equal(undefined, msg);
-                done();
-            }, this.connection, [new Address('test@test.com')]);
+            this.connection.relaying = true
+            this.connection.transaction.notes = { local_sender: true }
+            this.plugin.hook_rcpt(
+                (rc, msg) => {
+                    assert.equal(OK, rc)
+                    assert.equal(undefined, msg)
+                    done()
+                },
+                this.connection,
+                [new Address('test@test.com')],
+            )
         })
     })
 })

package/test/plugins/status.js

@@ -1,29 +1,28 @@
-'use strict';
+'use strict'
 
 const assert = require('node:assert')
 
-const fixtures = require('haraka-test-fixtures');
-const outbound = require('../../outbound');
-const TimerQueue = require('../../outbound/timer_queue');
+const fixtures = require('haraka-test-fixtures')
+const outbound = require('../../outbound')
+const TimerQueue = require('../../outbound/timer_queue')
 
-const Connection = fixtures.connection;
+const Connection = fixtures.connection
 
 const _set_up = (done) => {
-    this.plugin = new fixtures.plugin('status');
-    this.plugin.outbound = outbound;
+    this.plugin = new fixtures.plugin('status')
+    this.plugin.outbound = outbound
 
-    this.connection = Connection.createConnection();
-    this.connection.remote.is_local = true;
-    done();
+    this.connection = Connection.createConnection()
+    this.connection.remote.is_local = true
+    done()
 }
 
 describe('status', () => {
-
     describe('register', () => {
         beforeEach(_set_up)
 
         it('loads the status plugin', () => {
-            assert.equal('status', this.plugin.name);
+            assert.equal('status', this.plugin.name)
         })
     })
 
@@ -31,11 +30,15 @@ describe('status', () => {
         beforeEach(_set_up)
 
         it('remote', (done) => {
-            this.connection.remote.is_local = false;
-            this.plugin.hook_unrecognized_command((code) => {
-                assert.equal(DENY, code);
-                done();
-            }, this.connection, ['STATUS', 'POOL LIST']);
+            this.connection.remote.is_local = false
+            this.plugin.hook_unrecognized_command(
+                (code) => {
+                    assert.equal(DENY, code)
+                    done()
+                },
+                this.connection,
+                ['STATUS', 'POOL LIST'],
+            )
         })
     })
 
@@ -44,11 +47,11 @@ describe('status', () => {
 
         it('list_pools', (done) => {
             this.connection.respond = (code, message) => {
-                const data = JSON.parse(message);
-                assert.equal('object', typeof data); // there should be one pools array for noncluster and more for cluster
-                done();
-            };
-            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'POOL LIST']);
+                const data = JSON.parse(message)
+                assert.equal('object', typeof data) // there should be one pools array for noncluster and more for cluster
+                done()
+            }
+            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'POOL LIST'])
         })
     })
 
@@ -57,74 +60,78 @@ describe('status', () => {
 
         it('inspect_queue', (done) => {
             // should list delivery_queue and temp_fail_queue per cluster children
-            outbound.temp_fail_queue = new TimerQueue(10);
-            outbound.temp_fail_queue.add('file1', 100, () => {});
-            outbound.temp_fail_queue.add('file2', 100, () => {});
+            outbound.temp_fail_queue = new TimerQueue(10)
+            outbound.temp_fail_queue.add('file1', 100, () => {})
+            outbound.temp_fail_queue.add('file2', 100, () => {})
 
             this.connection.respond = (code, message) => {
-                const data = JSON.parse(message);
-                assert.equal(0, data.delivery_queue.length);
-                assert.equal(2, data.temp_fail_queue.length);
-                done();
-            };
-            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE INSPECT']);
+                const data = JSON.parse(message)
+                assert.equal(0, data.delivery_queue.length)
+                assert.equal(2, data.temp_fail_queue.length)
+                done()
+            }
+            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE INSPECT'])
         })
 
         it('stat_queue', (done) => {
             // should list files only
             this.connection.respond = (code, message) => {
-                const data = JSON.parse(message);
-                assert.ok(/^\d+\/\d+\/\d+$/.test(data));
-                done();
-            };
-            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE STATS']);
+                const data = JSON.parse(message)
+                assert.ok(/^\d+\/\d+\/\d+$/.test(data))
+                done()
+            }
+            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE STATS'])
         })
 
         it('list_queue', (done) => {
             // should list files only
             this.connection.respond = (code, message) => {
-                const data = JSON.parse(message);
-                assert.equal(0, data.length);
-                done();
-            };
-            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE LIST']);
+                const data = JSON.parse(message)
+                assert.equal(0, data.length)
+                done()
+            }
+            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE LIST'])
         })
 
         it('discard_from_queue', (done) => {
-            const self = this;
+            const self = this
 
-            outbound.temp_fail_queue = new TimerQueue(10);
+            outbound.temp_fail_queue = new TimerQueue(10)
             outbound.temp_fail_queue.add('file1', 10, () => {
-                assert.ok(false, 'This callback should not be called');
-                done();
+                assert.ok(false, 'This callback should not be called')
+                done()
             })
 
-            outbound.temp_fail_queue.add('file2', 2000, () => {});
-
-            this.plugin.hook_unrecognized_command(() => {
-                self.connection.respond = (code, message) => {
-                    const data = JSON.parse(message);
-                    assert.equal(1, data.temp_fail_queue.length);
-                    done();
-                }
-                self.plugin.hook_unrecognized_command(() => {}, self.connection, ['STATUS', 'QUEUE INSPECT']);
-            }, this.connection, ['STATUS', 'QUEUE DISCARD file1']);
+            outbound.temp_fail_queue.add('file2', 2000, () => {})
+
+            this.plugin.hook_unrecognized_command(
+                () => {
+                    self.connection.respond = (code, message) => {
+                        const data = JSON.parse(message)
+                        assert.equal(1, data.temp_fail_queue.length)
+                        done()
+                    }
+                    self.plugin.hook_unrecognized_command(() => {}, self.connection, ['STATUS', 'QUEUE INSPECT'])
+                },
+                this.connection,
+                ['STATUS', 'QUEUE DISCARD file1'],
+            )
         })
 
         it('push_email_at_queue', (done) => {
             const timeout = setTimeout(() => {
-                assert.ok(false, 'Timeout');
-                done();
-            }, 1000);
+                assert.ok(false, 'Timeout')
+                done()
+            }, 1000)
 
             outbound.temp_fail_queue.add('file', 1500, () => {
-                clearTimeout(timeout);
+                clearTimeout(timeout)
 
-                assert.ok(true);
-                done();
-            });
+                assert.ok(true)
+                done()
+            })
 
-            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE PUSH file']);
+            this.plugin.hook_unrecognized_command(() => {}, this.connection, ['STATUS', 'QUEUE PUSH file'])
         })
     })
-})
+})