Item14149: Treat any scan errors as fatal

If mandatory scanning is requested, errors should be fatal.
foswiki · Aug 30, 2016 · 2532dc8 · 2532dc8
1 parent 251c472
commit 2532dc8
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/Foswiki/Plugins/ClamAVScanPlugin.pm b/lib/Foswiki/Plugins/ClamAVScanPlugin.pm
@@ -222,7 +222,9 @@ sub beforeUploadHandler {
             params => [ $attrs->{attachment}, $virus ]
         );
     }
-    elsif ( $ok eq 'ERROR' ) {
+    elsif ($ok eq 'ERROR'
+        && $Foswiki::cfg{Plugins}{ClamAVScanPlugin}{mandatoryScan} )
+    {
         Foswiki::Func::writeWarning( "ERROR detected in scan: $virus"
               . $web . '.'
               . $topic
@@ -265,6 +267,13 @@ sub beforeSaveHandler {
             "$virus detected in $web.$topic text during save - Save blocked.");
         throw Foswiki::OopsException( 'clamavsave', params => [$virus] );
     }
+    elsif ($ok eq 'ERROR'
+        && $Foswiki::cfg{Plugins}{ClamAVScanPlugin}{mandatoryScan} )
+    {
+        Foswiki::Func::writeWarning(
+            "ERROR detected in scan: $virus" . "Save blocked." );
+        throw Foswiki::OopsException( 'clamavsave', params => [$virus] );
+    }
 
     return 1;
 }