Release 2.0.1 (#20)

* ci: merged lint into ci-test.yml
* ci: depend on GHA shared workflows
- 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

Author: msimerson

.codeclimate.yml

@@ -8,3 +8,8 @@ engines:
 ratings:
    paths:
    - "**.js"
+
+checks:
+  method-complexity:
+    config:
+      threshold: 10

.github/workflows/ci-test.yml .github/workflows/ci.yml

@@ -1,28 +1,36 @@
-name: Tests
+name: CI
 
-on: [ push ]
+on:
+  push:
 
 env:
   CI: true
 
 jobs:
+  lint:
+    uses: haraka/.github/.github/workflows/lint.yml@master
 
-  ci-test:
+  # coverage:
+  #   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
 
     steps:
-    - uses: actions/checkout@v2
+    - 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

.github/workflows/codeql.yml

@@ -0,0 +1,14 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '18 7 * * 4'
+
+jobs:
+  codeql:
+    uses: haraka/.github/.github/workflows/codeql.yml@master

.github/workflows/coveralls.yml

@@ -1,49 +1,16 @@
-name: Publish
+name: publish
 
 on:
-  release:
-    types: [ published ]
+  push:
+    branches:
+      - master
+    paths:
+      - package.json
 
 env:
-  node_version: 16
+  CI: true
 
 jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v3
-      with:
-        node-version: ${{ env.node_version }}
-    - run: npm install
-    - run: npm test
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-
-    - uses: actions/setup-node@v3
-      with:
-        node-version: ${{ env.node_version }}
-        registry-url: https://registry.npmjs.org
-    - run: npm install
-
-    - run: npm publish --ignore-scripts --access public
-      env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-
-  publish-gpr:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{ env.node_version }}
-        registry-url: https://registry.npmjs.org
-    - run: npm install
+  publish:
+    uses: haraka/.github/.github/workflows/publish.yml@master
+    secrets: inherit

.github/workflows/lint.yml

@@ -1,9 +1,17 @@
 
+## 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

.github/workflows/publish.yml

@@ -21,10 +21,8 @@ look up ASN from local GeoIP databases and/or DNS based providers.
 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-test.yml/badge.svg
