Support connecting to rspamd via unix socket (#21)

* Support connecting to rspamd via unix socket
haraka · Mar 9, 2020 · 66e8d01 · 66e8d01
1 parent 57fa57f
commit 66e8d01
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,6 @@
+## 1.1.6 - 2020-02-29
+
+- Allow connecting to rspamd via unix sockets
 
 ## 1.1.5 - 2019-04-01
 

diff --git a/README.md b/README.md
@@ -24,6 +24,10 @@ rspamd.ini
 
     Port Rspamd is listening on.
 
+- unix_socket
+
+    Path to a unix socket to connect to.  If set, overrides host and port.
+
 - add\_headers
 
     Default: sometimes

diff --git a/config/rspamd.ini b/config/rspamd.ini
@@ -1,5 +1,6 @@
 ;host = localhost
 ;port = 11333
+;unix_socket = /path/to/your/rspamd-client.sock
 ;add_headers = sometimes
 
 [dkim]

diff --git a/index.js b/index.js
@@ -67,12 +67,18 @@ exports.get_options = function (connection) {
     // https://github.com/vstakhov/rspamd/blob/master/rules/http_headers.lua
     const options = {
         headers: {},
-        port: plugin.cfg.main.port,
-        host: plugin.cfg.main.host,
         path: '/checkv2',
         method: 'POST',
     };
 
+    if (plugin.cfg.main.unix_socket) {
+        options.socketPath = plugin.cfg.main.unix_socket;
+    }
+    else {
+        options.port = plugin.cfg.main.port;
+        options.host = plugin.cfg.main.host;
+    }
+
     if (connection.notes.auth_user) {
         options.headers.User = connection.notes.auth_user;
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-rspamd",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Haraka plugin for rspamd",
   "main": "index.js",
   "scripts": {