Haraka 2.8.28 → 3.0.1

package/tests/plugins/bounce.js

@@ -2,12 +2,10 @@
 
 const Address      = require('address-rfc2821');
 const fixtures     = require('haraka-test-fixtures');
+const message      = require('haraka-email-message')
 
 const Connection   = fixtures.connection;
 
-const Body         = require('../../mailbody').Body;
-const Header       = require('../../mailheader').Header;
-
 function _set_up (done) {
 
     this.plugin = new fixtures.plugin('bounce');
@@ -31,7 +29,7 @@ function _set_up (done) {
     this.connection = Connection.createConnection();
     this.connection.remote.ip = '8.8.8.8';
     this.connection.transaction = {
-        header: new Header(),
+        header: new message.Header(),
         results: new fixtures.results(this.plugin),
     };
 
@@ -126,7 +124,7 @@ exports.non_local_msgid = {
         test.expect(1);
         this.connection.transaction.mail_from= new Address.Address('<>');
         this.connection.transaction.rcpt_to= [ new Address.Address('test@good.com') ];
-        this.connection.transaction.body = new Body();
+        this.connection.transaction.body = new message.Body();
         this.connection.transaction.body.bodytext = '';
         const cb = function () {
             test.equal(DENY, arguments[0]);
@@ -138,7 +136,7 @@ exports.non_local_msgid = {
         test.expect(1);
         this.connection.transaction.mail_from= new Address.Address('<>');
         this.connection.transaction.rcpt_to= [ new Address.Address('test@good.com') ];
-        this.connection.transaction.body = new Body();
+        this.connection.transaction.body = new message.Body();
         this.connection.transaction.body.bodytext = 'Message-ID:<blah>';
         const cb = function () {
             test.equal(DENY, arguments[0]);
@@ -150,7 +148,7 @@ exports.non_local_msgid = {
         test.expect(2);
         this.connection.transaction.mail_from= new Address.Address('<>');
         this.connection.transaction.rcpt_to= [ new Address.Address('test@good.com') ];
-        this.connection.transaction.body = new Body();
+        this.connection.transaction.body = new message.Body();
         this.connection.transaction.body.bodytext = 'Message-ID: <blah@foo.cooooooom>';
         const cb = function () {
             test.equal(DENY, arguments[0]);
@@ -164,7 +162,7 @@ exports.non_local_msgid = {
         test.expect(2);
         this.connection.transaction.mail_from= new Address.Address('<>');
         this.connection.transaction.rcpt_to= [ new Address.Address('test@good.com') ];
-        this.connection.transaction.body = new Body();
+        this.connection.transaction.body = new message.Body();
         this.connection.transaction.body.bodytext = 'Message-ID: <blah@foo.com>';
         var cb = function () {
             test.equal(DENY, arguments[0]);

package/tests/plugins/dkim_signer.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const fixtures     = require('haraka-test-fixtures');
+const message      = require('haraka-email-message')
 
-const DKIMSignStream = require('../../plugins/dkim_sign').DKIMSignStream;
-const Header = require('../../mailheader').Header;
+const { DKIMSignStream } = require('../../plugins/dkim_sign');
 
 const privateKey = `-----BEGIN RSA PRIVATE KEY-----
 MIICXwIBAAKBgQDwIRP/UC3SBsEmGqZ9ZJW3/DkMoGeLnQg1fWn7/zYtIxN2SnFC
@@ -33,7 +33,7 @@ frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN/XKdLCPjaYaY=
 function getValueFromDKIM (dkim_header, key) {
     const kv = dkim_header.split(';');
     for (let i = 0, len = kv.length; i < len; i++) {
-        const arr = kv[i].match(/^([^=]+)=(.*)$/);
+        const arr = kv[i].match(/^\s*([^=]+)=(.*)$/);
         if (arr[1] === key) {
             return arr[2];
         }
@@ -55,7 +55,7 @@ exports.sign = {
         test.expect(1);
         const email = 'Ignored: header\r\n\r\nHi.\r\n\r\nWe lost the game. Are you hungry yet?\r\n\r\nJoe.\r\n';
 
-        const header = new Header();
+        const header = new message.Header();
         header.parse(['Ignored: header']);
         const signer = new DKIMSignStream(props, header, (n, dkim) => {
             test.equal(getValueFromDKIM(dkim, 'bh'), '2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8=');
@@ -69,7 +69,7 @@ exports.sign = {
 
         const email = 'Ignored: header\r\n\r\n';
 
-        const header = new Header();
+        const header = new message.Header();
         header.parse(['Ignored: header']);
         const signer = new DKIMSignStream(props, header, (n, dkim) => {
             test.equal(getValueFromDKIM(dkim, 'bh'), 'frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN/XKdLCPjaYaY=');
@@ -81,7 +81,7 @@ exports.sign = {
     'body hash simple, two writes' (test) {
         test.expect(1);
 
-        const header = new Header();
+        const header = new message.Header();
         header.parse(['Ignored: header']);
         const signer = new DKIMSignStream(props, header, (n, dkim) => {
             test.equal(getValueFromDKIM(dkim, 'bh'), '2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8=');
@@ -96,7 +96,7 @@ exports.sign = {
 
         const email = 'Ignored: header\r\n\r\nHi.\r\n\r\nWe lost the game. Are you hungry yet?\r\n\r\nJoe.\r\n\r\n\r\n';
 
-        const header = new Header();
+        const header = new message.Header();
         header.parse(['Ignored: header']);
         const signer = new DKIMSignStream(props, header, (n, dkim) => {
             test.equal(getValueFromDKIM(dkim, 'bh'), '2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8=');

package/tests/plugins/dns_list_base.js

@@ -93,7 +93,7 @@ exports.multi = {
                 test.done();
             }
         }
-        this.plugin.multi('127.0.0.2', 'cbl.abuseat.org', cb);
+        this.plugin.multi('127.0.0.2', 'xbl.spamhaus.org', cb);
     },
     'Spamcop + CBL' (test) {
         test.expect(12);
@@ -111,7 +111,7 @@ exports.multi = {
                 test.done();
             }
         }
-        const dnsbls = ['bl.spamcop.net','cbl.abuseat.org'];
+        const dnsbls = ['bl.spamcop.net','xbl.spamhaus.org'];
         this.plugin.multi('127.0.0.2', dnsbls, cb);
     },
     'Spamcop + CBL + negative result' (test) {
@@ -129,7 +129,7 @@ exports.multi = {
                 test.done();
             }
         }
-        const dnsbls = ['bl.spamcop.net','cbl.abuseat.org'];
+        const dnsbls = ['bl.spamcop.net','xbl.spamhaus.org'];
         this.plugin.multi('127.0.0.1', dnsbls, cb);
     },
     'IPv6 addresses supported' (test) {
@@ -148,7 +148,7 @@ exports.multi = {
                 test.done();
             }
         }
-        const dnsbls = ['bl.spamcop.net','cbl.abuseat.org'];
+        const dnsbls = ['bl.spamcop.net','xbl.spamhaus.org'];
         this.plugin.multi('::1', dnsbls, cb);
     }
 }
@@ -163,7 +163,7 @@ exports.first = {
             test.ok((Array.isArray(a) && a.length > 0));
             test.done();
         }
-        const dnsbls = [ 'cbl.abuseat.org', 'bl.spamcop.net' ];
+        const dnsbls = [ 'xbl.spamhaus.org', 'bl.spamcop.net' ];
         this.plugin.first('127.0.0.2', dnsbls , cb);
     },
     'negative result' (test) {
@@ -174,12 +174,12 @@ exports.first = {
             test.equal(null, a);
             test.done();
         }
-        const dnsbls = [ 'cbl.abuseat.org', 'bl.spamcop.net' ];
+        const dnsbls = [ 'xbl.spamhaus.org', 'bl.spamcop.net' ];
         this.plugin.first('127.0.0.1', dnsbls, cb);
     },
     'each_cb' (test) {
         test.expect(7);
-        const dnsbls = [ 'cbl.abuseat.org', 'bl.spamcop.net' ];
+        const dnsbls = [ 'xbl.spamhaus.org', 'bl.spamcop.net' ];
         let pending = dnsbls.length;
         function cb () {
             test.ok(pending);

package/tests/plugins/helo.checks.js

@@ -3,7 +3,7 @@
 const path         = require('path');
 const fixtures     = require('haraka-test-fixtures');
 
-const stub         = fixtures.stub.stub;
+const { stub }     = fixtures.stub;
 
 const _set_up = function (done) {
 

package/tests/plugins/mail_from.is_resolvable.js

@@ -22,13 +22,12 @@ exports.mxErr = {
     setUp : _set_up,
     'any.com, no err code' (test) {
         test.expect(3);
-        const t = this;
-        const txn = t.connection.transaction;
+        const txn = this.connection.transaction;
         const err = new Error('oops');
         err.code = null;
         let called = false;
         function cb () { called = true; }
-        const r  = t.plugin.mxErr(t.connection, 'any.com', 'MX', err, cb);
+        const r  = this.plugin.mxErr(this.connection, 'any.com', 'MX', err, cb);
         test.equal(r, true);
         test.equal(called, true);
         const mf = txn.results.get('mail_from.is_resolvable');
@@ -37,13 +36,12 @@ exports.mxErr = {
     },
     'any.com, bypass err code' (test) {
         test.expect(3);
-        const t = this;
-        const txn = t.connection.transaction;
+        const txn = this.connection.transaction;
         const err = new Error('oops');
         err.code=dns.NOTFOUND;
         let called = false;
         function cb () { called = true; }
-        const r  = t.plugin.mxErr(t.connection, 'any.com', 'MX', err, cb);
+        const r  = this.plugin.mxErr(this.connection, 'any.com', 'MX', err, cb);
         test.equal(r, false);
         test.equal(called, false);
         const mf = txn.results.get('mail_from.is_resolvable');
@@ -56,9 +54,8 @@ exports.implicit_mx = {
     setUp : _set_up,
     'tnpi.net' (test) {
         test.expect(2);
-        const t = this;
         const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'tnpi.net', err => {
+        this.plugin.implicit_mx(this.connection, 'tnpi.net', err => {
             test.equal(err, undefined);
             const mf = txn.results.get('mail_from.is_resolvable');
             test.equal(mf.pass.length, 1);
@@ -67,9 +64,8 @@ exports.implicit_mx = {
     },
     'harakamail.com' (test) {
         test.expect(1);
-        const t = this;
         const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'harakamail.com', () => {
+        this.plugin.implicit_mx(this.connection, 'harakamail.com', () => {
             // console.log(arguments);
             const mf = txn.results.get('mail_from.is_resolvable');
             // console.log(mf);
@@ -79,56 +75,18 @@ exports.implicit_mx = {
     },
     'mx.theartfarm.com' (test) {
         test.expect(1);
-        const t = this;
         const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'mx.theartfarm.com', () => {
+        this.plugin.implicit_mx(this.connection, 'mx.theartfarm.com', () => {
             const mf = txn.results.get('mail_from.is_resolvable');
             // console.log(mf);
             test.equal(mf.fail.length, 1);
             test.done();
         });
     },
-    'mxs4am.josef-froehle.de' (test) {
-        test.expect(1);
-        const t = this;
-        const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'mxs4am.josef-froehle.de', () => {
-            //console.log(arguments);
-            const mf = txn.results.get('mail_from.is_resolvable');
-            //console.log(mf);
-            test.equal(mf.pass.length, 1);
-            test.done();
-        });
-    },
-    'mxs4am-a.josef-froehle.de' (test) {
-        test.expect(1);
-        const t = this;
-        const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'mxs4am-a.josef-froehle.de', () => {
-            //console.log(arguments);
-            const mf = txn.results.get('mail_from.is_resolvable');
-            //console.log(mf);
-            test.equal(mf.pass.length, 1);
-            test.done();
-        });
-    },
-    'mxs4am-aaaa.josef-froehle.de' (test) {
-        test.expect(1);
-        const t = this;
-        const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'mxs4am-aaaa.josef-froehle.de', () => {
-            //console.log(arguments);
-            const mf = txn.results.get('mail_from.is_resolvable');
-            //console.log(mf);
-            test.equal(mf.pass.length, 1);
-            test.done();
-        });
-    },
     'resolve-fail-definitive.josef-froehle.de' (test) {
         test.expect(1);
-        const t = this;
         const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'resolve-fail-definitive.josef-froehle.de', () => {
+        this.plugin.implicit_mx(this.connection, 'resolve-fail-definitive.josef-froehle.de', () => {
             const mf = txn.results.get('mail_from.is_resolvable');
             //console.log(mf);
             test.equal(mf.fail.length, 1);
@@ -137,9 +95,8 @@ exports.implicit_mx = {
     },
     'resolve-fail-a.josef-froehle.de' (test) {
         test.expect(1);
-        const t = this;
         const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'resolve-fail-a.josef-froehle.de', () => {
+        this.plugin.implicit_mx(this.connection, 'resolve-fail-a.josef-froehle.de', () => {
             const mf = txn.results.get('mail_from.is_resolvable');
             //console.log(mf);
             test.equal(mf.fail.length, 1);
@@ -148,9 +105,8 @@ exports.implicit_mx = {
     },
     'resolve-fail-aaaa.josef-froehle.de' (test) {
         test.expect(1);
-        const t = this;
         const txn = this.connection.transaction;
-        t.plugin.implicit_mx(t.connection, 'resolve-fail-aaaa.josef-froehle.de', () => {
+        this.plugin.implicit_mx(this.connection, 'resolve-fail-aaaa.josef-froehle.de', () => {
             const mf = txn.results.get('mail_from.is_resolvable');
             //console.log(mf);
             test.equal(mf.fail.length, 1);

package/tests/plugins/queue/smtp_forward.js

@@ -2,7 +2,7 @@
 
 const path         = require('path');
 
-const Address      = require('address-rfc2821').Address;
+const { Address }  = require('address-rfc2821');
 const fixtures     = require('haraka-test-fixtures');
 
 const OK = 906;
@@ -160,33 +160,33 @@ exports.get_mx = {
 
 exports.is_outbound_enabled = {
     setUp : _setup,
-    'enable_outbound is true by default' (test) {
+    'enable_outbound is false by default' (test) {
         test.expect(1);
-        test.equal(this.plugin.is_outbound_enabled(this.plugin.cfg), true);
+        test.equal(this.plugin.is_outbound_enabled(this.plugin.cfg), false);
         test.done();
     },
-    'per-domain enable_outbound is true by default' (test) {
+    'per-domain enable_outbound is false by default' (test) {
         test.expect(1);
         this.connection.transaction.rcpt_to = [ new Address('<postmaster@test.com>') ];
         const cfg = this.plugin.get_config(this.connection);
-        test.equal(this.plugin.is_outbound_enabled(cfg), true);
+        test.equal(this.plugin.is_outbound_enabled(cfg), false);
         test.done();
     },
-    'per-domain enable_outbound can be set to false' (test) {
+    'per-domain enable_outbound can be set to true' (test) {
         test.expect(1);
-        this.plugin.cfg['test.com'].enable_outbound = false;
+        this.plugin.cfg['test.com'].enable_outbound = true;
         this.connection.transaction.rcpt_to = [ new Address('<postmaster@test.com>') ];
         const cfg = this.plugin.get_config(this.connection);
-        test.equal(this.plugin.is_outbound_enabled(cfg), false);
+        test.equal(this.plugin.is_outbound_enabled(cfg), true);
         test.done();
     },
-    'per-domain enable_outbound is true even if top level is false' (test) {
+    'per-domain enable_outbound is false even if top level is false' (test) {
         test.expect(1);
         this.plugin.cfg.main.enable_outbound = false; // this will be ignored
-        this.plugin.cfg['test.com'].enable_outbound = true;
+        this.plugin.cfg['test.com'].enable_outbound = false;
         this.connection.transaction.rcpt_to = [ new Address('<postmaster@test.com>') ];
         const cfg = this.plugin.get_config(this.connection);
-        test.equal(this.plugin.is_outbound_enabled(cfg), true);
+        test.equal(this.plugin.is_outbound_enabled(cfg), false);
         test.done();
     }
 }

package/tests/plugins/rcpt_to.host_list_base.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Address      = require('address-rfc2821').Address;
+const { Address }  = require('address-rfc2821');
 const fixtures     = require('haraka-test-fixtures');
 
 function _set_up (done) {

package/tests/plugins/rcpt_to.in_host_list.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Address      = require('address-rfc2821').Address;
+const { Address }  = require('address-rfc2821');
 const fixtures     = require('haraka-test-fixtures');
 
 function _set_up (done) {

package/tests/plugins/spamassassin.js

@@ -158,7 +158,7 @@ exports.score_too_high = {
         test.expect(1);
         this.connection.relaying = true;
         this.plugin.cfg.main.relay_reject_threshold = 7;
-        test.equal(false, this.plugin.score_too_high(this.connection, {score: 6}));
+        test.equal('', this.plugin.score_too_high(this.connection, {score: 6}));
         test.done();
     },
     'too high score with relaying is too high' (test) {

package/tests/rfc1869.js

@@ -1,4 +1,4 @@
-const parse = require('../rfc1869').parse;
+const { parse } = require('../rfc1869');
 
 function _check (test, line, expected) {
     test.expect(1 + expected.length);
@@ -55,4 +55,7 @@ exports.basic = {
         _check(test, 'RCPT TO:<user=name@domain.com> foo=bar',
             ['<user=name@domain.com>', 'foo=bar']);
     },
+    'RCPT TO:<postmaster>': test => {
+        _check(test, 'RCPT TO:<postmaster>', ['<postmaster>']);
+    },
 }

package/tests/server.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const endpoint = require('../endpoint');
+const message = require('haraka-email-message')
 
 function _set_up (done) {
 
@@ -204,14 +205,11 @@ exports.smtp_client = {
         const server = { notes: { } };
         const cfg = {
             connect_timeout: 2,
-            pool_timeout: 5,
-            max_connections: 3,
         }
 
         const smtp_client   = require('../smtp_client');
-        const MessageStream = require('../messagestream');
 
-        smtp_client.get_client(server, (err, client) => {
+        smtp_client.get_client(server, (client) => {
 
             client
                 .on('greeting', command => {
@@ -227,7 +225,7 @@ exports.smtp_client = {
                     client.send_command('DATA');
                 })
                 .on('data', () => {
-                    const message_stream = new MessageStream(
+                    const message_stream = new message.stream(
                         { main : { spool_after : 1024 } }, "theMessageId"
                     );
 
@@ -251,7 +249,7 @@ exports.smtp_client = {
                     test.done();
                 });
 
-        }, 2500, 'localhost', cfg);
+        }, { port: 2500, host: 'localhost', cfg });
     },
 }
 
@@ -415,7 +413,7 @@ exports.nodemailer = {
 
 exports.requireAuthorized_SMTPS = {
     setUp (done) {
-        _setupServer(this, 'localhost:2465', done);
+        _setupServer(this, '127.0.0.1:2465', done);
     },
     tearDown: _tearDownServer,
     'rejects non-validated SMTPS connection': test => {
@@ -451,6 +449,9 @@ exports.requireAuthorized_SMTPS = {
                     if (error.message === 'socket hang up') {   // node 6 & 8
                         test.equal(error.message, 'socket hang up');
                     }
+                    else if (/alert certificate required/.test(error.message)) {  // node 18
+                        test.ok(/alert certificate required/.test(error.message))
+                    }
                     else {     // node 10+
                         test.equal(error.message, 'Client network socket disconnected before secure TLS connection was established');
                     }
@@ -463,7 +464,7 @@ exports.requireAuthorized_SMTPS = {
 
 exports.requireAuthorized_STARTTLS = {
     setUp (done) {
-        _setupServer(this, 'localhost:2587', done);
+        _setupServer(this, '127.0.0.1:2587', done);
     },
     'rejects non-validated STARTTLS connection': test => {
 
@@ -495,7 +496,12 @@ exports.requireAuthorized_STARTTLS = {
             (error, info) => {
                 if (error) {
                     // console.log(error);
-                    test.equal(error.message, 'Client network socket disconnected before secure TLS connection was established');
+                    if (/alert certificate required/.test(error.message)) {  // node 18
+                        test.ok(/alert certificate required/.test(error.message))
+                    }
+                    else {
+                        test.equal(error.message, 'Client network socket disconnected before secure TLS connection was established');
+                    }
                 }
                 test.done();
             });

package/tests/smtp_client/auth.js

@@ -1,21 +1,11 @@
-const MessageStream = require('./messagestream');
+const message = require('haraka-email-message')
 
-test.expect(22);
+test.expect(15);
 const server = {notes: {}};
 
-exports.get_pool(server);
-const pool_name = '25:localhost:300:no_user';
-test.equals(1, Object.keys(server.notes.pool).length);
-test.equals(pool_name, Object.keys(server.notes.pool)[0]);
-test.equals(0, server.notes.pool[pool_name].getPoolSize());
-test.equals(0, server.notes.pool[pool_name].availableObjectsCount());
+exports.get_client(server, (smtp_client) => {
 
-exports.get_client(server, (err, smtp_client) => {
-    test.equals(null, err);
-    test.equals(1, server.notes.pool[pool_name].getPoolSize());
-    test.equals(0, server.notes.pool[pool_name].availableObjectsCount());
-
-    const message_stream = new MessageStream(
+    const message_stream = new message.stream(
         { main : { spool_after : 1024 } }, "123456789"
     );
 

package/tests/smtp_client/basic.js

@@ -1,22 +1,12 @@
-const MessageStream = require('./messagestream');
+const message = require('haraka-email-message')
 
-test.expect(21);
+test.expect(14);
 const server = {notes: {}};
 
-exports.get_pool(server);
-const pool_name = '25:localhost:300:no_user';
-test.equals(1, Object.keys(server.notes.pool).length);
-test.equals(pool_name, Object.keys(server.notes.pool)[0]);
-test.equals(0, server.notes.pool[pool_name].getPoolSize());
-test.equals(0, server.notes.pool[pool_name].availableObjectsCount());
+exports.get_client(server, (smtp_client) => {
 
-exports.get_client(server, (err, smtp_client) => {
-    test.equals(null, err);
-    test.equals(1, server.notes.pool[pool_name].getPoolSize());
-    test.equals(0, server.notes.pool[pool_name].availableObjectsCount());
-
-    const message_stream = new MessageStream(
-        { main : { spool_after : 1024 } }, "123456789"
+    const message_stream = new message.stream(
+        { main : { spool_after : 1024 } }, '123456789'
     );
 
     const data = [];

package/tests/smtp_client.js

@@ -11,6 +11,10 @@ vm_harness.add_tests(
 const smtp_client = require('../smtp_client');
 const fixtures    = require('haraka-test-fixtures');
 
+function getClientOpts (socket) {
+    return { port: 25, host: 'localhost', connect_timeout: 30, idle_timeout: 30, socket }
+}
+
 exports.testUpgradeIsCalledOnSTARTTLS = test => {
     test.expect(1);
 
@@ -35,13 +39,13 @@ exports.testUpgradeIsCalledOnSTARTTLS = test => {
         }
     };
 
-    const client = new smtp_client.smtp_client(25, 'localhost', 30, 30, socket);
+    const client = new smtp_client.smtp_client(getClientOpts(socket));
     client.load_tls_config({ key: Buffer.from('OutboundTlsKeyLoaded')});
 
     client.command = 'starttls';
     cmds.line('250 Hello client.example.com\r\n');
 
-    const StringDecoder = require('string_decoder').StringDecoder;
+    const { StringDecoder } = require('string_decoder');
     const decoder = new StringDecoder('utf8');
 
     const cent = Buffer.from(upgradeArgs.key);
@@ -63,7 +67,7 @@ exports.startTLS = test => {
         write: arg => { cmd = arg; }
     };
 
-    const client = new smtp_client.smtp_client(25, 'localhost', 30, 30, socket);
+    const client = new smtp_client.smtp_client(getClientOpts(socket));
     client.tls_options = {};
 
     client.secured = false;