Merge pull request #890 from deepfence/v2-malware-secret

V2 malware secret

deepfence_agent/tools/apache/scope/probe/host/malware_scanner.go

@@ -3,6 +3,7 @@ package host
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -76,16 +77,14 @@ func StartMalwareScan(req ctl.StartMalwareScanRequest) error {
 			Container: &pb.MalwareContainer{Id: req.NodeId},
 		}}
 	case ctl.Image:
-		splits := strings.Split(req.NodeId, ";")
-		if len(splits) == 2 {
-			greq = pb.MalwareRequest{Input: &pb.MalwareRequest_Image{
-				Image: &pb.MalwareDockerImage{Id: splits[0], Name: splits[1]},
-			}}
-		} else {
-			greq = pb.MalwareRequest{Input: &pb.MalwareRequest_Image{
-				Image: &pb.MalwareDockerImage{Id: req.NodeId, Name: "dummy"},
-			}}
+		splits := strings.Split(req.BinArgs["node_id"], ";")
+
+		if len(splits) != 2 {
+			return errors.New("image id format is incorrect")
 		}
+		greq = pb.MalwareRequest{Input: &pb.MalwareRequest_Image{
+			Image: &pb.MalwareDockerImage{Id: req.NodeId, Name: splits[1]},
+		}}
 	case ctl.Host:
 		greq = pb.MalwareRequest{Input: &pb.MalwareRequest_Path{Path: MalwareScanDir}}
 	}