From 612f20c104b4169f62bc304a505b5c83090df595 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 13 Feb 2019 08:31:21 +0100 Subject: [PATCH] security/clamav: add third party signatures (#1184) --- security/clamav/Makefile | 3 +- security/clamav/pkg-descr | 34 +++++++++++++++++++ .../OPNsense/ClamAV/forms/general.xml | 24 +++++++++++++ .../app/models/OPNsense/ClamAV/General.xml | 18 +++++++++- .../templates/OPNsense/ClamAV/freshclam.conf | 20 ++++++++++- 5 files changed, 95 insertions(+), 4 deletions(-) diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 08f34fcf4..7703a0169 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= clamav -PLUGIN_VERSION= 1.5 -PLUGIN_REVISION= 1 +PLUGIN_VERSION= 1.6 PLUGIN_COMMENT= Antivirus engine for detecting malicious threats PLUGIN_DEPENDS= clamav PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/security/clamav/pkg-descr b/security/clamav/pkg-descr index 4fe5a529d..795490977 100644 --- a/security/clamav/pkg-descr +++ b/security/clamav/pkg-descr @@ -5,4 +5,38 @@ including a flexible and scalable multi-threaded daemon, a command line scanner and an advanced tool for automatic database updates. + +Plugin Changelog +================ + +1.6 + +* Add optional signature sources + +1.5 + +* Fix symlink permission +* Fixed some bugs in log viewer + +1.4 + +* Add MutableController code + +1.3 + +* Add Log viewer + +1.2 + +* New tab to show current ClamAV version + +1.1 + +* Make signatures persistent in MFS installations + +1.0 + +* Clamd and Freshclam services, allowing most known options to be configured + + WWW: https://www.clamav.net/ diff --git a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml index bf9cebddf..ddef7eb11 100644 --- a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml +++ b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml @@ -177,4 +177,28 @@ text Timeout in seconds when connecting to database server. + + general.fc_malwareexpert + + checkbox + Activate third party signatures from Malware Expert. Use at your own risk. + + + general.fc_blurl + + checkbox + Activate third party signatures from BLURL. Use at your own risk. + + + general.fc_jurlbla + + checkbox + Activate third party signatures from Sanesecurtiy JURLBLA. Use at your own risk. + + + general.fc_bofhland + + checkbox + Activate third party signatures from Sanesecurtiy BOFHLand. Use at your own risk. + diff --git a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml index d4e402e9f..c3594eb8e 100644 --- a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml +++ b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml @@ -123,5 +123,21 @@ 60 Y - + + 0 + N + + + 0 + N + + + 0 + N + + + 0 + N + + diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf index 3765f24a8..56ef2c3b4 100644 --- a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf +++ b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf @@ -13,10 +13,28 @@ PidFile /var/run/clamav/freshclam.pid DatabaseOwner clamav AllowSupplementaryGroups yes +{% if helpers.exists('OPNsense.clamav.general.fc_malwareexpert') and OPNsense.clamav.general.fc_malwareexpert == '1' %} +DatabaseCustomURL http://cdn.malware.expert/malware.expert.ndb +DatabaseCustomURL http://cdn.malware.expert/malware.expert.hdb +DatabaseCustomURL http://cdn.malware.expert/malware.expert.ldb +DatabaseCustomURL http://cdn.malware.expert/malware.expert.fp +{% endif %} +{% if helpers.exists('OPNsense.clamav.general.fc_blurl') and OPNsense.clamav.general.fc_blurl == '1' %} +DatabaseCustomURL http://ftp.swin.edu.au/sanesecurity/blurl.ndb +{% endif %} +{% if helpers.exists('OPNsense.clamav.general.fc_jurlbla') and OPNsense.clamav.general.fc_jurlbla == '1' %} +DatabaseCustomURL http://ftp.swin.edu.au/sanesecurity/jurlbla.ndb +{% endif %} +{% if helpers.exists('OPNsense.clamav.general.fc_bofhland') and OPNsense.clamav.general.fc_bofhland == '1' %} +DatabaseCustomURL http://ftp.swin.edu.au/sanesecurity/bofhland_phishing_URL.ndb +DatabaseCustomURL http://ftp.swin.edu.au/sanesecurity/bofhland_malware_attach.hdb +DatabaseCustomURL http://ftp.swin.edu.au/sanesecurity/bofhland_malware_URL.ndb +DatabaseCustomURL http://ftp.swin.edu.au/sanesecurity/bofhland_cracked_URL.ndb +{% endif %} +NotifyClamd /usr/local/etc/clamd.conf {% if helpers.exists('OPNsense.clamav.general.fc_databasemirror') and OPNsense.clamav.general.fc_databasemirror != '' %} DatabaseMirror {{ OPNsense.clamav.general.fc_databasemirror }} {% endif %} -NotifyClamd /usr/local/etc/clamd.conf {% if helpers.exists('OPNsense.clamav.general.fc_timeout') and OPNsense.clamav.general.fc_timeout != '' %} ConnectTimeout {{ OPNsense.clamav.general.fc_timeout }} {% endif %}