haraka-plugin-karma 2.0.2 → 2.0.3

package/.release/base.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+branch_is_master()
+{
+    if [ "$(git branch --show-current)" = "master" ]; then
+        return 0
+    fi
+
+    return 1
+}
+
+repo_is_clean()
+{
+    if [ -z "$(git status --porcelain)" ]; then
+        return 0
+    fi
+
+    return 1
+}
+
+assure_repo_is_clean()
+{
+    if repo_is_clean; then return 0; fi
+
+    echo
+    echo "ERROR: Uncommitted changes, cowardly refusing to continue..."
+    echo
+    sleep 2
+
+    git status
+
+    return 1
+}
+
+find_changelog()
+{
+    CHANGELOG=$(ls [Cc][Hh][Aa]*.md)
+    export CHANGELOG
+    #echo "I found your CHANGELOG at: $CHANGELOG"
+}

package/.release/do.sh

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+usage() {
+    echo "do.sh {major | minor | patch}"
+    exit
+}
+
+. .release/base.sh || exit
+
+case "$1" in
+    "major" )
+    ;;
+    "minor" )
+    ;;
+    "patch" )
+    ;;
+    *)
+    usage
+    ;;
+esac
+
+NEW_VERSION=$(npm --no-git-tag-version version "$1")
+
+YMD=$(date "+%Y-%m-%d")
+# echo "Preparing $NEW_VERSION - $YMD"
+
+if branch_is_master; then
+    git checkout -b "release-${NEW_VERSION}"
+fi
+
+update_changes() {
+    tee .release/new.txt <<EO_CHANGE
+
+
+#### ${NEW_VERSION//v} - $YMD
+
+-
+-
+EO_CHANGE
+
+    sed -i '' -e "/#### N.N.N.*$/r .release/new.txt" "$CHANGELOG"
+    rm .release/new.txt
+
+    if command -v open; then open "$CHANGELOG"; fi
+
+    echo
+    echo "AFTER editing $CHANGELOG, run: .release/push.sh"
+}
+
+find_changelog
+update_changes

package/.release/push.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. .release/base.sh || exit
+
+if branch_is_master; then
+    echo "ERROR: run the release scripts in a feature branch! (not master)"
+    exit
+fi
+
+VERSION=$(node -e 'console.log(require("./package.json").version)')
+
+find_changelog
+
+git add package.json
+git add "$CHANGELOG"
+
+git commit -m "Release v$VERSION"
+
+git push --set-upstream origin "$(git branch --show-current)"
+
+if command -v gh; then
+    gh pr create
+fi

package/Changes.md

@@ -1,91 +1,94 @@
 
-### 2.0.2 - 2022-05-27
+#### N.N.N - YYYY-MM-DD
+
+
+#### 2.0.3 - 2022-05-28
 
 - fix: depend directly on redis
 - fix: update redis command names for v4 compatibility
 - fix: update redis commands to be async
 
 
-### 2.0.1 - 2022-05-27
+#### 2.0.1 - 2022-05-27
 
 - chore(ci): depend on shared GHA workflows
 
 
-### 2.0.0 - 2022-03-29
+#### 2.0.0 - 2022-03-29
 
 - remove lots of plugin=this
 - remove unnecessary braces and trailing ;
 - some promises.
 
 
-### 1.0.14 - 2022-02-14
+#### 1.0.14 - 2022-02-14
 
 - try to unsubscribe in case connection is marked to skip during transaction
 
 
-### 1.0.13 - 2019-04-23
+#### 1.0.13 - 2019-04-23
 
 - add 'exists' pattern
 
 
-### 1.0.12 - 2019-03-08
+#### 1.0.12 - 2019-03-08
 
 - don't interfere with STARTLS and AUTH when karma is listed above those plugins in config/plugins
 
 
-### 1.0.11 - 2017-10-25
+#### 1.0.11 - 2017-10-25
 
 - private addresses and flagged connections exemption
 
 
-### 1.0.10 - 2017-08-30
+#### 1.0.10 - 2017-08-30
 
 - add TLS awards #19
 
 
-### 1.0.9 - 2017-07-29
+#### 1.0.9 - 2017-07-29
 
 - splash on some es6
 - add AppVeyor CI testing
 
 
-### 1.0.8 - 2017-06-26
+#### 1.0.8 - 2017-06-26
 
 - revert #9, it breaks current Haraka deployments
 
 
-### 1.0.7 - 2017-06-16
+#### 1.0.7 - 2017-06-16
 
 - update for eslint 4 compat
 - Add results_redis_publish=true for haraka-results changes #9
 
 
-### 1.0.6 - 2017-05-04
+#### 1.0.6 - 2017-05-04
 
 - emit error if redis plugin didn't create connection
 
 
-### 1.0.5 - 2017-02-06
+#### 1.0.5 - 2017-02-06
 
 - move merge_redis_ini into load_karma_ini, so it also gets applied
   after a karma.ini change
 - skip redis operations when no connection exists
 
 
-### 1.0.4 - 2017-01-29
+#### 1.0.4 - 2017-01-29
 
 - use the new haraka-plugin-redis
 - remove exceptions for soft denials. This makes denial time simpler.
 - rules updates
 
 
-### 1.0.3 - 2017-01-27
+#### 1.0.3 - 2017-01-27
 
 - add rule #280 for known-senders
 - add support for 'length' type, with eq, gt, and lt operators
 - use shared haraka-eslint
 
 
-### 1.0.2 - 2017-01-24
+#### 1.0.2 - 2017-01-24
 
 - use redis.merge_redis_ini()

package/index.js

@@ -562,10 +562,8 @@ exports.ip_history_from_redis = function (next, connection) {
       .hIncrBy(dbkey, 'connections', 1)  // increment total conn
       .expire(dbkey, expire)             // extend expiration
       .exec()
-      .then(replies => {
-        console.log(replies)
-      }).catch(err2 => {
-        connection.results.add(plugin, {err: err2})
+      .catch(err => {
+        connection.results.add(plugin, { err })
       })
 
     const results = {
@@ -587,7 +585,7 @@ exports.ip_history_from_redis = function (next, connection) {
     connection.results.add(plugin, results)
 
     plugin.check_awards(connection)
-    return next()
+    next()
   })
     .catch(err => {
       connection.results.add(plugin, { err })
@@ -982,9 +980,9 @@ exports.check_asn = function (connection, asnkey) {
     })
 }
 
-exports.init_ip = function (dbkey, rip, expire) {
+exports.init_ip = async function (dbkey, rip, expire) {
   if (!this.db) return
-  this.db.multi()
+  await this.db.multi()
     .hmSet(dbkey, {'bad': 0, 'good': 0, 'connections': 1})
     .expire(dbkey, expire)
     .exec()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-karma",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A heuristics scoring and reputation engine for SMTP connections",
   "main": "index.js",
   "scripts": {