From 3edd51e8f15443a758b1439641031961877dc234 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Tue, 1 Oct 2024 21:04:08 -0700 Subject: [PATCH] Release v1.1.7 (#34) - index: updated this.logdebug syntax - deps(all): bumped to latest - run rdns_access on connect_init hook #32 --- .github/workflows/publish.yml | 2 ++ .release | 2 +- CHANGELOG.md | 12 ++++++++++++ CONTRIBUTORS.md | 7 +++---- README.md | 33 ++++++++++++++++----------------- index.js | 9 ++++----- package.json | 21 ++++++++++----------- 7 files changed, 48 insertions(+), 38 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d97a994..e81c15f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,6 +4,8 @@ on: push: branches: - master + paths: + - package.json env: CI: true diff --git a/.release b/.release index 7cd5707..afb1db8 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit 7cd5707f7d69f8d4dca1ec407ada911890e59d0a +Subproject commit afb1db801607dda5e859f39b600f0dd0111e4651 diff --git a/CHANGELOG.md b/CHANGELOG.md index cf1c6b8..d991d3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ +# Changelog + +The format is based on [Keep a Changelog](https://keepachangelog.com/). + ### Unreleased +### [1.1.7] - 2024-10-01 + +- index: updated this.logdebug syntax +- deps(all): bumped to latest +- run rdns_access on connect_init hook #32 + ### [1.1.6] - 2024-04-09 - dep: update all versions and pin to latest @@ -42,3 +52,5 @@ [1.1.5]: https://github.com/haraka/haraka-plugin-access/releases/tag/1.1.5 [1.1.6]: https://github.com/haraka/haraka-plugin-access/releases/tag/1.1.6 +[1.1.7]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.7 +[1.1.4]: https://github.com/haraka/haraka-plugin-access/releases/tag/v1.1.4 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 310ffcf..642b6b8 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,9 +1,8 @@ - # Contributors This handcrafted artisinal software is brought to you by: -|
msimerson (37)|
luto (8)|
Dexus (2)|
polarismail (1)| -| :---: | :---: | :---: | :---: | +|
msimerson (38) |
luto (8) |
Dexus (2) |
gtech99 (1) |
polarismail (1) | +| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -created and maintained with [.release](https://github.com/msimerson/.release) +this file is maintained by [.release](https://github.com/msimerson/.release) diff --git a/README.md b/README.md index 83abaed..ceca89a 100644 --- a/README.md +++ b/README.md @@ -85,14 +85,14 @@ To check access results from other plugins, use the standard _results_ methods. ```js -const ar = connection.results.get('access'); +const ar = connection.results.get('access') if (ar.pass.length > 2) { - // they passed the connection and helo checks + // they passed the connection and helo checks } -const ar = connection.transaction.results.get('access'); +const ar = connection.transaction.results.get('access') if (ar.pass.length > 2) { - // they passed the mail and rcpt checks + // they passed the mail and rcpt checks } ``` @@ -134,25 +134,24 @@ rcpt=That recipient is not allowed The connect ACLs are evaluated against the IP address **and** the rDNS hostname (if any) of the remote. -* connect.rdns_access.whitelist (pass) -* connect.rdns_access.whitelist_regex (pass) -* connect.rdns_access.blacklist (block) -* connect.rdns_access.blacklist_regex (block) +- connect.rdns_access.whitelist (pass) +- connect.rdns_access.whitelist_regex (pass) +- connect.rdns_access.blacklist (block) +- connect.rdns_access.blacklist_regex (block) ### MAIL FROM -* mail_from.access.whitelist (pass) -* mail_from.access.whitelist_regex (pass) -* mail_from.access.blacklist (block) -* mail_from.access.blacklist_regex (block) +- mail_from.access.whitelist (pass) +- mail_from.access.whitelist_regex (pass) +- mail_from.access.blacklist (block) +- mail_from.access.blacklist_regex (block) ### RCPT TO -* rcpt_to.access.whitelist (pass) -* rcpt_to.access.whitelist_regex (pass) -* rcpt_to.access.blacklist (block) -* rcpt_to.access.blacklist_regex (block) - +- rcpt_to.access.whitelist (pass) +- rcpt_to.access.whitelist_regex (pass) +- rcpt_to.access.blacklist (block) +- rcpt_to.access.blacklist_regex (block) ## NOTES diff --git a/index.js b/index.js index 87c1bdb..b2dd632 100644 --- a/index.js +++ b/index.js @@ -456,10 +456,9 @@ exports.in_re_list = function (type, phase, address) { return false } if (!this.cfg.re[type][phase].source) { - this.logdebug(this, `empty file: ${this.cfg.re[type][phase]}`) + this.logdebug(`empty file: ${this.cfg.re[type][phase]}`) } else { this.logdebug( - this, `checking ${address} against ` + `${this.cfg.re[type][phase].source}`, ) } @@ -468,7 +467,7 @@ exports.in_re_list = function (type, phase, address) { exports.load_file = function (type, phase) { if (!this.cfg.check[phase]) { - this.logdebug(this, `skipping ${this.cfg[type][phase]}`) + this.logdebug(`skipping ${this.cfg[type][phase]}`) return } @@ -494,7 +493,7 @@ exports.load_file = function (type, phase) { exports.load_re_file = function (type, phase) { if (!this.cfg.check[phase]) { - this.logdebug(this, `skipping ${this.cfg.re[type][phase]}`) + this.logdebug(`skipping ${this.cfg.re[type][phase]}`) return } @@ -515,7 +514,7 @@ exports.load_re_file = function (type, phase) { exports.load_domain_file = function (type, phase) { if (!this.cfg.check[phase]) { - this.logdebug(this, `skipping ${this.cfg[type][phase]}`) + this.logdebug(`skipping ${this.cfg[type][phase]}`) return } diff --git a/package.json b/package.json index d32c8be..b3f3a31 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,10 @@ { "name": "haraka-plugin-access", - "version": "1.1.6", + "version": "1.1.7", "description": "Haraka plugin for ACLs for email connections", "main": "index.js", "files": [ - "CHANGELOG", - "CONTRIBUTORS", + "CHANGELOG.md", "config" ], "scripts": { @@ -15,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", @@ -34,13 +33,13 @@ }, "homepage": "https://github.com/haraka/haraka-plugin-access#readme", "devDependencies": { - "@haraka/eslint-config": "^1.1.3", - "haraka-test-fixtures": "^1.3.5" + "@haraka/eslint-config": "^1.1.5", + "haraka-test-fixtures": "^1.3.8" }, "dependencies": { - "address-rfc2822": "^2.2.1", - "haraka-net-utils": "^1.5.4", - "haraka-tld": "^1.2.1", - "haraka-utils": "^1.1.2" + "address-rfc2822": "^2.2.2", + "haraka-net-utils": "^1.7.0", + "haraka-tld": "^1.2.2", + "haraka-utils": "^1.1.3" } }