[pmg-devel] [PATCH pmg-api 1/2] clamav: remove deprecated SafeBrowsing
Oguz Bektas
o.bektas at proxmox.com
Mon Apr 26 16:21:24 CEST 2021
see
https://blog.clamav.net/2021/04/are-you-still-attempting-to-download.html
* remove from freshclam.conf.in template
* remove from description
* default to 0 just to be sure
* if 'safebrowsing' set in pmg.conf, this is now ignored
note about removing the option in PMG 7.0
Signed-off-by: Oguz Bektas <o.bektas at proxmox.com>
---
src/PMG/Config.pm | 9 +++++----
src/PMG/Utils.pm | 3 ---
src/templates/freshclam.conf.in | 3 +--
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm
index 155990b..719b451 100755
--- a/src/PMG/Config.pm
+++ b/src/PMG/Config.pm
@@ -186,7 +186,7 @@ sub properties {
type => 'string',
},
clamav_heuristic_score => {
- description => "Score for ClamAV heuristics (Encrypted Archives/Documents, Google Safe Browsing database, PhishingScanURLs, ...).",
+ description => "Score for ClamAV heuristics (Encrypted Archives/Documents, PhishingScanURLs, ...).",
type => 'integer',
minimum => 0,
maximum => 1000,
@@ -388,10 +388,11 @@ sub properties {
minimum => 0,
default => 0,
},
+ # FIXME: remove for PMG 7.0 - https://blog.clamav.net/2021/04/are-you-still-attempting-to-download.html
safebrowsing => {
- description => "Enables support for Google Safe Browsing.",
+ description => "Enables support for Google Safe Browsing. (deprecated option, will be ignored)",
type => 'boolean',
- default => 1
+ default => 0
},
scriptedupdates => {
description => "Enables ScriptedUpdates (incremental download of signatures)",
@@ -410,7 +411,7 @@ sub options {
maxscansize => { optional => 1 },
dbmirror => { optional => 1 },
maxcccount => { optional => 1 },
- safebrowsing => { optional => 1 },
+ safebrowsing => { optional => 1 }, # FIXME: remove for PMG 7.0
scriptedupdates => { optional => 1},
};
}
diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index 51d6c70..43a866d 100644
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -861,9 +861,6 @@ sub clamav_dbstat {
$filename = "/var/lib/clamav/bytecode.cvd";
$read_cvd_info->('bytecode', $filename) if -f $filename;
- $filename = "/var/lib/clamav/safebrowsing.cvd";
- $read_cvd_info->('safebrowsing', $filename) if -f $filename;
-
my $ss_dbs_fn = "/var/lib/clamav-unofficial-sigs/configs/ss-include-dbs.txt";
my $ss_dbs_files = {};
if (my $ssfh = IO::File->new("<${ss_dbs_fn}")) {
diff --git a/src/templates/freshclam.conf.in b/src/templates/freshclam.conf.in
index b915511..03a19d4 100644
--- a/src/templates/freshclam.conf.in
+++ b/src/templates/freshclam.conf.in
@@ -6,7 +6,7 @@ LogFileMaxSize 0
Foreground false
Debug false
MaxAttempts 5
-Checks [% IF pmg.clamav.safebrowsing %]48[% ELSE %]24[% END %]
+Checks 24
DatabaseDirectory /var/lib/clamav/
PidFile /var/run/clamav/freshclam.pid
DatabaseMirror [% pmg.clamav.dbmirror %]
@@ -15,7 +15,6 @@ ScriptedUpdates [% IF pmg.clamav.scriptedupdates %]true[% ELSE %]false[% END %]
CompressLocalDatabase no
NotifyClamd /etc/clamav/clamd.conf
Bytecode true
-SafeBrowsing [% IF pmg.clamav.safebrowsing %]true[% ELSE %]false[% END %]
DNSDatabaseInfo current.cvd.clamav.net
[% IF proxy.host %]
HTTPProxyServer [% proxy.host %]
--
2.20.1
More information about the pmg-devel
mailing list