Haraka 3.0.3 → 3.0.4

package/config/mail_from.is_resolvable.ini

@@ -1,4 +1,6 @@
 timeout=29
-allow_mx_ip=0
-reject_no_mx=1
+allow_mx_ip=false
 re_bogus_ip=^(?:0\.0\.0\.0|255\.255\.255\.255|127\.)
+
+[reject]
+no_mx=true

package/config/me

@@ -0,0 +1 @@
+home.simerson.net

package/config/outbound.ini

@@ -11,8 +11,6 @@
 
 ; maxTempFailures (default: 13)
 
-; ipv6_enabled (default: false)
-
 ; load_pid_queue
 ; flush_queue
 

package/config/plugins

@@ -1,71 +1,72 @@
 # This file lists plugins that Haraka will run
 #
 # Plugin ordering often matters, run 'haraka -o -c /path/to/haraka/config'
-# to see the order plugins (and their hooks) will run in.
+# to see the order plugins (and their hooks) will run.
 #
-# To see a list of all plugins, run 'haraka -l'
+# To see a list of installed plugins, run 'haraka -l'
 #
-# To see the help docs for a particular plugin, run 'haraka -h plugin.name'
+# The plugin registry: https://github.com/haraka/Haraka/blob/master/Plugins.md
+#
+# To see the docs for a plugin, run 'haraka -h plugin.name'
 
-#status
-#process_title
-# Log to syslog (see 'haraka -h syslog')
+# status
+# process_title
 # syslog
+# watch
 
 # CONNECT
-#toobusy
-#karma
-#relay
-# control which IPs, rDNS hostnames, HELO hostnames, MAIL FROM addresses, and
-# RCPT TO address you accept mail from. See 'haraka -h access'.
+# ----------
+# toobusy
+# karma
+# relay
 # access
 # p0f
 # geoip
 # asn
 # fcrdns
-# block mails from known bad hosts (see config/dnsbl.zones for the DNS zones queried)
-dnsbl
+# dns-list
 
 # HELO
-#early_talker
-# see config/helo.checks.ini for configuration
-helo.checks
-# see 'haraka -h tls' for config instructions before enabling!
+# ----------
+# early_talker
+# helo.checks
+# see 'haraka -h tls' before enabling!
 # tls
 #
 # AUTH plugins require TLS before AUTH is advertised, see
 #     https://github.com/haraka/Haraka/wiki/Require-SSL-TLS
+# ----------
 # auth/flat_file
 # auth/auth_proxy
 # auth/auth_ldap
 
 # MAIL FROM
-# Only accept mail where the MAIL FROM domain is resolvable to an MX record
+# ----------
 mail_from.is_resolvable
-#spf
+# spf
 
 # RCPT TO
-# At least one rcpt_to plugin is REQUIRED for inbound email. The simplest
-# plugin is in_host_list, see 'haraka -h rcpt_to.in_host_list' to configure.
+# ----------
+# At least one rcpt_to plugin is REQUIRED for inbound email.
 rcpt_to.in_host_list
-#qmail-deliverable
-#rcpt_to.ldap
-#rcpt_to.routes
+# qmail-deliverable
+# rcpt_to.ldap
+# rcpt_to.routes
 
 # DATA
-#bounce
-# Check mail headers are valid
-headers
-#uribl
-#attachment
-#clamd
-#spamassassin
-#dkim_sign
-#limit
+# ----------
+# attachment
+# bounce
+# clamd
+# dkim
+# headers
+# limit
+# rspamd
+# spamassassin
+# uribl
 
 # QUEUE
+# ----------
 # queues: discard  qmail-queue  quarantine  smtp_forward  smtp_proxy
 # Queue mail via smtp - see config/smtp_forward.ini for where your mail goes
 queue/smtp_forward
-
-#watch

package/config/smtp.ini

@@ -54,7 +54,6 @@
 ;add_received=true
 ;clean_auth_results=true
 
