mirror of
https://github.com/MailScanner/v5.git
synced 2025-02-23 23:15:16 +08:00
none
here
This commit is contained in:
parent
1a241e5eb3
commit
d3c65b80d5
2 changed files with 0 additions and 69 deletions
|
@ -193,17 +193,6 @@ my %Scanners = (
|
|||
SupportScanning => $S_SUPPORTED,
|
||||
SupportDisinfect => $S_SUPPORTED,
|
||||
},
|
||||
"avastd" => {
|
||||
Name => 'AvastDaemon',
|
||||
Lock => 'avastdBusy.lock',
|
||||
CommonOptions => '-b -f -s ',
|
||||
DisinfectOptions => '',
|
||||
ScanOptions => '',
|
||||
InitParser => \&InitAvastdParser,
|
||||
ProcessOutput => \&ProcessAvastdOutput,
|
||||
SupportScanning => $S_SUPPORTED,
|
||||
SupportDisinfect => $S_SUPPORTED,
|
||||
},
|
||||
);
|
||||
|
||||
# Initialise the Sophos SAVI library if we are using it.
|
||||
|
@ -1145,11 +1134,6 @@ sub InitAvastParser {
|
|||
;
|
||||
}
|
||||
|
||||
# Initialise any state variables the Avastd output parser uses
|
||||
sub InitAvastdParser {
|
||||
;
|
||||
}
|
||||
|
||||
# These functions must be called with, in order:
|
||||
# * The line of output from the scanner
|
||||
# * The MessageBatch object the reports are written to
|
||||
|
@ -1788,48 +1772,6 @@ sub ProcessAvastOutput {
|
|||
return 1;
|
||||
}
|
||||
|
||||
sub ProcessAvastdOutput {
|
||||
my($line, $infections, $types, $BaseDir, $Name) = @_;
|
||||
|
||||
|
||||
chomp $line;
|
||||
#MailScanner::Log::InfoLog("Avastd said \"$line\"");
|
||||
|
||||
# Extract the infection report. Return 0 if it's not there or is OK.
|
||||
return 0 unless $line =~ /\t\[([^[]+)\](\t(.*))?$/;
|
||||
my $result = $1;
|
||||
my $infection = $3;
|
||||
return 0 if $result eq '+';
|
||||
my $logout = $line;
|
||||
MailScanner::Log::WarnLog("Avastd scanner found new response type \"%s\", report this to mailscanner\@ecs.soton.ac.uk immediately!", $result) if $result ne 'L';
|
||||
|
||||
# Avast prints the whole path as opposed to
|
||||
# ./messages/part so make it the same
|
||||
$line =~ s/^$BaseDir//;
|
||||
|
||||
#my $logout = $line;
|
||||
#$logout =~ s/%/%%/g;
|
||||
#$logout =~ s/\s{20,}/ /g;
|
||||
#$logout =~ s/^\///;
|
||||
#MailScanner::Log::InfoLog("%s found %s", $Name, $logout);
|
||||
|
||||
# note: '$dot' does not become '.'
|
||||
# This removes the "Archived" bit off the front if present, too :)
|
||||
$line =~ s/\t\[[^[]+\]\t.*$//; # Trim the virus report off the end
|
||||
my ($dot, $id, $part, @rest) = split(/\//, $line);
|
||||
#print STDERR "Dot, id, part = \"$dot\", \"$id\", \"$part\"\n";
|
||||
my $notype = substr($part,1);
|
||||
$logout =~ s/\Q$part\E/$notype/;
|
||||
$infection =~ s/\Q$part\E/$notype/;
|
||||
|
||||
MailScanner::Log::InfoLog("%s", $logout);
|
||||
$infection = $Name . ': ' . $infection if $Name;
|
||||
$infections->{"$id"}{"$part"} .= $infection . "\n";
|
||||
$types->{"$id"}{"$part"} .= "v";
|
||||
#print STDERR "Infection = $infection\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
# Generate a list of all the virus scanners that are installed. It may
|
||||
# include extras that are not installed in the case where there are
|
||||
# scanners whose name includes a version number and we could not tell
|
||||
|
|
|
@ -345,16 +345,6 @@ Archive Mail = /var/spool/MailScanner/archive',
|
|||
This can also be the filename of a ruleset.',
|
||||
'value' => ' %org-name%-Attachment-Warning.txt',
|
||||
),
|
||||
'avastdsocket' =>
|
||||
array (
|
||||
'external' => 'avastdsocket',
|
||||
'type' => 'other',
|
||||
'ruleset' => 'all',
|
||||
'default' => '/var/run/avast/scan.sock',
|
||||
'name' => 'Avastd Socket',
|
||||
'desc' => '',
|
||||
'value' => ' /var/run/avast/scan.sock',
|
||||
),
|
||||
'clamavmaxratio' =>
|
||||
array (
|
||||
'external' => 'clamavmodulemaximumcompressionratio',
|
||||
|
@ -3446,7 +3436,6 @@ TNEF Expander = internal',
|
|||
vexira from www.centralcommand.com
|
||||
symscanengine from www.symantec.com (Symantec Scan Engine, not CSS)
|
||||
avast from www.avast.com
|
||||
avastd avast daemon
|
||||
esets from www.eset.com
|
||||
vba32 from www.anti-virus.by/en/
|
||||
generic One you wrote: edit the generic-wrapper and generic-autoupdate
|
||||
|
|
Loading…
Reference in a new issue