haraka-plugin-karma 2.0.4 → 2.1.1

package/Changes.md

@@ -2,6 +2,18 @@
 #### N.N.N - YYYY-MM-DD
 
 
+### [2.1.1] - 2023-08-22
+
+- fix: check_result unexpected return #50
+
+
+### [2.1.0] - 2022-11-29
+
+- fix: in disconnect, call redis_unsub after skip check
+- dep(redis): 4 -> 4.1
+- dep(pi-redis): 2 -> 2.0.5
+
+
 #### 2.0.4 - 2022-05-28
 
 - use .release as submodule
@@ -97,3 +109,5 @@
 #### 1.0.2 - 2017-01-24
 
 - use redis.merge_redis_ini()
+[2.1.0]: https://github.com/haraka/haraka-plugin-karma/releases/tag/2.1.0
+[2.1.1]: https://github.com/haraka/haraka-plugin-karma/releases/tag/2.1.1

package/index.js

@@ -155,18 +155,18 @@ exports.check_result = function (connection, message) {
   if (!this.result_awards[m.plugin]) return  // no awards for plugin
 
   for (const r of Object.keys(m.result)) {  // each result in mess
-    if (r === 'emit') return  // r: pass, fail, skip, err, ...
+    if (r === 'emit') continue  // r: pass, fail, skip, err, ...
 
     const pi_prop = this.result_awards[m.plugin][r]
-    if (!pi_prop) return      // no award for this plugin property
+    if (!pi_prop) continue      // no award for this plugin property
 
     const thisResult = m.result[r]
     // ignore empty arrays, objects, and strings
-    if (Array.isArray(thisResult) && thisResult.length === 0) return
+    if (Array.isArray(thisResult) && thisResult.length === 0) continue
     if (typeof thisResult === 'object' && !Object.keys(thisResult).length) {
-      return
+      continue
     }
-    if (typeof thisResult === 'string' && !thisResult) return // empty
+    if (typeof thisResult === 'string' && !thisResult) continue // empty
 
     // do any award conditions match this result?
     for (let i=0; i < pi_prop.length; i++) {     // each award...
@@ -684,10 +684,10 @@ exports.increment = function (connection, key, val) {
 exports.hook_disconnect = function (next, connection) {
   const plugin = this
 
-  plugin.redis_unsubscribe(connection)
-
   if (plugin.should_we_skip(connection)) return next()
 
+  plugin.redis_unsubscribe(connection)
+
   const k = connection.results.get('karma')
   if (!k || k.score === undefined) {
     connection.results.add(plugin, {err: 'karma results missing'})
@@ -708,7 +708,7 @@ exports.hook_disconnect = function (next, connection) {
   }
 
   connection.results.add(plugin, {emit: true })
-  return next()
+  next()
 }
 
 exports.get_award_loc_from_note = function (connection, award) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-karma",
-  "version": "2.0.4",
+  "version": "2.1.1",
   "description": "A heuristics scoring and reputation engine for SMTP connections",
   "main": "index.js",
   "scripts": {
@@ -26,8 +26,8 @@
     "address-rfc2821": "*",
     "haraka-constants": ">=1.0.2",
     "haraka-utils": "*",
-    "haraka-plugin-redis": "2",
-    "redis": "4"
+    "haraka-plugin-redis": "2.0.5",
+    "redis": "4.6.7"
   },
   "devDependencies": {
     "eslint": "8",