-; replace header_hide_version
 ;show_version=true
 
 ; replace max_header_lines

package/config/smtp.json

@@ -0,0 +1,17 @@
+{
+    "!smtp.ini": {
+        "main": {
+            "listen": "[::0]:25, [::0]:465, [::0]:587",
+            "nodes": 1
+        },
+        "headers": {
+            "max_lines": 1000,
+            "max_received": 100
+        }
+    },
+    "!relay.ini": {
+        "relay": {
+            "acl": true
+        }
+    }
+}

package/config/tls_cert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID3zCCAsegAwIBAgIULzqgBA7/eKhkpsSvZ3OzpAWLkYEwDQYJKoZIhvcNAQEL
+BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xEjAQBgNVBAcM
+CVNob3JlbGluZTENMAsGA1UECgwEVE5QSTEaMBgGA1UEAwwRaG9tZS5zaW1lcnNv
+bi5uZXQxHDAaBgkqhkiG9w0BCQEWDW1hdHRAdG5waS5uZXQwHhcNMjQwNDI3MDM1
+MzI2WhcNMzAwNDI2MDM1MzI2WjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKV2Fz
+aGluZ3RvbjESMBAGA1UEBwwJU2hvcmVsaW5lMQ0wCwYDVQQKDARUTlBJMRowGAYD
+VQQDDBFob21lLnNpbWVyc29uLm5ldDEcMBoGCSqGSIb3DQEJARYNbWF0dEB0bnBp
+Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKotMDxPuAU+ygZy
+82wBMmzo7bFuM4sV1jKTuoNpIus4j98Y/uIHVc0v0A9nGYkwb4Emo5vmcF6MntHH
+ICUTgN31W8YT0gDyyU4JdB+QHIxdMLtspDildH9wJKDxz43orOv6dsU4m542Fbk0
+E7lnh9GV1CoHlYRcmA8KGH9jfCjfyBuW8rLRF5QLE13pFDJkJl11GKm71w8XPk9h
+YuFvDsxhMDXDqaYdaLLQnE6NL7/fBF+31A/5+6VsHst0S8/WMvua67vxHbzGrw2i
+zAVkyciZ/peA132krkNXNgkjKusOfJheZYpYqzPSjEmsSvKayfuf1YByz060osXC
+0Tcd4usCAwEAAaNTMFEwHQYDVR0OBBYEFB7paKGFiG7kJfH4VljMNUa9+VURMB8G
+A1UdIwQYMBaAFB7paKGFiG7kJfH4VljMNUa9+VURMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAJBhuhIi36wfDbDn0DvJXKEgukUv5dnxc8HYf8CN
+ep51uOXQ2zBdd5A7+QNW52z29GlaLkMWgZJLUvk3v98dmGFv1DUMmAMVQeAuufDx
+VIdRE/d6W/ynDqJ4l+IBmcczGEK0FXYh2qoLmmwybD3G0eGgSdPFICZv6eJTsBAz
+X7F1MSORPSSVLdqP87O3Z2bR9TCSnIbie9sR8R7+ux62lbRiKR4qjcT0u4yn4z9q
+0iqd4JC/m9YlgHNeSX0mZFT/oym4bdgPgkG/whjjDw5YpixYh5DVyEd8TeVQoNuV
++8XoYYcTscSeMzu/DXs9kP87u03uJzq3qjz+T5GZ6bAQsMw=
+-----END CERTIFICATE-----

