Skip to content

Commit 3296f88

Browse files
authored
dependencies: bump versions (#3303)
* dependendabot config tweak * outbound: fix error handling in mx_lookup introduced in #3285
1 parent 7062589 commit 3296f88

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

.github/dependabot.yml

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ updates:
1111
interval: "monthly"
1212
allow:
1313
- dependency-type: production
14+
groups:
15+
production-dependencies:
16+
dependency-type: "production"
17+
development-dependencies:
18+
dependency-type: "development"
1419

1520
- package-ecosystem: "docker"
1621
# Look for a `Dockerfile` in the `root` directory

Changes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#### Changed
55

6+
- deps: bump all versions to latest #3303
67
- auth_base: enable disabling constrain_sender at runtime #3298
78
- connection: support IPv6 when setting remote.is_private #3295
89
- outbound/mx_lookup: make it async/await
@@ -23,7 +24,6 @@
2324
#### Added
2425

2526
- feat(auth_vpopmaild): when outbound, assure the envelope domain matches AUTH domain #3265
26-
- docs(outbound): remove example setting outbound_ip #3253
2727
- doc(Plugins.md): add pi-queue-kafka #3247
2828
- feat(rabbitmq_amqplib): configurable optional queue arguments #3239
2929
- feat(clamd): add x-haraka-virus header #3207

outbound/hmail.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,9 @@ class HMailItem extends events.EventEmitter {
227227
}
228228

229229
// if none of the above return codes, drop through to this...
230-
mx_lookup.lookup_mx(this.todo.domain, this.found_mx)
230+
mx_lookup.lookup_mx(this.todo.domain, (err, mxs) => {
231+
this.found_mx(err, mxs);
232+
});
231233
}
232234

233235
found_mx (err, mxs) {

outbound/mx_lookup.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ exports.lookup_mx = async function lookup_mx (domain, cb) {
3838
// likely a hostname with no MX record, drop through
3939
break
4040
default:
41-
throw err(err)
41+
if (cb) return cb(err, mxs)
42+
throw err
4243
}
4344
}
4445

package.json

+18-19
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@
2525
"async": "^3.2.5",
2626
"daemon": "~1.1.0",
2727
"ipaddr.js": "~2.1.0",
28-
"node-gyp": "^10.0.1",
28+
"node-gyp": "^10.1.0",
2929
"nopt": "~7.2.0",
3030
"npid": "~0.4.0",
3131
"semver": "~7.6.0",
3232
"sprintf-js": "~1.1.3",
3333
"haraka-config": "^1.1.0",
3434
"haraka-constants": "^1.0.6",
3535
"haraka-dsn": "^1.0.4",
36-
"haraka-email-message": "^1.2.0",
37-
"haraka-message-stream": "^1.2.0",
38-
"haraka-net-utils": "^1.5.3",
36+
"haraka-email-message": "^1.2.1",
37+
"haraka-message-stream": "^1.2.1",
38+
"haraka-net-utils": "^1.5.4",
3939
"haraka-notes": "^1.0.6",
40-
"haraka-plugin-attachment": "^1.0.7",
40+
"haraka-plugin-attachment": "^1.1.0",
4141
"haraka-plugin-spf": "1.2.4",
4242
"haraka-plugin-redis": "^2.0.6",
4343
"haraka-results": "^2.2.3",
44-
"haraka-tld": "^1.2.0",
44+
"haraka-tld": "^1.2.1",
4545
"haraka-utils": "^1.0.3",
4646
"openssl-wrapper": "^0.3.4",
47-
"redis": "~4.6.11",
47+
"redis": "~4.6.13",
4848
"sockaddr": "^1.0.1"
4949
},
5050
"optionalDependencies": {
@@ -56,29 +56,28 @@
5656
"haraka-plugin-elasticsearch": "^8.0.2",
5757
"haraka-plugin-fcrdns": "^1.1.0",
5858
"haraka-plugin-graph": "^1.0.5",
59-
"haraka-plugin-geoip": "^1.0.17",
60-
"haraka-plugin-headers": "^1.0.3",
61-
"haraka-plugin-karma": "^2.1.2",
62-
"haraka-plugin-limit": "^1.1.1",
59+
"haraka-plugin-geoip": "^1.1.0",
60+
"haraka-plugin-headers": "^1.0.4",
61+
"haraka-plugin-karma": "^2.1.3",
62+
"haraka-plugin-limit": "^1.2.1",
6363
"haraka-plugin-p0f": "^1.0.9",
6464
"haraka-plugin-qmail-deliverable": "^1.2.1",
65-
"haraka-plugin-known-senders": "^1.0.9",
65+
"haraka-plugin-known-senders": "^1.1.0",
6666
"haraka-plugin-rcpt-ldap": "^1.1.0",
6767
"haraka-plugin-recipient-routes": "^1.2.0",
6868
"haraka-plugin-rspamd": "^1.3.1",
69-
"haraka-plugin-syslog": "^1.0.5",
69+
"haraka-plugin-syslog": "^1.0.6",
7070
"haraka-plugin-uribl": "^1.0.8",
71-
"haraka-plugin-watch": "^2.0.2",
71+
"haraka-plugin-watch": "^2.0.4",
7272
"ocsp": "~1.2.0",
73-
"tmp": "~0.2.1"
73+
"tmp": "~0.2.3"
7474
},
7575
"devDependencies": {
7676
"nodeunit-x": "^0.16.0",
7777
"haraka-test-fixtures": "^1.3.3",
7878
"mock-require": "^3.0.3",
79-
"eslint": "^8.56.0",
8079
"eslint-plugin-haraka": "^1.0.15",
81-
"nodemailer": "^6.9.9"
80+
"nodemailer": "^6.9.13"
8281
},
8382
"bugs": {
8483
"mail": "[email protected]",
@@ -91,8 +90,8 @@
9190
},
9291
"scripts": {
9392
"test": "node run_tests",
94-
"lint": "npx eslint *.js outbound plugins plugins/*/*.js tests tests/*/*.js tests/*/*/*.js bin/haraka bin/dkimverify",
95-
"lintfix": "npx eslint --fix *.js outbound plugins plugins/*/*.js tests tests/*/*.js tests/*/*/*.js bin/haraka bin/dkimverify",
93+
"lint": "npx eslint@^8 *.js outbound plugins plugins/*/*.js tests tests/*/*.js tests/*/*/*.js bin/haraka bin/dkimverify",
94+
"lintfix": "npx eslint@^8 --fix *.js outbound plugins plugins/*/*.js tests tests/*/*.js tests/*/*/*.js bin/haraka bin/dkimverify",
9695
"versions": "npx dependency-version-checker check"
9796
}
9897
}

0 commit comments

Comments
 (0)