From 0a3d190a836f3ecb8483926084830377c414cdbb Mon Sep 17 00:00:00 2001
From: Thomas Legris <thomas@deepfence.io>
Date: Thu, 29 Aug 2024 13:29:30 +0900
Subject: [PATCH] fix worker scans

---
 deepfence_worker/tasks/malwarescan/malwarescan.go | 12 +++++++++++-
 deepfence_worker/tasks/secretscan/secretscan.go   | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/deepfence_worker/tasks/malwarescan/malwarescan.go b/deepfence_worker/tasks/malwarescan/malwarescan.go
index 44f4899836..ebaff4a58e 100644
--- a/deepfence_worker/tasks/malwarescan/malwarescan.go
+++ b/deepfence_worker/tasks/malwarescan/malwarescan.go
@@ -35,7 +35,7 @@ import (
 var (
 	failOnCompileWarning = false
 	malwareRulesDir      = "/usr/local/malware"
-	malwareRulesPath     = "/usr/local/malware/yara-rules"
+	malwareRulesPath     = "/usr/local/malware/rules"
 	malwareConfigPath    = "/malware-config/config.yaml"
 	opts                 *malwareConfig.Options
 	yaraconfig           config.Config
@@ -80,6 +80,16 @@ func checkMalwareRulesUpdate(ctx context.Context) error {
 		if err := workerUtils.UpdateRules(ctx, path, malwareRulesDir); err != nil {
 			return err
 		}
+
+		for _, infile := range []string{
+			filepath.Join(malwareRulesPath, "df-malware.json"),
+		} {
+			err = threatintel.ExtractDFRules2NativeRules(infile, malwareRulesPath)
+			if err != nil {
+				return err
+			}
+		}
+
 		opts, yaraconfig, yr, err = initMalwareScanner()
 		if err != nil {
 			return err
diff --git a/deepfence_worker/tasks/secretscan/secretscan.go b/deepfence_worker/tasks/secretscan/secretscan.go
index e4f1f56368..494e28efe4 100644
--- a/deepfence_worker/tasks/secretscan/secretscan.go
+++ b/deepfence_worker/tasks/secretscan/secretscan.go
@@ -36,7 +36,7 @@ import (
 var (
 	failOnCompileWarning = false
 	secretRulesDir       = "/usr/local/secret"
-	secretRulesPath      = "/usr/local/secret/secret-yara-rules"
+	secretRulesPath      = "/usr/local/secret/rules"
 	secretConfigPath     = "/secret-config/config.yaml"
 	opts                 *secretConfig.Options
 	yaraconfig           config.Config
@@ -81,6 +81,16 @@ func checkSecretRulesUpdate(ctx context.Context) error {
 		if err := workerUtils.UpdateRules(ctx, path, secretRulesDir); err != nil {
 			return err
 		}
+
+		for _, infile := range []string{
+			filepath.Join(secretRulesPath, "df-secret.json"),
+		} {
+			err = threatintel.ExtractDFRules2NativeRules(infile, secretRulesPath)
+			if err != nil {
+				return err
+			}
+		}
+
 		opts, yaraconfig, yr, err = initSecretScanner()
 		if err != nil {
 			return err