package/config/tls_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCqLTA8T7gFPsoG
+cvNsATJs6O2xbjOLFdYyk7qDaSLrOI/fGP7iB1XNL9APZxmJMG+BJqOb5nBejJ7R
+xyAlE4Dd9VvGE9IA8slOCXQfkByMXTC7bKQ4pXR/cCSg8c+N6Kzr+nbFOJueNhW5
+NBO5Z4fRldQqB5WEXJgPChh/Y3wo38gblvKy0ReUCxNd6RQyZCZddRipu9cPFz5P
+YWLhbw7MYTA1w6mmHWiy0JxOjS+/3wRft9QP+fulbB7LdEvP1jL7muu78R28xq8N
+oswFZMnImf6XgNd9pK5DVzYJIyrrDnyYXmWKWKsz0oxJrErymsn7n9WAcs9OtKLF
+wtE3HeLrAgMBAAECggEAEZrzLoogw4onZFtoC3hkOxgt3vlDo9PygPD/jrDFyAfl
++nKfi8quebfEkpNb9PFp17ajnnFMlrt9gr5S+QL3hf7oK6nJRAfaA5S+yrUh/vN1
+Iy6uHp4fWz/CylO54Th9CzyyJN0iXE/EF5DnqXqodmpFtMNsGHFr2cJ1nlgwdBnn
+PN+ZVj/EhEoq0gzp5UI/tkheKlPFV+QNcNsfduFORxNybEWCujb5FhOUyCBxFvcZ
+SrWGicEKsufxkW6jwI5gfrbZ/10jmBRkfb/1uQtgqUhyQeOLaE9YxSx0kk+4JeHy
+2YlZhIMrQgOBn5+tBptucrHNJzbMowg2CUEmhiFFwQKBgQDlW6Hl1Rjw/orj4m1e
+RjtprS37qSjuZoTSUeAC51W4WUobBYLdARkSEacQ4wBmf2j4Ax6aXV9L1hHdv3L8
+Oc3m0mow7LLvyYNOMlNoiWPRRR0BHmpY8JnlhUSKNitfL3NUt3Ct9xOAbrKS0whG
+wz1hyYljd1s/cHaCXUHMvZyPCQKBgQC98bDZ5fwCyYFtZb6eu4VvMFmsYZ1XrhuC
+TwqmvEwxIVEFyzcFJB8/ogsURDw9awuPimfxFAk5tF53EIc7YMnhpE50zEE9Tz4S
+Fn9v1MTyS93RvIgFlFa2cqlV7uXhknIyxbw200gyRuiPK2ChoCs5ckRddO5V9BxB
+RygRVu0rUwKBgQCCQ8bx6FQgHBH6WBHR54W7AXcKZgsvS97ILWRTgdw3tc7XBgxL
+RWJd1tTSTHtfu6F8qxjoh3umcND45tGB27rMDFnvq5/9fLAs63xf9RhSNTTB++pe
+1Vgy+bvx285KY4LXbNB8ncXfvf+CUIV021KzhWmYqqOSpmdIp3rFtDOFMQKBgQCP
+jqfXSBccFCgaApf7aEcFLknYGz7MEe8AobSvKAl96GxQMLK41AA6G8K74oaU9N6b
+8kN01WvTjRsIahmLKy/ptkEFzYpRSB7llNNkNi9T4TsZVaCIdwDCjA6nwBNGVWSy
+Mvh5h149gZIrAuHZxjBlDpPU/pdTp1fjjmAeGtDNuQKBgHuKQaE5AYqBmeZUoGPP
+AsvnSvBt9ZY+vCjUK255s7CPWrA5kN4EZWXGB9EBYNit80CvkaNAK1jsR5qErNA0
+HGUfBIIsUAoOV9VdeN5PoYsE4dqxlpRvuEJpgXzk4KATSdBxP7jAs2SepVlBExa9
+yLRsVL/PYvEykaKHAyS2dwp4
+-----END PRIVATE KEY-----

package/connection.js

@@ -1,12 +1,9 @@
 'use strict';
 // a single connection
 
-// node.js built-in libs
-const dns         = require('dns');
-const fs          = require('fs');
-const net         = require('net');
-const os          = require('os');
-const path        = require('path');
+const dns         = require('node:dns');
+const net         = require('node:net');
+const os          = require('node:os');
 
 // npm libs
 const ipaddr      = require('ipaddr.js');
