Haraka 3.0.1 → 3.0.3

package/tests/plugins/queue/smtp_forward.js

@@ -4,6 +4,7 @@ const path         = require('path');
 
 const { Address }  = require('address-rfc2821');
 const fixtures     = require('haraka-test-fixtures');
+const Notes        = require('haraka-notes')
 
 const OK = 906;
 
@@ -14,6 +15,7 @@ function _setup (done) {
     this.plugin.config = this.plugin.config.module_config(path.resolve('tests'));
 
     this.plugin.register();
+    this.hmail = { todo: { notes: new Notes() } };
 
     this.connection = new fixtures.connection.createConnection();
     this.connection.transaction = new fixtures.transaction.createTransaction();
@@ -131,21 +133,29 @@ exports.get_config = {
     }
 }
 
-const hmail = { todo: { notes: {} } };
 exports.get_mx = {
     setUp : _setup,
     'returns no outbound route for undefined domains' (test) {
         test.expect(2);
-        function cb (code, mx) {
+        this.plugin.get_mx((code, mx) => {
             test.equal(code, undefined);
             test.deepEqual(mx, undefined);
             test.done();
-        }
-        this.plugin.get_mx(cb, hmail, 'undefined.com');
+        }, this.hmail, 'undefined.com');
+    },
+    'returns no outbound route when queue.wants !== smtp_forward' (test) {
+        test.expect(2);
+        this.hmail.todo.notes.set('queue.wants', 'outbound')
+        this.hmail.todo.notes.set('queue.next_hop', 'smtp://5.4.3.2:26')
+        this.plugin.get_mx((code, mx) => {
+            test.equal(code, undefined);
+            test.deepEqual(mx, undefined);
+            test.done();
+        }, this.hmail, 'undefined.com');
     },
     'returns an outbound route for defined domains' (test) {
         test.expect(2);
-        function cb (code, mx) {
+        this.plugin.get_mx((code, mx) => {
             test.equal(code, OK);
             test.deepEqual(mx, {
                 priority: 0, exchange: '1.2.3.4', port: 2555,
@@ -153,8 +163,27 @@ exports.get_mx = {
                 auth_pass: 'superDuperSecret'
             });
             test.done();
-        }
-        this.plugin.get_mx(cb, hmail, 'test.com');
+        }, this.hmail, 'test.com');
+    },
+    'is enabled when queue.wants is set' (test) {
+        test.expect(2);
+        this.hmail.todo.notes.set('queue.wants', 'smtp_forward')
+        this.hmail.todo.notes.set('queue.next_hop', 'smtp://4.3.2.1:465')
+        this.plugin.get_mx((code, mx) => {
+            test.equal(code, OK);
+            test.deepEqual(mx, { priority: 0, port: 465, exchange: '4.3.2.1' });
+            test.done();
+        }, this.hmail, 'undefined.com');
+    },
+    'sets using_lmtp when next_hop URL is lmtp' (test) {
+        test.expect(2);
+        this.hmail.todo.notes.set('queue.wants', 'smtp_forward')
+        this.hmail.todo.notes.set('queue.next_hop', 'lmtp://4.3.2.1')
+        this.plugin.get_mx((code, mx) => {
+            test.equal(code, OK);
+            test.deepEqual(mx, { priority: 0, port: 24, using_lmtp: true, exchange: '4.3.2.1' });
+            test.done();
+        }, this.hmail, 'undefined.com');
     },
 }
 

package/transaction.js

@@ -152,7 +152,7 @@ class Transaction {
                 this.header_lines.push(line.toString(this.encoding).replace(/\r\n$/, '\n'));
             }
         }
-        else if (this.header_pos && this.parse_body) {
+        else if (this.parse_body) {
             let new_line = line;
             if (new_line[0] === 0x2E) new_line = new_line.slice(1); // Strip leading "."
 

package/config/lookup_rdns.strict.ini

@@ -1,12 +0,0 @@
-[general]
-nomatch=Please setup matching DNS and rDNS records.
-timeout=60
-timeout_msg=DNS check timed out.
-
-[forward]
-nxdomain=Please setup a forward DNS record.
-dnserror=Please setup matching DNS and rDNS records.
-
-[reverse]
-nxdomain=Please setup a reverse DNS record.
-dnserror=Please setup matching DNS and rDNS records.

package/config/lookup_rdns.strict.timeout

@@ -1 +0,0 @@
-0

package/config/lookup_rdns.strict.whitelist

@@ -1 +0,0 @@
-# Hostnames and IPs are matched exactly as written on each line.

package/config/lookup_rdns.strict.whitelist_regex

@@ -1,5 +0,0 @@
-# Does the same thing as the whitelist file, but each line is a regex.
-# Each line is also anchored for you, meaning '^' + regex + '$' is added for
-# you.  If you need to get around this restriction, you may use a '.*' at
-# either the start or the end of your regex.  This should help prevent people
-# from writing overly permissive rules on accident.

package/config/rcpt_to.blocklist

@@ -1 +0,0 @@
-# This is a blocklist for the rcpt_to line. One address per line.

package/config.js

@@ -1,6 +0,0 @@
-'use strict'
-
-module.exports = require('haraka-config')
-
-// use emit is the same way util.deprecate does it, so follow that style
-process.emit('warning', 'Loading config via require("./config") is deprecated, please use: require("haraka-config") instead.')