Merge pull request #20 from haraka/19-unparseable-from

wrap from header parse attempt in a try

.codeclimate.yml

@@ -1,9 +1,12 @@
-engines: 
+engines:
   eslint:
     enabled: true
-    channel: "eslint-3"
+    channel: "eslint-6"
     config:
-      config: ".eslintrc.json"
+      config: ".eslintrc.yaml"
+    checks:
+      complexity:
+        enabled: false
 
 ratings:
    paths:

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

@@ -0,0 +1,37 @@
+name: CI Tests - Windows
+
+on: [ push, pull_request ]
+
+# no docker/images support on Windows (currently), so run w/o Redis
+# also, stack run commands so test doesn't begin before install completes
+
+jobs:
+
+  ci-test-win:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ windows-latest ]
+        node-version: [10.x, 12.x, 13.x]
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout haraka-plugin-access
+      with:
+        fetch-depth: 1
+
+    - uses: actions/setup-node@v1
+      name: Use Node.js ${{ matrix.node-version }}
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: npm install and test
+      run: |
+        npm install
+        npm run test
+
+      env:
+        CI: true

.github/workflows/ci-test.yml

@@ -0,0 +1,35 @@
+name: CI Tests
+
+on: [ push, pull_request ]
+
+jobs:
+
+  ci-test:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        node-version: [10.x, 12.x]
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout haraka-plugin-access
+      with:
+        fetch-depth: 1
+
+    - uses: actions/setup-node@v1
+      name: Use Node.js ${{ matrix.node-version }}
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: npm install
+      run: npm install
+
+    - name: Run test suite
+      run: npm run test
+
+      env:
+        CI: true

.github/workflows/coveralls.yml

@@ -0,0 +1,32 @@
+on: [ pull_request ]
+
+name: Test Coverage
+
+jobs:
+
+  coverage:
+    name: Codecov
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@master
+      name: Checkout haraka-plugin-access
+      with:
+        fetch-depth: 1
+
+    - name: Use Node.js 10
+      uses: actions/setup-node@master
+      with:
+        node-version: 10.x
+
+    - name: install, run
+      run: |
+        npm install
+        npm install --no-save nyc codecov
+        npm run cover
+
+    - name: Coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}

.github/workflows/lint.yml

@@ -0,0 +1,33 @@
+name: Lint
+
+on: [ push, pull_request ]
+
+jobs:
+
+  lint:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [ 12.x ]
+
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout haraka-plugin-access
+      with:
+        fetch-depth: 1
+
+    - uses: actions/setup-node@v1
+      name: Use Node.js ${{ matrix.node-version }}
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: npm install
+      run: npm install
+
+    - name: Lint using eslint
+      run: npm run lint
+
+      env:
+        CI: true

Changes.md

@@ -1,4 +1,8 @@
 
+# 1.1.4 - 2020-04-09
+
+- wrap from parsing in a try #20
+
 # 1.1.3 - 2018-11-16
 
 - check if OD was found before attemping to use it

README.md

@@ -1,9 +1,9 @@
 [![Build Status][ci-img]][ci-url]
 [![Code Climate][clim-img]][clim-url]
-[![Greenkeeper badge][gk-img]][gk-url]
-[![NPM][npm-img]][npm-url]
 [![Windows Build Status][ci-win-img]][ci-win-url]
 
+[![NPM][npm-img]][npm-url]
+
 # haraka-plugin-access - ACLs
 
 This plugin applies Access Control Lists during the connect, helo, mail, and
@@ -222,7 +222,5 @@ OD is *bbc.co.uk*.
 [ci-win-url]: https://ci.appveyor.com/project/msimerson/haraka-plugin-access
 [clim-img]: https://codeclimate.com/github/haraka/haraka-plugin-access/badges/gpa.svg
 [clim-url]: https://codeclimate.com/github/haraka/haraka-plugin-access