@@ -55,36 +52,36 @@ class Connection {
         this.server = server;
         this.cfg = cfg;
 
-        this.local = {           // legacy property locations
-            ip: null,            // c.local_ip
-            port: null,          // c.local_port
+        this.local = {
+            ip: null,
+            port: null,
             host: net_utils.get_primary_host_name(),
             info: 'Haraka',
         };
         this.remote = {
-            ip:   null,          // c.remote_ip
-            port: null,          // c.remote_port
-            host: null,          // c.remote_host
-            info: null,          // c.remote_info
-            closed: false,       // c.remote_closed
+            ip:   null,
+            port: null,
+            host: null,
+            info: null,
+            closed: false,
             is_private: false,
             is_local: false,
         };
         this.hello = {
-            host: null,          // c.hello_host
-            verb: null,          // c.greeting
+            host: null,
+            verb: null,
         };
         this.tls = {
-            enabled: false,      // c.using_tls
-            advertised: false,   // c.notes.tls_enabled
+            enabled: false,
+            advertised: false,
             verified: false,
             cipher: {},
         };
         this.proxy = {
-            allowed: false,      // c.proxy
-            ip: null,            // c.haproxy_ip
+            allowed: false,
+            ip: null,
             type: null,
-            timer: null,         // c.proxy_timer
+            timer: null,
         };
         this.set('tls', 'enabled', (!!server.has_tls));
 
@@ -132,8 +129,7 @@ class Connection {
         this.last_rcpt_msg = null;
         this.hook = null;
         if (this.cfg.headers.show_version) {
-            const hpj = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json')));
-            this.local.info += `/${hpj.version}`;
+            this.local.info += `/${utils.getVersion(__dirname)}`;
         }
         Connection.setupClient(this);
     }
@@ -223,11 +219,10 @@ class Connection {
     setTLS (obj) {
         this.set('hello', 'host', undefined);
         this.set('tls',   'enabled', true);
-        const options = ['cipher','verified','verifyError','peerCertificate'];
-        options.forEach(t => {
+        for (const t of ['cipher','verified','verifyError','peerCertificate']) {
             if (obj[t] === undefined) return;
             this.set('tls', t, obj[t]);
-        })
+        }
         // prior to 2017-07, authorized and verified were both used. Verified
         // seems to be the more common and has the property updated in the
         // tls object. However, authorized has been up-to-date in the notes. Store
@@ -269,25 +264,9 @@ class Connection {
                 this.set('remote.is_private', true);
             }
             else {
-                this.set('remote.is_private', net_utils.is_private_ipv4(this.remote.ip));
+                this.set('remote.is_private', net_utils.is_private_ip(this.remote.ip));
             }
         }
-
-        // sunset 3.0.0
-        if (prop_str === 'hello.verb') {
-            this.greeting = val;
-        }
-        else if (prop_str === 'tls.enabled') {
-            this.using_tls = val;
-        }
-        else if (prop_str === 'proxy.ip') {
-            this.haproxy_ip = val;
-        }
-        else {
-            const legacy_name = prop_str.split('.').join('_');
-            this[legacy_name] = val;
-        }
-        // /sunset
     }
     get (prop_str) {
         return prop_str.split('.').reduce((prev, curr) => {
@@ -395,7 +374,7 @@ class Connection {
     }
     process_data (data) {
         if (this.state >= states.DISCONNECTING) {
-            this.logwarn(`data after disconnect from ${this.remote.ip}`);
+            this.loginfo(`data after disconnect from ${this.remote.ip}`);
             return;
         }
 
@@ -538,6 +517,7 @@ class Connection {
             code = msg.code;
             msg = msg.reply;
         }
+
         if (!Array.isArray(msg)) {
             messages = msg.toString().split(/\n/);
         }
@@ -574,6 +554,8 @@ class Connection {
             buf = `${buf}${line}\r\n`;
         }
 
+        if (this.client.write === undefined) return buf;  // testing
+
         try {
             this.client.write(buf);
         }
@@ -635,7 +617,6 @@ class Connection {
         this.client.end();
     }
     get_capabilities () {
-
         return [];
     }
     tran_uuid () {
@@ -869,7 +850,7 @@ class Connection {
             default:
                 // RFC5321 section 4.1.1.1
                 // Hostname/domain should appear after 250
-                this.respond(250, `${this.local.host} Hello ${this.get_remote('host')}${this.ehlo_hello_message}`);
+                this.respond(250, `${this.local.host} Hello ${this.get_remote('host')}, ${this.ehlo_hello_message}`);
         }
     }
     ehlo_respond (retval, msg) {
@@ -902,7 +883,7 @@ class Connection {
                 // Hostname/domain should appear after 250
 
                 const response = [
-                    `${this.local.host} Hello ${this.get_remote('host')}${this.ehlo_hello_message}`,
+                    `${this.local.host} Hello ${this.get_remote('host')}, ${this.ehlo_hello_message}`,
                     "PIPELINING",
                     "8BITMIME",
                 ];
@@ -977,7 +958,6 @@ class Connection {
         })
     }
     mail_respond (retval, msg) {
-        const self = this;
         if (!this.transaction) {
             this.logerror("mail_respond found no transaction!");
             return;
@@ -992,12 +972,12 @@ class Connection {
             }
         );
 
-        function store_results (action) {
+        const store_results = (action) => {
             let addr = sender.format();
             if (addr.length > 2) {  // all but null sender
                 addr = addr.substr(1, addr.length -2); // trim off < >
             }
-            self.transaction.results.add({name: 'mail_from'}, {
+            this.transaction.results.add({name: 'mail_from'}, {
                 action,
                 code: constants.translate(retval),
                 address: addr,
@@ -1008,25 +988,25 @@ class Connection {
             case constants.deny:
                 this.respond(550, msg || `${dmsg} denied`, () => {
                     store_results('reject');
-                    self.reset_transaction();
+                    this.reset_transaction();
                 });
                 break;
             case constants.denydisconnect:
                 this.respond(550, msg ||  `${dmsg} denied`, () => {
                     store_results('reject');
-                    self.disconnect();
+                    this.disconnect();
                 });
                 break;
             case constants.denysoft:
                 this.respond(450, msg || `${dmsg} denied`, () => {
                     store_results('tempfail');
-                    self.reset_transaction();
+                    this.reset_transaction();
                 });
                 break;
             case constants.denysoftdisconnect:
                 this.respond(450, msg || `${dmsg} denied`, () => {
                     store_results('tempfail');
-                    self.disconnect();
+                    this.disconnect();
                 });
                 break;
             default:
@@ -1469,7 +1449,7 @@ class Connection {
         return received_header;
     }
     auth_results (message) {
-        // http://tools.ietf.org/search/rfc7001
+        // https://datatracker.ietf.org/doc/rfc7001/
         const has_tran = !!((this.transaction?.notes));
 
         // initialize connection note
@@ -1719,7 +1699,12 @@ class Connection {
         });
     }
     queue_msg (retval, msg) {
-        if (msg) return msg;
+        if (msg) {
+            if (typeof msg === 'object' && msg.constructor.name === 'DSN') {
+                return msg.reply
+            }
+            return msg;
+        }
 
         switch (retval) {
             case constants.ok:
@@ -1754,7 +1739,8 @@ class Connection {
         }
     }
     queue_outbound_respond (retval, msg) {
-        if (!msg) msg = this.queue_msg(retval, msg) || 'Message Queued';
+        if (this.remote.closed) return;
+        msg = this.queue_msg(retval, msg) || 'Message Queued';
         this.store_queue_result(retval, msg);
         msg = `${msg} (${this.transaction.uuid})`;
         if (retval !== constants.ok) {
@@ -1799,7 +1785,7 @@ class Connection {
                 });
                 break;
             default:
-                outbound.send_email(this.transaction, (retval2, msg2) => {
+                outbound.send_trans_email(this.transaction, (retval2, msg2) => {
                     if (!msg2) msg2 = this.queue_msg(retval2, msg);
                     switch (retval2) {
                         case constants.ok:
@@ -1830,7 +1816,7 @@ class Connection {
         }
     }
     queue_respond (retval, msg) {
-        if (!msg) msg = this.queue_msg(retval, msg);
+        msg = this.queue_msg(retval, msg);
         this.store_queue_result(retval, msg);
         msg = `${msg} (${this.transaction.uuid})`;
 
@@ -1910,17 +1896,4 @@ exports.createConnection = (client, server, cfg) => {
     return new Connection(client, server, cfg);
 }
 
-// add logger methods to Connection:
-for (const key in logger) {
-    if (!/^log\w/.test(key)) continue;
-    Connection.prototype[key] = (function (level) {
-        return function () {
-            // pass the connection instance to logger
-            const args = [ this ];
-            for (let i=0, l=arguments.length; i<l; i++) {
-                args.push(arguments[i]);
-            }
-            logger[level].apply(logger, args);
-        };
-    })(key);
-}
+logger.add_log_methods(Connection)

package/contrib/bsd-rc.d/haraka

@@ -14,6 +14,8 @@ rcvar="haraka_enable"
 command="/usr/local/bin/haraka"
 pidfile="/var/run/${name}.pid"
 
+haraka_flags=${haraka_flags:="-c /data"}
+
 start_cmd="start"
 status_cmd="status"
 stop_cmd="stop"
@@ -30,7 +32,7 @@ status()
    if [ -f $pidfile ];
    then
        LPID=`cat $pidfile`
-       LPROC=`/bin/ps | grep '^$PID'`
+       LPROC=`/bin/ps -p $PID`
        if [ -n $LPROC ];
        then
            echo "$name is running as $LPID"

package/contrib/plugin2npm.sh

@@ -32,7 +32,8 @@ if grep template "$PLUGIN_REPO/README.md"; then
         -e "s/template\.ini/$1.ini/" \
         "$PLUGIN_REPO/test/index.js"
 
-    sed -i '' -e "s/template/${1}/g" package.json
+    sed -i '' -e "s/template/${1}/g" "$PLUGIN_REPO/package.json"
+
     sed -i '' \
         -e "s/_template/_${1}/g" \
         -e "s/template\.ini/$1.ini/" \
@@ -73,39 +74,8 @@ DEPRECATED
     $GIT_CMD add index.js
 fi
 
-
-if [ -f "tests/plugins/$1.js" ]; then
-    echo "copying tests/plugins/$1.js"
-    cp "tests/plugins/$1.js" "$PLUGIN_REPO/test/index.js"
-    git rm "tests/plugins/$1.js"
-    if [ ! -f "$PLUGIN_REPO/run_tests" ]; then
-        tee "$PLUGIN_REPO/run_tests" <<'EO_TEST_RUN'
-#!/usr/bin/env node
-'use strict'
-try {
-    var reporter = require('nodeunit-x').reporters.default;
-}
-catch (e) {
-    console.log(`
-Error: ${e.message}
-
-Cannot find nodeunit. Did you run 'npm install'?
-`)
-    process.exit()
-}
-
-process.chdir(__dirname);
-
-reporter.run([ 'test' ], undefined, (err) => {
-    process.exit(((err) ? 1 : 0));
-});
-EO_TEST_RUN
-
-        sed -i '' \
-            -e 's/"_mocha"/"nodeunit-x"/' \
-            -e 's/"mocha"/"nodeunit-x"/' \
-            "$PLUGIN_REPO/package.json"
-
-        $GIT_CMD add package.json
-    fi
+if [ -f "test/plugins/$1.js" ]; then
+    echo "copying test/plugins/$1.js"
+    cp "test/plugins/$1.js" "$PLUGIN_REPO/test/index.js"
+    git rm "test/plugins/$1.js"
 fi

package/docs/CoreConfig.md

@@ -7,9 +7,9 @@ The Haraka core reads some configuration files to determine a few actions:
 
 * smtp.yaml or smtp.json
 
-If either of these files exist then they are loaded first after log.ini.
+If either of these files exist then they are loaded first.
 This file is designed to use the JSON/YAML file overrides documented in
-Config.md to optionally provide the entire configuration in a single file.
+[haraka-config](https://github.com/haraka/haraka-config) to optionally provide the entire configuration in a single file.
 
 * databytes
 

package/docs/Logging.md

@@ -17,20 +17,13 @@ Logging conventions within Haraka
 
 This section pertains to the built in logging. For log plugins like ([haraka-plugin-syslog](https://github.com/haraka/haraka-plugin-syslog)), refer to the plugin's docs.
 
-See also
-------------------
-[https://github.com/haraka/Haraka/pull/119](https://github.com/haraka/Haraka/pull/119)
-
 The logline by default will be in the form of:
 
     [level] [uuid] [origin] message
 
-Where origin is "core" or the name of the plugin which
-triggered the message, and "uuid" is the ID of the
-connection associated with the message.
+Where origin is "core" or the name of the plugin which triggered the message, and "uuid" is the ID of the connection associated with the message.
 
-When calling a log method on logger, you should provide the
-plugin object and the connection object anywhere in the arguments
+When calling a log method on logger, you should provide the plugin object and the connection object anywhere in the arguments
 to the log method.
 
     logger.logdebug("i like turtles", plugin, connection);
@@ -39,8 +32,7 @@ Will yield, for example,
 
     [DEBUG] [7F1C820F-DC79-4192-9AA6-5307354B20A6] [dnsbl] i like turtles
 
-If you call the log method on the connection object, you can
-forego the connection as argument:
+If you call the log method on the connection object, you can forego the connection as argument:
 
     connection.logdebug("turtles all the way down", plugin);
 
@@ -48,18 +40,13 @@ and similarly for the log methods on the plugin object:
 
     plugin.logdebug("he just really likes turtles", connection);
 
-failing to provide a connection and/or plugin object will leave
-the default values in the log (currently "core").
+failing to provide a connection and/or plugin object will leavethe default values in the log (currently "core").
 
-This is implemented by testing for argument type in
-the logger.js log\* method. objects-as-arguments are then sniffed
-to try to determine if they're a connection or plugin instance.
+This is implemented by testing for argument type in the logger.js log\* method. objects-as-arguments are then sniffed to try to determine if they're a connection or plugin instance.
 
 ### Log formats
 
-Apart from the default log format described above, Haraka also supports logging
-as [`logfmt`](https://brandur.org/logfmt) and JSON. These can be used by
-changing the `format` attribute in `log.ini` to the desired format, e.g.:
+Apart from the default log format described above, Haraka also supports logging as [`logfmt`](https://brandur.org/logfmt) and JSON. These can be used by changing the `format` attribute in `log.ini` to the desired format, e.g.:
 
 ```ini
 ; format=default
@@ -77,8 +64,7 @@ And the same line formatted as JSON:
 {"level":"PROTOCOL","uuid":"9FF7F70E-5D57-435A-AAD9-EA069B6159D9.1","source":"core","message":"S: 354 go ahead, make my day"}
 ```
 
-Any objects passed to the log methods will also have their properties included
-in the log line. For example, using `logfmt`:
+Any objects passed to the log methods will also have their properties included in the log line. For example, using `logfmt`:
 
     level=NOTICE uuid=9FF7F70E-5D57-435A-AAD9-EA069B6159D9.1 source=core message=disconnect ip=127.0.0.1 rdns=Unknown helo=3h2dnz8a0if relay=N early=N esmtp=N tls=N pipe=N errors=0 txns=1 rcpts=1/0/0 msgs=1/0/0 bytes=222 lr="" time=0.052