replace resolveMX with nu.get_mx with punycode (#2861)

* replace resolveMX with nu.get_mx with punycode, fixes #2778 * require newer haraka-net-utils
haraka · Nov 18, 2020 · 4e4a005 · 4e4a005
1 parent 9b60d3b
commit 4e4a005
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Changes.md b/Changes.md
@@ -42,6 +42,7 @@
 
 ### Fixes
 
+* check for punycode domain names when resolving MX, avoid crash #2861
 * wait until entire message is spooled when spool_after in use #2840
 * hmail: add missing space in temp_fail emitter #2837
 * fix outbound config reloading after outbound split #2802

diff --git a/outbound/mx_lookup.js b/outbound/mx_lookup.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const dns         = require('dns');
+const net_utils   = require('haraka-net-utils')
 
 exports.lookup_mx = function lookup_mx (domain, cb) {
     const mxs = [];
@@ -44,19 +45,16 @@ exports.lookup_mx = function lookup_mx (domain, cb) {
         return 1;
     }
 
-    dns.resolveMx(domain, (err, addresses) => {
-        if (process_dns(err, addresses)) {
-            return;
-        }
+    net_utils.get_mx(domain, (err, addresses) => {
+        if (process_dns(err, addresses)) return;
 
         // if MX lookup failed, we lookup an A record. To do that we change
         // wrap_mx() to return same thing as resolveMx() does.
         wrap_mx = a => ({priority:0,exchange:a});
         // IS: IPv6 compatible
         dns.resolve(domain, (err2, addresses2) => {
-            if (process_dns(err2, addresses2)) {
-                return;
-            }
+            if (process_dns(err2, addresses2)) return;
+
             err2 = new Error("Found nowhere to deliver to");
             err2.code = 'NOMX';
             cb(err2);

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "haraka-config"         : ">=1.0.15",
     "haraka-constants"      : ">=1.0.5",
     "haraka-dsn"            : "*",
-    "haraka-net-utils"      : ">=1.1.2",
+    "haraka-net-utils"      : ">=1.2.0",
     "haraka-notes"          : "*",
     "haraka-results"        : "^2.0.3",
     "haraka-tld"            : "*",

diff --git a/plugins/mail_from.is_resolvable.js b/plugins/mail_from.is_resolvable.js
@@ -67,7 +67,7 @@ exports.hook_mail = function (next, connection, params) {
     }
 
     // IS: IPv6 compatible
-    dns.resolveMx(domain, (err, addresses) => {
+    net_utils.get_mx(domain, (err, addresses) => {
         if (!txn) return;
         if (err && plugin.mxErr(connection, domain, 'MX', err, mxDone)) return;
 

diff --git a/spf.js b/spf.js
@@ -3,6 +3,7 @@
 
 const dns = require('dns');
 const ipaddr = require('ipaddr.js');
+const net_utils = require('haraka-net-utils')
 
 class SPF {
     constructor (count, been_there) {
@@ -467,7 +468,7 @@ class SPF {
             domain = dm[1];
         }
         // Fetch the MX records for the specified domain
-        dns.resolveMx(domain, (err, mxes) => {
+        net_utils.get_mx(domain, (err, mxes) => {
             if (err) {
                 switch (err.code) {
                     case dns.NOTFOUND: