From 3ede2269add4ca653f4d9f98d27434cdcbdf5e33 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Thu, 22 Aug 2024 21:15:28 -0700 Subject: [PATCH 1/6] doc(CONTRIBUTORS): updated --- .release | 2 +- CONTRIBUTORS.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.release b/.release index 36bb27a..afb1db8 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit 36bb27a93862517943e04f24fd67b0df2da6cbbe +Subproject commit afb1db801607dda5e859f39b600f0dd0111e4651 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 73e1dd8..2bb6919 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,7 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (7) |
lnedry (1) | -| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +|
msimerson (8)|
lnedry (1)| +| :---: | :---: | this file is maintained by [.release](https://github.com/msimerson/.release) From cdc5f5f2639830076fa1a004199937a8299b7276 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Thu, 22 Aug 2024 21:16:28 -0700 Subject: [PATCH 2/6] chore: bump dep versions --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 12 ++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0950072..0175a93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### Unreleased +### [1.2.1] - 2024-08-22 + +#### Added + +- + +#### Fixed + +- + +#### Changed + +- + + ### [1.2.0] - 2024-04-13 - dnswl: sending OK on helo & mail hooks disabled by default @@ -35,3 +50,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 diff --git a/package.json b/package.json index fb075f4..f8635a2 100644 --- a/package.json +++ b/package.json @@ -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": [ @@ -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", @@ -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" } } From 84a416384d02d7cb6398016d4a466d73856c5022 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Thu, 22 Aug 2024 21:17:06 -0700 Subject: [PATCH 3/6] test: update transaction init syntax --- test/dns-list.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/dns-list.js b/test/dns-list.js index e2b9162..1ccf386 100644 --- a/test/dns-list.js +++ b/test/dns-list.js @@ -32,8 +32,7 @@ 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) }) }) From d448b61d68491b52c4f3e6ec10b35e345e837688 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Thu, 22 Aug 2024 21:20:13 -0700 Subject: [PATCH 4/6] update changes --- CHANGELOG.md | 14 ++------------ index.js | 2 -- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0175a93..abb6ec8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,18 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). ### [1.2.1] - 2024-08-22 -#### Added - -- - -#### Fixed - -- - -#### Changed - -- - +- 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 diff --git a/index.js b/index.js index 0eb17b3..103185d 100644 --- a/index.js +++ b/index.js @@ -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() From c2874bbf1c86d83c16bfd7ba332e2df8a869c1b7 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Thu, 22 Aug 2024 21:21:09 -0700 Subject: [PATCH 5/6] chore: format --- CONTRIBUTORS.md | 4 ++-- test/dns-list.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2bb6919..6945af0 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,7 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (8)|
lnedry (1)| -| :---: | :---: | +|
msimerson (8) |
lnedry (1) | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | this file is maintained by [.release](https://github.com/msimerson/.release) diff --git a/test/dns-list.js b/test/dns-list.js index 1ccf386..7eb8e04 100644 --- a/test/dns-list.js +++ b/test/dns-list.js @@ -39,31 +39,31 @@ describe('dns-list', function () { 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']) }) From b9d80b64bcdfc9df8fa1848c56391776248a1620 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Thu, 22 Aug 2024 21:23:05 -0700 Subject: [PATCH 6/6] doc: update CONTRIBUTORS --- CONTRIBUTORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 6945af0..5926c3e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2,7 +2,7 @@ This handcrafted artisinal software is brought to you by: -|
msimerson (8) |
lnedry (1) | -| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +|
msimerson (8)|
gtech99 (1)|
lnedry (1)| +| :---: | :---: | :---: | this file is maintained by [.release](https://github.com/msimerson/.release)