-[ci-url]: https://github.com/haraka/haraka-plugin-asn/actions/workflows/ci-test.yml
-[cov-img]: https://codecov.io/github/haraka/haraka-plugin-asn/badge.svg
-[cov-url]: https://codecov.io/github/haraka/haraka-plugin-asn
+[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
 [clim-url]: https://codeclimate.com/github/haraka/haraka-plugin-asn
 [npm-img]: https://nodei.co/npm/haraka-plugin-asn.png

Changes.md

@@ -247,18 +247,17 @@ exports.parse_rspamd = function (str) {
 exports.add_header_asn = function (next, connection) {
 
   const asn = connection.results.get('asn');
-  if (!asn || !asn.asn) return next();
-
+  if (!asn?.asn) return next();
   if (!connection.transaction) return next();
 
   if (asn.net) {
     connection.transaction.add_header('X-Haraka-ASN', `${asn.asn} ${asn.net}`);
   }
   else {
-    connection.transaction.add_header('X-Haraka-ASN', asn.asn);
+    connection.transaction.add_header('X-Haraka-ASN', `${asn.asn}`);
   }
-  if (asn.asn_org) {
-    connection.transaction.add_header('X-Haraka-ASN-Org', asn.asn_org);
+  if (asn.org) {
+    connection.transaction.add_header('X-Haraka-ASN-Org', `${asn.org}`);
   }
 
   next();
@@ -267,7 +266,7 @@ exports.add_header_asn = function (next, connection) {
 exports.add_header_provider = function (next, connection) {
 
   const asn = connection.results.get('asn');
-  if (!asn || !asn.asn) return next();
+  if (!asn?.asn) return next();
 
   for (const p in asn) {
     if (!asn[p].asn) continue;  // ignore non-object results
@@ -307,7 +306,7 @@ exports.load_dbs = async function () {
   try {
     await fs.access(dbPath)
 
-    this.ASNLookup = await this.maxmind.open(dbPath, {
+    this.lookup = await this.maxmind.open(dbPath, {
       // this causes tests to hang, which is why mocha runs with --exit
       watchForUpdates: true,
       cache: {
@@ -320,6 +319,7 @@ exports.load_dbs = async function () {
     this.dbsLoaded++;
   }
   catch (e) {
+    console.error(e)
     this.loginfo(`missing [access to] DB ${dbPath}`)
   }
 
@@ -329,11 +329,11 @@ exports.load_dbs = async function () {
 exports.lookup_via_maxmind = function (next, connection) {
   if (!this.maxmind || !this.dbsLoaded) return next();
 
-  const asn = this.ASNLookup.get(connection.remote.ip)
-  if (asn) {
+  const asn = this.lookup.get(connection.remote.ip)
+  if (asn?.autonomous_system_number || asn?.autonomous_system_organization) {
     connection.results.add(this, {
-      asn: asn.autonomous_system_number,
-      org: asn.autonomous_system_organization,
+      ...(asn.autonomous_system_number       ? { asn: asn.autonomous_system_number }       : {}),
+      ...(asn.autonomous_system_organization ? { org: asn.autonomous_system_organization } : {}),
     });
   }
 

README.md

@@ -1,13 +1,12 @@
 {
   "name": "haraka-plugin-asn",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "look up ASN of remote MTA",
   "main": "index.js",
   "scripts": {
     "test": "npx mocha --exit",
-    "lint": "npx eslint *.js test/*.js",
-    "lintfix": "npx eslint --fix *.js test/*.js",
-    "coverage": "npx istanbul cover npm test",
+    "lint": "npx eslint *.js test",
+    "lintfix": "npx eslint --fix *.js test",
     "versions": "npx dependency-version-checker check"
   },
   "repository": {
@@ -31,8 +30,8 @@
   },
   "devDependencies": {
     "eslint": ">=8",
-    "eslint-plugin-haraka": ">=1.0.5",
-    "haraka-test-fixtures": ">=1.0.30",
-    "mocha": "*"
+    "eslint-plugin-haraka": ">=1.0.14",
+    "haraka-test-fixtures": ">=1.0.34",
+    "mocha": ">=9"
   }
 }

index.js

@@ -189,8 +189,6 @@ describe('maxmind geoip db', () => {
     asn.test_and_register_geoip().then((r) => {
       // console.log(r)
       assert.ok(asn.maxmind)
-      // assert.ok(asn.ASNLookup)
-      // console.log(asn.ASNLookup)
       done()
     })
   })
@@ -216,23 +214,27 @@ describe('maxmind geoip db', () => {
     })
   })
 
-  it('maxmind AS w/o org', (done) => {
+  it('maxmind AS with org', (done) => {
     const asn = new fixtures.plugin('asn');
     asn.cfg = { main: { }, protocols: { geoip: true } };
     asn.connection = fixtures.connection.createConnection();
-    asn.connection.remote.ip='216.255.64.1';
+    asn.connection.remote.ip='1.1.1.1';
     asn.test_and_register_geoip().then(() => {
-
-      asn.lookup_via_maxmind(() => {
-        if (asn.mmDbsAvail && asn.mmDbsAvail.length > 0) {
-          const res = asn.connection.results.get('asn');
-          // console.log(res);
-          assert.equal(res.asn, 63200);
-          assert.equal(res.org, '');
-        }
-        done();
-      },
-      asn.connection);
+      try {
+        asn.lookup_via_maxmind(() => {
+          if (asn.dbsLoaded) {
+            const res = asn.connection.results.get('asn');
+            assert.equal(res?.asn, 13335);
+            assert.equal(res?.org, 'CLOUDFLARENET');
+          }
+          done()
+        },
+        asn.connection);
+      }
+      catch (e) {
+        console.error(e)
+        done()
+      }
     })
   })
 })