Skip to content

Commit

Permalink
repackage dnsbl, dnswl, backscatterer -> dns-list (#3313)
Browse files Browse the repository at this point in the history
This packaging of a module has some significant advantages for the main
Haraka repo:

- reduces the time it takes to run the test suite (9-20 seconds)
- removes a persistent source of transient test failures from the main repo
  • Loading branch information
msimerson authored Apr 15, 2024
1 parent a270f46 commit acae6c2
Show file tree
Hide file tree
Showing 14 changed files with 8 additions and 839 deletions.
1 change: 1 addition & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

- transaction: init with conn.init_transaction, always pass in cfg #3315
- check for local_mx only when default route is used #3307
- new NPM plugin dns-list, repackages dnsbl, dnswl, backscatterer #3313
- test: add a connection.response test case with DSN #3305
- deps: bump all versions to latest #3303
- auth_base: enable disabling constrain_sender at runtime #3298
Expand Down
23 changes: 0 additions & 23 deletions config/dnsbl.ini

This file was deleted.

4 changes: 2 additions & 2 deletions config/plugins
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
# geoip
# asn
# fcrdns
# block mails from known bad hosts (see config/dnsbl.zones for the DNS zones queried)
dnsbl
# block & allow lists (see config/dns-list.ini)
dns-list

# HELO
#early_talker
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"haraka-plugin-asn": "^2.0.2",
"haraka-plugin-auth-ldap": "^1.1.0",
"haraka-plugin-dcc": "^1.0.2",
"haraka-plugin-dns-list": "^1.1.0",
"haraka-plugin-elasticsearch": "^8.0.2",
"haraka-plugin-fcrdns": "^1.1.0",
"haraka-plugin-graph": "^1.0.5",
Expand Down
4 changes: 4 additions & 0 deletions plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ plugins.load_plugins = override => {
}

plugins.deprecated = {
'backscatterer' : 'dns-list',
'connect.asn' : 'asn',
'connect.fcrdns' : 'fcrdns',
'connect.geoip' : 'geoip',
Expand All @@ -352,6 +353,9 @@ plugins.deprecated = {
'data.noreceived' : 'headers',
'data.rfc5322_header_checks': 'headers',
'data.headers' : 'headers',
'data.uribl' : 'uribl',
'dnsbl' : 'dns-list',
'dnswl' : 'dns-list',
'log.syslog' : 'syslog',
'mail_from.access' : 'access',
'mail_from.blocklist' : 'access',
Expand Down
25 changes: 0 additions & 25 deletions plugins/backscatterer.js

This file was deleted.

4 changes: 0 additions & 4 deletions plugins/data.uribl.js

This file was deleted.

221 changes: 0 additions & 221 deletions plugins/dns_list_base.js

This file was deleted.

Loading

0 comments on commit acae6c2

Please sign in to comment.