Make milter header handling compatible with rspamd 3.3 (#30)

haraka · Oct 10, 2022 · 946a799 · 946a799
1 parent b6c57fc
commit 946a799
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,7 @@
 ### Unreleased
 
+- Update milter headers handling to be compatible with rspamd 3.3 preserving compatibility with older versions
+
 
 ### [1.1.8] - 2022-06-06
 

diff --git a/index.js b/index.js
@@ -185,15 +185,26 @@ exports.do_milter_headers = function (connection, data) {
   }
 
   if (data.milter.add_headers) {
+    connection.logdebug("milter.add_headers: " + JSON.stringify(data.milter.add_headers), plugin);
     Object.keys(data.milter.add_headers).forEach((key) => {
-      const header_value = data.milter.add_headers[key];
-      if (!header_value) return;
-
-      if (typeof header_value === 'object') {
-        connection.transaction.add_header(key, header_value.value);
+      const header_values = data.milter.add_headers[key];
+      if (!header_values) return;
+
+      if (Object.prototype.toString.call(header_values) == '[object Array]') {
+        header_values.forEach(function (header_value, header_index) {
+          if (typeof header_value === 'object') {
+            connection.transaction.add_header(key, header_value.value);
+          }
+          else {
+            connection.transaction.add_header(key, header_value);
+          }
+        });
+      }
+      else if (typeof header_values === 'object') {
+        connection.transaction.add_header(key, header_values.value);
       }
       else {
-        connection.transaction.add_header(key, header_value);
+        connection.transaction.add_header(key, header_values);
       }
     })
   }