Merge remote-tracking branch 'origin/master' into jenkins-build-5

templates/scan.sh.erb

@@ -1,23 +1,26 @@
 #!/bin/bash
+set -euo pipefail
 
-# Set paths
 SCAN_DIR="<%= @cv_scan_dir %>"
 LOG_FILE="<%= @cv_logfile %>"
 TMP_ALERT="<%= @cv_alert_file %>"
 EMAIL="<%= @cv_alert_email %>"
 
-# Run clamscan
+# Ensure the log directory exists
-clamscan -r --infected --log="$LOG_FILE" "$SCAN_DIR" > /dev/null
+mkdir -p "$(dirname "$LOG_FILE")"
 
-# Check if infections were found
+# Preferred: clamdscan with multiscan + fdpass
-if grep -q "Infected files: [^0]" "$LOG_FILE"; then
+clamdscan --multiscan --fdpass --infected --log="$LOG_FILE" "$SCAN_DIR" > /dev/null || true
-    echo "ClamAV has found infected files on $(hostname)!" > "$TMP_ALERT"
+
-    echo "" >> "$TMP_ALERT"
+# Check for infections (same logic as before)
-    grep "FOUND" "$LOG_FILE" >> "$TMP_ALERT"
+if grep -q "Infected files: [^0]" "$LOG_FILE" 2>/dev/null; then
+    {
+        echo "ClamAV has found infected files on $(hostname)!"
+        echo ""
+        grep "FOUND" "$LOG_FILE" || true
+    } > "$TMP_ALERT"
 
-    # Send the alert email
     mail -s "⚠️ ClamAV Alert on $(hostname)" "$EMAIL" < "$TMP_ALERT"
 fi
 
-# Clean up
 rm -f "$TMP_ALERT"