enhancement: Hubtest respect patterndir option set via config.yaml

crowdsecurity · Dec 29, 2024 · 01a1456 · 01a1456
1 parent 5c0c4f9
commit 01a1456
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/cmd/crowdsec-cli/clihubtest/hubtest.go b/cmd/crowdsec-cli/clihubtest/hubtest.go
@@ -43,12 +43,13 @@ func (cli *cliHubTest) NewCommand() *cobra.Command {
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(_ *cobra.Command, _ []string) error {
 			var err error
-			HubTest, err = hubtest.NewHubTest(hubPath, crowdsecPath, cscliPath, false)
+			cfg := cli.cfg()
+			HubTest, err = hubtest.NewHubTest(hubPath, crowdsecPath, cscliPath, false, cfg.ConfigPaths.PatternDir)
 			if err != nil {
 				return fmt.Errorf("unable to load hubtest: %+v", err)
 			}
 
-			HubAppsecTests, err = hubtest.NewHubTest(hubPath, crowdsecPath, cscliPath, true)
+			HubAppsecTests, err = hubtest.NewHubTest(hubPath, crowdsecPath, cscliPath, true, cfg.ConfigPaths.PatternDir)
 			if err != nil {
 				return fmt.Errorf("unable to load appsec specific hubtest: %+v", err)
 			}

diff --git a/cmd/crowdsec-cli/main.go b/cmd/crowdsec-cli/main.go
@@ -91,7 +91,6 @@ func loadConfigFor(command string) (*csconfig.Config, string, error) {
 		"help",
 		"completion",
 		"version",
-		"hubtest",
 	}
 
 	if !slices.Contains(noNeedConfig, command) {

diff --git a/pkg/hubtest/hubtest.go b/pkg/hubtest/hubtest.go
@@ -25,8 +25,9 @@ type HubTest struct {
 	NucleiTargetHost          string
 	AppSecHost                string
 
-	HubIndex *cwhub.Hub
-	Tests    []*HubTestItem
+	HubIndex   *cwhub.Hub
+	Tests      []*HubTestItem
+	PatternDir string
 }
 
 const (
@@ -58,7 +59,7 @@ http:
 `
 )
 
-func NewHubTest(hubPath string, crowdsecPath string, cscliPath string, isAppsecTest bool) (HubTest, error) {
+func NewHubTest(hubPath string, crowdsecPath string, cscliPath string, isAppsecTest bool, patternDir string) (HubTest, error) {
 	hubPath, err := filepath.Abs(hubPath)
 	if err != nil {
 		return HubTest{}, fmt.Errorf("can't get absolute path of hub: %+v", err)
@@ -116,6 +117,7 @@ func NewHubTest(hubPath string, crowdsecPath string, cscliPath string, isAppsecT
 			NucleiTargetHost:          DefaultNucleiTarget,
 			AppSecHost:                DefaultAppsecHost,
 			HubIndex:                  hub,
+			PatternDir:                patternDir,
 		}, nil
 	}
 
@@ -149,6 +151,7 @@ func NewHubTest(hubPath string, crowdsecPath string, cscliPath string, isAppsecT
 		TemplateProfilePath:    filepath.Join(HubTestPath, templateProfileFile),
 		TemplateSimulationPath: filepath.Join(HubTestPath, templateSimulationFile),
 		HubIndex:               hub,
+		PatternDir:             patternDir,
 	}, nil
 }
 

diff --git a/pkg/hubtest/hubtest_item.go b/pkg/hubtest/hubtest_item.go
@@ -78,6 +78,7 @@ type HubTestItem struct {
 
 	NucleiTargetHost string
 	AppSecHost       string
+	PatternDir       string
 }
 
 const (
@@ -159,6 +160,7 @@ func NewTest(name string, hubTest *HubTest) (*HubTestItem, error) {
 		CustomItemsLocation:       []string{hubTest.HubPath, testPath},
 		NucleiTargetHost:          hubTest.NucleiTargetHost,
 		AppSecHost:                hubTest.AppSecHost,
+		PatternDir:                hubTest.PatternDir,
 	}, nil
 }
 
@@ -417,11 +419,9 @@ func (t *HubTestItem) RunWithLogFile() error {
 		return fmt.Errorf("unable to copy '%s' to '%s': %v", t.TemplateSimulationPath, t.RuntimeSimulationFilePath, err)
 	}
 
-	crowdsecPatternsFolder := csconfig.DefaultConfigPath("patterns")
-
 	// copy template patterns folder to runtime folder
-	if err = CopyDir(crowdsecPatternsFolder, t.RuntimePatternsPath); err != nil {
-		return fmt.Errorf("unable to copy 'patterns' from '%s' to '%s': %w", crowdsecPatternsFolder, t.RuntimePatternsPath, err)
+	if err = CopyDir(t.PatternDir, t.RuntimePatternsPath); err != nil {
+		return fmt.Errorf("unable to copy 'patterns' from '%s' to '%s': %w", t.PatternDir, t.RuntimePatternsPath, err)
 	}
 
 	// install the hub in the runtime folder
@@ -596,11 +596,9 @@ func (t *HubTestItem) Run() error {
 		return fmt.Errorf("unable to copy '%s' to '%s': %v", t.TemplateSimulationPath, t.RuntimeSimulationFilePath, err)
 	}
 
-	crowdsecPatternsFolder := csconfig.DefaultConfigPath("patterns")
-
 	// copy template patterns folder to runtime folder
-	if err = CopyDir(crowdsecPatternsFolder, t.RuntimePatternsPath); err != nil {
-		return fmt.Errorf("unable to copy 'patterns' from '%s' to '%s': %w", crowdsecPatternsFolder, t.RuntimePatternsPath, err)
+	if err = CopyDir(t.PatternDir, t.RuntimePatternsPath); err != nil {
+		return fmt.Errorf("unable to copy 'patterns' from '%s' to '%s': %w", t.PatternDir, t.RuntimePatternsPath, err)
 	}
 
 	// create the appsec-configs dir