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 v2.0.3 #25

Merged
merged 1 commit into from
May 12, 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
10 changes: 5 additions & 5 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
engines:
eslint:
enabled: true
channel: "eslint-8"
channel: 'eslint-8'
config:
config: ".eslintrc.yaml"
config: '.eslintrc.yaml'

ratings:
paths:
- "**.js"
paths:
- '**.js'

checks:
method-complexity:
config:
threshold: 10
threshold: 10
20 changes: 3 additions & 17 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,10 @@ env:
node: true
es6: true
mocha: true
es2020: true

plugins:
- haraka
es2022: true

extends:
- eslint:recommended
- plugin:haraka/recommended
- '@haraka'

rules:
indent: [2, 2, {"SwitchCase": 1}]

root: true

globals:
OK: true
CONT: true
DENY: true
DENYSOFT: true
DENYDISCONNECT: true
DENYSOFTDISCONNECT: true
no-unused-vars: 1
24 changes: 5 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: CI

on:
push:
pull_request:

env:
CI: true
Expand All @@ -14,23 +15,8 @@ jobs:
# uses: haraka/.github/.github/workflows/coverage.yml@master
# secrets: inherit

test:
needs: lint
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
node-version: [ 14, 16, 18 ]
fail-fast: false
ubuntu:
uses: haraka/.github/.github/workflows/ubuntu.yml@master

steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
with:
node-version: ${{ matrix.node-version }}

- run: npm install

- run: npm test
windows:
uses: haraka/.github/.github/workflows/windows.yml@master
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: CodeQL

on:
push:
branches: [ master ]
branches: [master]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [master]
schedule:
- cron: '18 7 * * 4'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ env:
jobs:
publish:
uses: haraka/.github/.github/workflows/publish.yml@master
secrets: inherit
secrets: inherit
2 changes: 2 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
singleQuote: true
semi: false
2 changes: 1 addition & 1 deletion .release
30 changes: 19 additions & 11 deletions Changes.md → CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
# Changelog

The format is based on [Keep a Changelog](https://keepachangelog.com/).

### Unreleased

### [2.0.3] - 2023-12-13

- ci: use shared ci workflows
- confirm maxmind db has loaded before registering hook #23
- populate [files] in package.json
- dep: eslint-plugin-haraka -> @haraka/eslint-config
- lint: remove duplicate / stale rules from .eslintrc
- doc: renamed Changes.md -> CHANGELOG.md

### 2.0.2 - 2023-02-07

- fix: catching DNS timeout exception


### 2.0.1 - 2022-05-27

- fix: when adding headers, assure ASN is string
- fix: when adding header, look in correct location for asn.org
- when create conn note, only assign properties with values


### 2.0.0 - 2022-05-23

- style: replace most callbacks with async/await
- use builtin/promises where available
- asn.ini: switch default dns provider to rspamd
- dep: remove async


### 1.0.9 - 2022-05-22

- ci: add GitHub Actions CI, #17
Expand All @@ -30,7 +39,6 @@
- style: more es6/7
- dep(async): bump version to 3.2


### 1.0.8 - 2018-01-22

- parse maxmind ASN w/o Org data
Expand All @@ -39,18 +47,15 @@
- added parse_rspamd test
- emit rspamd DNS provider results (when enabled)


### 1.0.7 - 2017-02-06

- updated eslint to use eslint-plugin-haraka
- aggregate results before emitting


### 1.0.6 - 2016-10-20

* when protocols[setting]=false, don't enable that protocol
* ie, do what the config implies

- when protocols[setting]=false, don't enable that protocol
- ie, do what the config implies

### 1.0.5 - 2016-10-08

Expand All @@ -62,5 +67,8 @@

### 1.0.0 - 2016-07-21


[2.0.2]: https://github.com/haraka/haraka-plugin-asn/releases/tag/2.0.2
[1.0.9]: https://github.com/haraka/haraka-plugin-asn/releases/tag/v1.0.9
[2.0.0]: https://github.com/haraka/haraka-plugin-asn/releases/tag/v2.0.0
[2.0.1]: https://github.com/haraka/haraka-plugin-asn/releases/tag/2.0.1
[2.0.2]: https://github.com/haraka/haraka-plugin-asn/releases/tag/v2.0.2
[2.0.3]: https://github.com/haraka/haraka-plugin-asn/releases/tag/2.0.3
8 changes: 8 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +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-asn/commits?author=msimerson">26</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/934254?v=4"><br><a href="https://github.com/analogic">analogic</a> (<a href="https://github.com/haraka/haraka-plugin-asn/commits?author=analogic">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-asn/commits?author=lnedry">1</a>) |
| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |

<sub>this file is maintained by [.release](https://github.com/msimerson/.release)</sub>
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,18 @@

look up ASN from local GeoIP databases and/or DNS based providers.


### DNS providers

* origin.asn.cymru.com
* asn.routeviews.org
* asn.rspamd.com

- origin.asn.cymru.com
- asn.routeviews.org
- asn.rspamd.com

### Databases

* MaxMind ASN database
- MaxMind ASN database

PS: Run something like [maxmind-geolite-mirror](https://www.npmjs.com/package/maxmind-geolite-mirror) weekly to keep your database files up-to-date.


[ci-img]: https://github.com/haraka/haraka-plugin-asn/actions/workflows/ci.yml/badge.svg
[ci-url]: https://github.com/haraka/haraka-plugin-asn/actions/workflows/ci.yml
[clim-img]: https://codeclimate.com/github/haraka/haraka-plugin-asn/badges/gpa.svg
Expand Down
Loading