Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.2.1 #10

Merged
merged 6 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .release
Submodule .release updated 4 files
+4 −3 README.md
+9 −4 contributors.js
+8 −1 finish.sh
+26 −15 submit.sh
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).

### Unreleased

### [1.2.1] - 2024-08-22

- fix: don't make a set from a set (happened when periodic_checks < 5), #9
- chore: bump dep versions

### [1.2.0] - 2024-04-13

- dnswl: sending OK on helo & mail hooks disabled by default
Expand Down Expand Up @@ -35,3 +40,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
[1.0.3]: https://github.com/haraka/haraka-plugin-dns-list/releases/tag/v1.0.3
[1.1.0]: https://github.com/haraka/haraka-plugin-dns-list/releases/tag/v1.1.0
[1.2.0]: https://github.com/haraka/haraka-plugin-dns-list/releases/tag/v1.2.0
[1.2.1]: https://github.com/haraka/haraka-plugin-dns-list/releases/tag/v1.2.1
4 changes: 2 additions & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This handcrafted artisinal software is brought to you by:

| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/haraka-plugin-dns-list/commits?author=msimerson">7</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/203240?v=4"><br><a href="https://github.com/lnedry">lnedry</a> (<a href="https://github.com/haraka/haraka-plugin-dns-list/commits?author=lnedry">1</a>) |
| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/haraka-plugin-dns-list/commits?author=msimerson">8</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/15035337?v=4"><br><a href="https://github.com/gtech99">gtech99</a> (<a href="https://github.com/haraka/haraka-plugin-dns-list/commits?author=gtech99">1</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/203240?v=4"><br><a href="https://github.com/lnedry">lnedry</a> (<a href="https://github.com/haraka/haraka-plugin-dns-list/commits?author=lnedry">1</a>)|
| :---: | :---: | :---: |

<sub>this file is maintained by [.release](https://github.com/msimerson/.release)</sub>
2 changes: 0 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ exports.load_config = function () {
// active zones
if (this.cfg.main.periodic_checks < 5) {
// all configured are enabled
// The original code is making a Set from the already existing Set created above. It leads to gibberish
//this.zones = new Set(...this.cfg.main.zones)
this.zones = this.cfg.main.zones
} else {
this.zones = new Set() // populated by check_zones()
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "haraka-plugin-dns-list",
"version": "1.2.0",
"version": "1.2.1",
"description": "Haraka plugin for DNS lists (DNSBL, DNSWL)",
"main": "index.js",
"files": [
Expand All @@ -14,8 +14,8 @@
"prettier": "npx prettier . --check",
"prettier:fix": "npx prettier . --write --log-level=warn",
"test": "npx mocha@^10",
"versions": "npx @msimerson/dependency-version-checker check",
"versions:fix": "npx @msimerson/dependency-version-checker update && npx prettier package.json --write --log-level=warn"
"versions": "npx dependency-version-checker check",
"versions:fix": "npx dependency-version-checker update && npx prettier package.json --write --log-level=warn"
},
"repository": {
"type": "git",
Expand All @@ -35,10 +35,10 @@
},
"homepage": "https://github.com/haraka/haraka-plugin-dns-list#readme",
"devDependencies": {
"@haraka/eslint-config": "^1.1.3",
"haraka-test-fixtures": "^1.3.6"
"@haraka/eslint-config": "^1.1.5",
"haraka-test-fixtures": "^1.3.7"
},
"dependencies": {
"haraka-net-utils": "^1.5.4"
"haraka-net-utils": "^1.7.0"
}
}
13 changes: 6 additions & 7 deletions test/dns-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,38 @@ describe('dns-list', function () {

it('sets up a transaction', function () {
this.connection = fixtures.connection.createConnection({})
this.connection.transaction = fixtures.transaction.createTransaction({})
// console.log(this.connection.transaction)
this.connection.init_transaction()
assert.ok(this.connection.transaction.header)
})
})

describe('lookup', function () {
it('Spamcop, test IPv4', async function () {
this.timeout=4000
this.timeout = 4000
const a = await this.plugin.lookup('127.0.0.2', 'bl.spamcop.net')
assert.deepStrictEqual(['127.0.0.2'], a)
})

it('Spamcop, unlisted IPv6', async function () {
this.timeout=4000
this.timeout = 4000
const r = await this.plugin.lookup('::1', 'bl.spamcop.net')
assert.deepStrictEqual(undefined, r)
})

it('b.barracudacentral.org, unlisted IPv6', async function () {
this.timeout=4000
this.timeout = 4000
const r = await this.plugin.lookup('::1', 'b.barracudacentral.org')
assert.deepStrictEqual(undefined, r)
})

it('Spamcop, unlisted IPv4', async function () {
this.timeout=4000
this.timeout = 4000
const a = await this.plugin.lookup('127.0.0.1', 'bl.spamcop.net')
assert.deepStrictEqual(undefined, a)
})

it('CBL', async function () {
this.timeout=4000
this.timeout = 4000
const a = await this.plugin.lookup('127.0.0.2', 'xbl.spamhaus.org')
assert.deepStrictEqual(a, ['127.0.0.4'])
})
Expand Down