-[gk-img]: https://badges.greenkeeper.io/haraka/haraka-plugin-access.svg
-[gk-url]: https://greenkeeper.io/
 [npm-img]: https://nodei.co/npm/haraka-plugin-access.png
 [npm-url]: https://www.npmjs.com/package/haraka-plugin-access

index.js

@@ -386,7 +386,15 @@ exports.data_any = function (next, connection) {
         return next();
     }
 
-    const hdr_addr = haddr.parse(hdr_from)[0];
+    let hdr_addr;
+    try {
+        hdr_addr = haddr.parse(hdr_from)[0];
+    }
+    catch (e) {
+        connection.transaction.results.add(plugin, {fail: `data(unparsable_from:${hdr_from})`});
+        return next();
+    }
+
     if (!hdr_addr) {
         connection.transaction.results.add(plugin, {fail: `data(unparsable_from:${hdr_from})`});
         return next();
@@ -439,11 +447,9 @@ exports.in_re_list = function (type, phase, address) {
 
 exports.in_file = function (file_name, address, connection) {
     const plugin = this;
-    // using indexOf on an array here is about 20x slower than testing against
-    // a key in an object
+    // using indexOf on an array here is about 20x slower than testing against a key in an object
     connection.logdebug(plugin, `checking ${address} against ${file_name}`);
-    return (plugin.config.get(file_name, 'list')
-        .indexOf(address) === -1) ? false : true;
+    return (plugin.config.get(file_name, 'list').indexOf(address) === -1) ? false : true;
 }
 
 exports.in_re_file = function (file_name, address) {
@@ -462,7 +468,7 @@ exports.in_re_file = function (file_name, address) {
 exports.load_file = function (type, phase) {
     const plugin = this;
     if (!plugin.cfg.check[phase]) {
-        plugin.loginfo(plugin, `skipping ${plugin.cfg[type][phase]}`);
+        plugin.logdebug(plugin, `skipping ${plugin.cfg[type][phase]}`);
         return;
     }
 
@@ -489,7 +495,7 @@ exports.load_file = function (type, phase) {
 exports.load_re_file = function (type, phase) {
     const plugin = this;
     if (!plugin.cfg.check[phase]) {
-        plugin.loginfo(plugin, `skipping ${plugin.cfg.re[type][phase]}`);
+        plugin.logdebug(plugin, `skipping ${plugin.cfg.re[type][phase]}`);
         return;
     }
 
@@ -514,7 +520,7 @@ exports.load_re_file = function (type, phase) {
 exports.load_domain_file = function (type, phase) {
     const plugin = this;
     if (!plugin.cfg.check[phase]) {
-        plugin.loginfo(plugin, `skipping ${plugin.cfg[type][phase]}`);
+        plugin.logdebug(plugin, `skipping ${plugin.cfg[type][phase]}`);
         return;
     }
 

package.json

@@ -1,12 +1,13 @@
 {
   "name": "haraka-plugin-access",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Haraka plugin for ACLs for email connections",
   "main": "index.js",
   "scripts": {
-    "lint": "./node_modules/.bin/eslint *.js test/**/*.js",
-    "lintfix": "./node_modules/.bin/eslint --fix *.js test/**/*.js",
-    "test": "./node_modules/.bin/nodeunit"
+    "lint": "npx eslint *.js test/*.js",
+    "lintfix": "npx eslint --fix *.js test/*.js",
+    "test": "npx mocha",
+    "cover": "NODE_ENV=cov npx nyc --reporter=lcovonly -x tests npm run test"
   },
   "repository": {
     "type": "git",
@@ -24,11 +25,10 @@
   },
   "homepage": "https://github.com/haraka/haraka-plugin-access#readme",
   "devDependencies": {
-    "eslint": ">=4",
+    "eslint": ">=6",
     "eslint-plugin-haraka": "*",
     "haraka-test-fixtures": "*",
-    "mocha": "*",
-    "nodeunit": "*"
+    "mocha": "*"
   },
   "dependencies": {
     "address-rfc2822": "*",