Haraka 3.0.5 → 3.1.0

package/docs/plugins/record_envelope_addresses.md

@@ -1,5 +1,4 @@
-record\_envelope\_addresses
-=========================
+# record\_envelope\_addresses
 
 This plugin adds two new header lines.
 
@@ -10,14 +9,12 @@ It is useful if you need to know the exact addresses used to send an email, e.g.
 the email was sent to you as BCC or if it is a newsletter. In both cases the recipient
 address is normally not recorded in the headers.
 
-Caveats
--------
+## Caveats
 
 If you enable this plugin you may introduce a possible information leak, i.e. disclosure
 of BCC recipients. So you never want to use this on an outgoing mail server and maybe also
 not if this server is used as a relay.
 
-Configuration
--------------
+## Configuration
 
 This plugin has no configuration.

package/docs/plugins/relay.md

@@ -1,157 +1,3 @@
 # relay
 
-[MTAs](http://en.wikipedia.org/wiki/Mail_transfer_agent) generally only accept mail for _local_ domains they can deliver to. In Haraka, the `rcpt_to.*` plugins usually decide which domains and/or email addresses are deliverable. By default, everything else is rejected.
-
-**Relaying** is when a MTA accepts mail that is destined elsewhere. Back in the day (1980s), most MTAs permitted open relaying. Soon spammers abused our open relays (1990s) and left us with soiled mail queues. Now nearly all MTAs have relaying disabled and [MUAs](http://en.wikipedia.org/wiki/Mail_user_agent) are required to use a [MSA](http://en.wikipedia.org/wiki/Message_submission_agent) to relay. Most MTAs (including Haraka) have MSA features and can serve both purposes.
-
-This **relay** plugin provides Haraka with options for managing relay permissions.
-
-## Authentication
-
-One way to enable relaying is authentication via the [auth plugins](http://haraka.github.io/plugins). Successful authentication enables relaying during _that_ SMTP connection. To securely offer SMTP AUTH, the [tls](http://haraka.github.io/plugins/tls) plugin and at least one auth plugin must be enabled and properly configured. When that requirement is met, the AUTH SMTP extension will be advertised to SMTP clients.
-
-    % nc mail.example.com 587
-    220 mail.example.com ESMTP Haraka 2.4.0 ready
-    ehlo client.example.com
-    250-mail.example.com Hello client.example.com [192.168.0.1], Haraka is at your service.
-    250-PIPELINING
-    250-8BITMIME
-    250-SIZE 10000000
-    250 STARTTLS
-    quit
-    221 mail.example.com closing connection. Have a jolly good day.
-
-Notice that there's no AUTH advertised. We only permit authentication when the
-connection is secured with TLS:
-
-    % openssl s_client -connect mail.example.com:587 -starttls smtp
-    CONNECTED(00000003)
-    <snip long SSL certificate details>
-    ---
-    250 STARTTLS
-    ehlo client.example.com
-    250-mail.example.com Hello client.example.com [192.168.1.1], Haraka is at your service.
-    250-PIPELINING
-    250-8BITMIME
-    250-SIZE 10000000
-    250 AUTH PLAIN LOGIN
-    quit
-    221 mail.example.com closing connection. Have a jolly good day.
-    closed
-
-To avoid port 25 restrictions, in 1998 we developed [SMTP submission](http://tools.ietf.org/html/rfc2476) on port 587. As of January 2018, [RFC 8314](https://tools.ietf.org/html/rfc8314) resurrects [SMTPS](https://en.wikipedia.org/wiki/SMTPS) on port 465 in favor of port 587 with STARTTLS. For optimal security and reliability, [MUAs](http://en.wikipedia.org/wiki/Mail_user_agent) should be configured to send mail to port 465 with TLS.
-
-## ACL (Access Control List)
-
-ACL processing is enabled by setting acl=true in the [relay] section of
-relay.ini:
-
-    [relay]
-    acl=true
-
-With the Access Control List feature, relaying can be enabled for IPv4 and
-IPv6 networks. IP ranges listed in the ACL file are allowed to send mails
-without furthur checks.
-
-* `config/relay_acl_allow`
-
-    Allowed IP ranges in CIDR notation, one per line.
-
-Back in the day, ISPs enabled all of their IP space to relay. That proved
-problematic for users who took their laptops and mobile phones elsewhere and
-then couldn't send mail. For end users therefore, use SMTP AUTH described
-above. If you reside somewhere technology evolves more slowly, you can still
-add IP allocations to `relay_acl_allow` like so:
-
-    echo 'N.N.N.N/24' >> /path/to/haraka/config/relay_acl_allow
-
-A common use case for IP based relaying is to relay messages on behalf of
-another mail server. If your organization has an Exchange server, using Haraka
-to filter inbound messages is a great choice. You might also want to relay
-outbound messages via Haraka as well, so they can be DKIM signed on their way
-to the internet. For such a use case, you would set 'acl=true' (the default)
-in the [relay] section of `relay.ini` and then add the external IP address
-of the corporate firewall to `config/relay_acl_allow`:
-
-    echo 'N.N.N.N/32' >> /path/to/haraka/config/relay_acl_allow
-
-
-## Force Route / Dest[ination] Domains
-
-Force routes and Destination Domains are enabled by setting in the [relay]
-section of relay.ini:
-
-    [relay]
-    force_routing=false  (default: false)
-    dest_domains=false   (default: false)
-
-These two features share another common config file:
-
-* `config/relay_dest_domains.ini`
-
-The format is ini and entries are within the [domains] section. The key for each entry is the domain and the value is a JSON string. Within the JSON string, the currently supported keys are:
-
-    * action  (Dest Domains)
-    * nexthop (Force Route)
-
-### Force Route
-
-Think of force route as the equivalent of the transport map in Postfix or the smtproutes file in Qmail. Rather than looking up the MX for a host, the *nexthop* value from the entry in the config file is used.
-
-The value of "nexthop": can be a hostname or an IP, optionally follow by :port.
-
-Example:
-
-    [domains]
-    test.com = { "action": "continue", "nexthop": "127.0.0.1:2525" }
-
-### Destination Domains
-
-Allowed destination/recipient domains. The field within the JSON value used
-by Dest Domains is "action": and the possible values are accept, continue, or
-deny.
-
-    * accept   (accept the mail without further checks)
-
-Example:
-
-    [domains]
-    test.com = { "action": "accept" }
-
-Think of *accept* as the equivalent of qmail's *rcpthosts*, or a misplaced Haraka `rcpt_to.*` plugin. The *accept* mechanism is another way to tell Haraka that a particular domain is one we accept mail for. The difference between this and the [rcpt_to.in_host_list](http://haraka.github.io/plugins/rcpt_to.in_host_list) plugin is that this one also enables relaying.
-
-    * continue (mails are subject to further checks)
-
-Example:
-
-    [domains]
-    test.com = { "action": "continue" }
-
-Because the default behavior of Dest Routes is to deny, the *continue* option provides an escape, permitting another Haraka plugin to validate the recipient. Like the *accept* option, it too enables relaying.
-
-    * deny    (mails are rejected)
-
-This deny option baffles me. The default behavior of Haraka is to reject emails for
-which a recipient validation plugin hasn't vouched. Adding it here prevents
-any subsequent recipient validation plugin from getting a chance. It also
-necessitates the continue option.
-
-
-## all
-
-Relay all is enabled by setting all=true in the [relay] section of
-relay.ini:
-
-    [relay]
-    all=true     (default: false)
-
-Relay all is useful for spamtraps to accept all mail.
-
-Do NOT use this on a real mail server, unless you really know what you are
-doing. If you use the all feature with anything that relays mail (such
-as forwarding to a real mail server, or the `deliver` plugin), your mail
-server is now an open relay.
-
-This is BAD. Hence the big letters. In short: DO NOT USE THIS FEATURE.
-
-It is useful for testing and spamtraps, hence its presence.
+Repackaged as [haraka-plugin-relay](https://github.com/haraka/haraka-plugin-relay).

package/docs/plugins/reseed_rng.md

@@ -1,5 +1,4 @@
-reseed\_rng
-==========
+# reseed\_rng
 
 The V8 that ships with node 0.4.x uses an unsophisticated method of
 seeding its random number generator- it simply uses the current time

package/docs/plugins/tarpit.md

@@ -1,5 +1,4 @@
-tarpit
-======
+# tarpit
 
 This plugin is designed to introduce deliberate delays on the response
 of every hook in order to slow down a connection.  It has no
@@ -10,8 +9,8 @@ that accept recipients or that return OK) but must be loaded *after*
 any plugins that wish to use it.
 
 
-Usage
---------------
+## Usage
+
 To use this plugin in another plugin set:
 
     connection.notes.tarpit = <seconds to delay>;
@@ -21,8 +20,7 @@ or
     connection.transaction.notes.tarpit = <seconds to delay>;
 
 
-Configuration
---------------
+## Configuration
 
 The configuration file for tarpit is config/tarpit.ini.
 
@@ -34,8 +32,7 @@ The configuration file for tarpit is config/tarpit.ini.
 hooks\_to\_delay=connect,helo,ehlo,mail,rcpt,data,data\_post,queue,unrecognized\_command,vrfy,noop,rset,quit
 
 
-Plugin Timeout
---------------
+## Plugin Timeout
 
 config/tarpit.timeout (Default: 0)
 
@@ -51,7 +48,7 @@ The solution is to set the contents of config/tarpit.timeout to zero or
 **seconds to delay** + 1.
 
 
-Logging
---------------
+## Logging
+
 When tarpitting a command it will log 'tarpitting response for Ns' to
 the INFO facility where N is the number of seconds.

package/docs/plugins/toobusy.md

@@ -1,5 +1,4 @@
-toobusy
-=======
+# toobusy
 
 This plugin will stop Haraka accepting new connections when the event loop 
 latency is too high.
@@ -12,8 +11,7 @@ To use this plugin you have to install the 'toobusy-js' module by running
 This plugin should be listed at the top of your config/plugins file so that 
 it runs before any other plugin that hooks lookup\_rdns.
 
-Configuration
--------------
+## Configuration
 
 If you wish to override the default maxLag value of 70ms then add the desired
 value to config/toobusy.maxlag.  This can be set and changed at runtime and

package/docs/plugins/xclient.md

@@ -1,5 +1,4 @@
-xclient
-=======
+# xclient
 
 Implements the [XCLIENT](http://www.postfix.org/XCLIENT_README.html) protocol.
 

package/eslint.config.mjs

@@ -0,0 +1,27 @@
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [...compat.extends("@haraka"), {
+    languageOptions: {
+        globals: {
+            ...globals.node,
+        },
+    },
+
+    rules: {
+        "prefer-template": "warn",
+        "no-unneeded-ternary": 1,
+        "no-unused-vars": 0,
+    },
+}];

package/logger.js

@@ -116,16 +116,9 @@ logger.dump_logs = cb => {
     return true;
 }
 
-if (!util.isFunction) {
-    util.isFunction = functionToCheck => {
-        const getType = {};
-        return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
-    };
-}
-
 logger.dump_and_exit = function (code) {
     this.dump_logs(() => {
-        if (util.isFunction(code)) return code();
+        if (typeof code === 'function') return code();
         process.exit(code);
     });
 }

package/outbound/hmail.js

@@ -3,6 +3,7 @@
 const events       = require('node:events');
 const fs           = require('node:fs');
 const dns          = require('node:dns');
+const net          = require('node:net');
 const path         = require('node:path');
 
 const { Address } = require('address-rfc2821');
@@ -596,7 +597,13 @@ class HMailItem extends events.EventEmitter {
             processing_mail = false;
             if (success) {
                 const reason = response.join(' ');
-                self.delivered(host, port, (mx.using_lmtp ? 'LMTP' : 'SMTP'), mx.exchange,
+
+                let hostname = mx.exchange
+                if (net.isIP(hostname) && mx.from_dns && !net.isIP(mx.from_dns)) {
+                    hostname = mx.from_dns
+                }
+
+                self.delivered(host, port, (mx.using_lmtp ? 'LMTP' : 'SMTP'), hostname,
                     reason, ok_recips, fail_recips, bounce_recips, secured, authenticated);
             }
             else {

package/package.json

@@ -9,7 +9,7 @@
     "server",
     "email"
   ],
-  "version": "3.0.5",
+  "version": "3.1.0",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",
@@ -20,71 +20,74 @@
     "node": ">=18"
   },
   "dependencies": {
-    "address-rfc2821": "^2.1.2",
-    "address-rfc2822": "^2.2.2",
+    "address-rfc2821": "^2.1.3",
+    "address-rfc2822": "^2.2.3",
     "async": "^3.2.6",
     "daemon": "~1.1.0",
-    "haraka-config": "^1.4.0",
+    "haraka-config": "^1.4.2",
     "haraka-constants": "^1.0.7",
     "haraka-dsn": "^1.1.0",
-    "haraka-email-message": "^1.2.4",
-    "haraka-message-stream": "^1.2.2",
-    "haraka-net-utils": "^1.7.0",
-    "haraka-notes": "^1.1.0",
-    "haraka-plugin-redis": "^2.0.7",
-    "haraka-results": "^2.2.4",
-    "haraka-tld": "^1.2.2",
-    "haraka-utils": "^1.1.3",
+    "haraka-email-message": "^1.2.5",
+    "haraka-message-stream": "^1.2.3",
+    "haraka-net-utils": "^1.7.2",
+    "haraka-notes": "^1.1.1",
+    "haraka-plugin-redis": "^2.0.9",
+    "haraka-results": "^2.2.5",
+    "haraka-tld": "^1.2.3",
+    "haraka-utils": "^1.1.4",
     "ipaddr.js": "~2.2.0",
-    "node-gyp": "^10.2.0",
-    "nopt": "^8.0.0",
+    "node-gyp": "^11.1.0",
+    "nopt": "^8.1.0",
     "npid": "~0.4.0",
     "redis": "~4.7.0",
-    "semver": "^7.6.3",
+    "semver": "^7.7.1",
     "sockaddr": "^1.0.1",
     "sprintf-js": "~1.1.3"
   },
   "optionalDependencies": {
-    "haraka-plugin-access": "^1.1.6",
-    "haraka-plugin-aliases": "^1.0.2",
-    "haraka-plugin-asn": "^2.0.3",
-    "haraka-plugin-attachment": "^1.1.2",
+    "haraka-plugin-access": "^1.1.10",
+    "haraka-plugin-aliases": "^1.0.3",
+    "haraka-plugin-asn": "^2.0.5",
+    "haraka-plugin-attachment": "^1.1.4",
     "haraka-plugin-avg": "^1.1.0",
-    "haraka-plugin-bounce": "1.0.2",
-    "haraka-plugin-clamd": "1.0.1",
-    "haraka-plugin-dcc": "^1.0.2",
-    "haraka-plugin-dkim": "^1.0.7",
-    "haraka-plugin-dns-list": "^1.2.1",
-    "haraka-plugin-elasticsearch": "^8.0.3",
-    "haraka-plugin-esets": "^1.0.0",
-    "haraka-plugin-fcrdns": "^1.1.0",
-    "haraka-plugin-geoip": "^1.1.0",
+    "haraka-plugin-bounce": "1.0.4",
+    "haraka-plugin-clamd": "1.0.2",
+    "haraka-plugin-dcc": "^1.0.3",
+    "haraka-plugin-dkim": "^1.0.11",
+    "haraka-plugin-dns-list": "^1.2.3",
+    "haraka-plugin-early_talker": "^1.0.2",
+    "haraka-plugin-elasticsearch": "^8.1.2",
+    "haraka-plugin-esets": "^1.0.1",
+    "haraka-plugin-fcrdns": "^1.1.1",
+    "haraka-plugin-geoip": "^1.1.1",
     "haraka-plugin-graph": "^1.0.5",
-    "haraka-plugin-greylist": "^1.0.0",
-    "haraka-plugin-headers": "^1.0.4",
-    "haraka-plugin-helo.checks": "^1.0.0",
-    "haraka-plugin-karma": "^2.1.5",
-    "haraka-plugin-known-senders": "^1.1.0",
-    "haraka-plugin-limit": "^1.2.5",
-    "haraka-plugin-messagesniffer": "^1.0.0",
-    "haraka-plugin-p0f": "^1.0.9",
-    "haraka-plugin-qmail-deliverable": "^1.2.3",
-    "haraka-plugin-recipient-routes": "^1.2.0",
-    "haraka-plugin-rspamd": "^1.3.1",
-    "haraka-plugin-spamassassin": "^1.0.0",
-    "haraka-plugin-spf": "1.2.7",
-    "haraka-plugin-syslog": "^1.0.6",
-    "haraka-plugin-uribl": "^1.0.8",
-    "haraka-plugin-watch": "^2.0.4",
-    "ocsp": "~1.2.0",
+    "haraka-plugin-greylist": "^1.0.1",
+    "haraka-plugin-headers": "^1.0.6",
+    "haraka-plugin-helo.checks": "^1.0.3",
+    "haraka-plugin-karma": "^2.1.7",
+    "haraka-plugin-known-senders": "^1.1.2",
+    "haraka-plugin-limit": "^1.2.6",
+    "haraka-plugin-mail_from.is_resolvable": "^1.0.3",
+    "haraka-plugin-messagesniffer": "^1.0.1",
+    "haraka-plugin-p0f": "^1.0.11",
+    "haraka-plugin-qmail-deliverable": "^1.2.5",
+    "haraka-plugin-recipient-routes": "^1.2.2",
+    "haraka-plugin-relay": "^1.0.1",
+    "haraka-plugin-rspamd": "^1.3.2",
+    "haraka-plugin-spamassassin": "^1.0.3",
+    "haraka-plugin-spf": "1.2.9",
+    "haraka-plugin-syslog": "^1.0.7",
+    "haraka-plugin-uribl": "^1.0.10",
+    "haraka-plugin-watch": "^2.0.8",
+    "@techteamer/ocsp": "^1.0.1",
     "tmp": "~0.2.3"
   },
   "devDependencies": {
-    "@haraka/eslint-config": "^1.1.5",
-    "haraka-test-fixtures": "^1.3.8",
-    "mocha": "^10.7.3",
+    "@haraka/eslint-config": "^2.0.2",
+    "haraka-test-fixtures": "^1.3.9",
+    "mocha": "^11.1.0",
     "mock-require": "^3.0.3",
-    "nodemailer": "^6.9.15"
+    "nodemailer": "^6.10.0"
   },
   "bugs": {
     "mail": "haraka.mail@gmail.com",
@@ -96,12 +99,12 @@
   },
   "scripts": {
     "format:NYET": "npm run prettier:fix && npm run lint:fix",
-    "lint": "npx eslint@^8 *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
-    "lint:fix": "npx eslint@^8 --fix *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
+    "lint": "npx eslint *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
+    "lint:fix": "npx eslint --fix *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
     "prettier": "npx prettier . --check",
     "prettier:fix": "npx prettier . --write --log-level=warn",
     "test": "npx mocha --exit --timeout=4000 test test/outbound test/plugins/auth test/plugins/queue test/plugins",
     "versions": "npx dependency-version-checker check",
-    "versions:fix": "npx dependency-version-checker update && npm run prettier:fix"
+    "versions:fix": "npx dependency-version-checker update"
   }
-}
+}

package/plugins/auth/auth_base.js

@@ -105,7 +105,6 @@ exports.check_user = function (next, connection, credentials, method) {
         if (valid) {
             connection.relaying = true;
             connection.results.add({name:'relay'}, {pass: plugin.name});
-            connection.results.add(plugin, {pass: method});
 
             connection.results.add({name:'auth'}, {
                 pass: plugin.name,

package/plugins/queue/test.js

@@ -4,10 +4,12 @@ const os = require('node:os');
 const tempDir = os.tmpdir();
 
 exports.hook_queue = function (next, connection) {
-    if (!connection?.transaction) return next();
+    const txn = connection?.transaction;
+    if (!txn) return next();
 
-    const ws = fs.createWriteStream(`${tempDir}/mail.eml`);
-    connection.logdebug(this, `Saving to ${tempDir}/mail.eml`);
+    const file_path = `${tempDir}/mail_${txn.uuid}.eml`
+    const ws = fs.createWriteStream(file_path);
+    connection.logdebug(this, `Saving to ${file_path}`);
     ws.once('close', () => next(OK));
     connection.transaction.message_stream.pipe(ws);
 }

package/server.js

@@ -32,12 +32,7 @@ Server.load_smtp_ini = () => {
     Server.cfg = Server.config.get('smtp.ini', {
         booleans: [
             '-main.daemonize',
-            '-main.strict_rfc1869',
-            '+main.smtputf8',
             '-main.graceful_shutdown',
-            '+headers.add_received',
-            '+headers.show_version',
-            '+headers.clean_auth_results',
         ],
     }, () => {
         Server.load_smtp_ini();
@@ -56,15 +51,6 @@ Server.load_smtp_ini = () => {
         nodes: 1,
     };
 
-    Server.cfg.headers.max_received = parseInt(Server.cfg.headers.max_received) || parseInt(Server.config.get('max_received_count')) || 100;
-    Server.cfg.headers.max_lines    = parseInt(Server.cfg.headers.max_lines) || parseInt(Server.config.get('max_header_lines')) || 1000;
-
-    const strict_ext = Server.config.get('strict_rfc1869');
-    if (Server.cfg.main.strict_rfc1869 === false && strict_ext) {
-        Server.logwarn(`legacy config config/strict_rfc1869 is overriding smtp.ini`)
-        Server.cfg.main.strict_rfc1869 = strict_ext;
-    }
-
     for (const key in defaults) {
         if (Server.cfg.main[key] !== undefined) continue;
         Server.cfg.main[key] = defaults[key];

package/test/connection.js

@@ -1,5 +1,5 @@
 
-const assert = require('node:assert')
+const assert = require('node:assert/strict')
 
 const constants    = require('haraka-constants');
 const DSN          = require('haraka-dsn')
@@ -7,7 +7,7 @@ const DSN          = require('haraka-dsn')
 const connection   = require('../connection');
 const Server       = require('../server');
 
-// huge hack here, but plugin tests need constants
+// hack alert, but plugin tests need constants
 constants.import(global);
 
 const _set_up = (done) => {
@@ -229,16 +229,27 @@ describe('connection', () => {
 
         it('sets and gets', () => {
             assert.equal(this.connection.relaying, false);
-            assert.ok(this.connection.relaying = 'alligators');
+
+            this.connection.set('relaying', 'crocodiles');
+            assert.equal(this.connection.get('relaying'), 'crocodiles');
+            assert.equal(this.connection.relaying, 'crocodiles');
+            assert.equal(this.connection._relaying, 'crocodiles');
+
+            this.connection.relaying = 'alligators';
+            assert.equal(this.connection.get('relaying'), 'alligators');
             assert.equal(this.connection.relaying, 'alligators');
+            assert.equal(this.connection._relaying, 'alligators');
         })
 
         it('sets and gets in a transaction', () => {
             assert.equal(this.connection.relaying, false);
-            this.connection.transaction = {};
-            assert.ok(this.connection.relaying = 'crocodiles');
-            assert.equal(this.connection.transaction._relaying, 'crocodiles');
-            assert.equal(this.connection.relaying, 'crocodiles');
+
+            this.connection.transaction = {}
+            this.connection.set('relaying', 'txn-only'); // sets txn.relaying
+
+            assert.equal(this.connection.get('relaying'), 'txn-only')
+            assert.equal(this.connection._relaying, false);
+            assert.equal(this.connection.transaction._relaying, 'txn-only');
         })
     })
 

package/.eslintrc.yaml

@@ -1,11 +0,0 @@
-env:
-  es6: true
-  node: true
-  es2022: true
-
-extends: ['@haraka']
-
-rules:
-  prefer-template: 'warn'
-  no-unneeded-ternary: 1
-  no-unused-vars: 0

package/config/connection_close_message

@@ -1 +0,0 @@
-closing connection. Have a jolly good day.

package/config/databytes

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

package/config/dhparams.pem

@@ -1,8 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIIBDAKCAQEApFk8xNOjLnepwoVTwGBOtmR25KqRjdF3A/DPb+enmE6Kmwtr5KCP
-EwdaSyjLVFMqE9DQzMdfl5mpU+1HghTBRmiUIWnpUWhkXJsGVYvMN/ny6aVO8zuO
-K+7RtqqPo0Cop6ayMmMYg+cFKTEdP6B3LDZgrTRUy1jLVq2RsZajOn+pQMQjCgjK
-bF44ctsUgc3RRL5bO/bsyh+N+KC0LpwcsnvNxX8lwVry9+4uPwH1j/PORAt1AxvT
-AEW4PET1C44IoocclLKXA4jaGxLW8Bhhf875KnH8ACzi24Wn0doIbPzm5KY2nSEw
-e5tD4DLWs6jk66lRKJ/WtEKMwxgum8SFDwIBAgICAOE=
------END DH PARAMETERS-----

package/config/early_talker.ini

@@ -1,11 +0,0 @@
-
-; delay in seconds
-pause=5
-
-; terminate the connection? (default: true)
-; reject=false
-
-; Whitelist of client IP ranges to skip delay on
-[ip_whitelist]
-::1
-127.0.0.1

package/config/mail_from.is_resolvable.ini

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

package/config/max_unrecognized_commands

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

package/config/smtp.json

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