Skip to content

Commit

Permalink
Release v1.1.7 (#34)
Browse files Browse the repository at this point in the history
- index: updated this.logdebug syntax
- deps(all): bumped to latest
- run rdns_access on connect_init hook #32
  • Loading branch information
msimerson authored Oct 2, 2024
1 parent 564eeb1 commit 3edd51e
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
branches:
- master
paths:
- package.json

env:
CI: true
Expand Down
2 changes: 1 addition & 1 deletion .release
Submodule .release updated 7 files
+3 −0 CHANGELOG.md
+4 −3 README.md
+8 −0 base.sh
+82 −0 contributors.js
+8 −1 finish.sh
+36 −5 start.sh
+29 −17 submit.sh
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
7 changes: 3 additions & 4 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

# Contributors

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-access/commits?author=msimerson">37</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/2158203?v=4"><br><a href="https://github.com/luto">luto</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=luto">8</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/1674289?v=4"><br><a href="https://github.com/Dexus">Dexus</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=Dexus">2</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/83369329?v=4"><br><a href="https://github.com/polarismail">polarismail</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=polarismail">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-access/commits?author=msimerson">38</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/2158203?v=4"><br><a href="https://github.com/luto">luto</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=luto">8</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/1674289?v=4"><br><a href="https://github.com/Dexus">Dexus</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=Dexus">2</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-access/commits?author=gtech99">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/83369329?v=4"><br><a href="https://github.com/polarismail">polarismail</a> (<a href="https://github.com/haraka/haraka-plugin-access/commits?author=polarismail">1</a>) |
| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |

<sub>created and maintained with [.release](https://github.com/msimerson/.release)</sub>
<sub>this file is maintained by [.release](https://github.com/msimerson/.release)</sub>
33 changes: 16 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
```

Expand Down Expand Up @@ -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

Expand Down
9 changes: 4 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
)
}
Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand Down
21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand All @@ -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"
}
}

0 comments on commit 3edd51e

Please sign in to comment.