From 8181542c662369b44fb9b2f2d964e5c156f35b45 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sat, 10 Apr 2021 10:15:19 +0200
Subject: [PATCH] security/maltrail: add syslog support (#2222)

---
 security/maltrail/Makefile                           |  3 +--
 security/maltrail/pkg-descr                          |  4 ++++
 .../controllers/OPNsense/Maltrail/forms/sensor.xml   | 12 ++++++++++++
 .../mvc/app/models/OPNsense/Maltrail/Sensor.xml      |  9 ++++++++-
 .../templates/OPNsense/Maltrail/maltrail.conf        |  6 ++++++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/security/maltrail/Makefile b/security/maltrail/Makefile
index 9371d8512..b12529d08 100644
--- a/security/maltrail/Makefile
+++ b/security/maltrail/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		maltrail
-PLUGIN_VERSION=		1.6
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.7
 PLUGIN_COMMENT=		Malicious traffic detection system
 PLUGIN_DEPENDS=		maltrail
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/security/maltrail/pkg-descr b/security/maltrail/pkg-descr
index 8e22fe521..7df4a3757 100644
--- a/security/maltrail/pkg-descr
+++ b/security/maltrail/pkg-descr
@@ -11,6 +11,10 @@ WWW: https://github.com/stamparm/maltrail
 Changelog
 ---------
 
+1.7
+
+* Add syslog export
+
 1.6
 
 * Allow to set capture buffer size
diff --git a/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/sensor.xml b/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/sensor.xml
index df6f7639a..754a3b392 100644
--- a/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/sensor.xml
+++ b/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/sensor.xml
@@ -29,4 +29,16 @@
         <type>text</type>
         <help>Port of the logging server. Leave empty when sensor and server run on the same system.</help>
     </field>
+    <field>
+        <id>sensor.syslogserver</id>
+        <label>Syslog Server</label>
+        <type>text</type>
+        <help>IP address of the remote syslog server.</help>
+    </field>
+    <field>
+        <id>sensor.syslogport</id>
+        <label>Syslog Port</label>
+        <type>text</type>
+        <help>Port of the syslog server.</help>
+    </field>
 </form>
diff --git a/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/Sensor.xml b/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/Sensor.xml
index c1b87fcfe..4a97c5757 100644
--- a/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/Sensor.xml
+++ b/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/Sensor.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/maltrail/sensor</mount>
     <description>Maltrail sensor configuration</description>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -24,5 +24,12 @@
             <default>8337</default>
             <Required>Y</Required>
         </remoteport>
+        <syslogserver type="HostnameField">
+            <Required>N</Required>
+        </syslogserver>
+        <syslogport type="PortField">
+            <default>514</default>
+            <Required>Y</Required>
+        </syslogport>
     </items>
 </model>
diff --git a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
index dde70dec8..85943100f 100644
--- a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
+++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
@@ -26,6 +26,12 @@ DISABLE_LOCAL_LOG_STORAGE false
 {%   endif %}
 {% endif %}
 
+{% if helpers.exists('OPNsense.maltrail.sensor.enabled') and OPNsense.maltrail.sensor.enabled == '1' %}
+{%   if helpers.exists('OPNsense.maltrail.sensor.syslogserver') and OPNsense.maltrail.sensor.syslogserver != '' %}
+SYSLOG_SERVER {{ OPNsense.maltrail.sensor.syslogserver }}:{{ OPNsense.maltrail.sensor.syslogport }}
+{%   endif %}
+{% endif %}
+
 SENSOR_NAME $HOSTNAME
 CUSTOM_TRAILS_DIR /usr/local/maltrail/trails/custom/
 PROCESS_COUNT $CPU_CORES