Merge branch 'dev' into issue-1379-fix-templates-repetitions-with-project-file

integration_tests/http/self-contained.yaml

@@ -9,7 +9,7 @@ self-contained: true
 requests:
   - raw:
       - |
-        GET http://localhost:5431/ HTTP/1.1
+        GET http://127.0.0.1:5431/ HTTP/1.1
         Host: {{Hostname}}
 
     matchers:

integration_tests/network/self-contained.yaml

@@ -8,7 +8,7 @@ info:
 self-contained: true
 network:
   - host:
-      - "localhost:5431"
+      - "127.0.0.1:5431"
 
     matchers:
       - type: word

v2/internal/runner/update_test.go

@@ -119,7 +119,7 @@ func TestDownloadReleaseAndUnzipDeletion(t *testing.T) {
 	require.Equal(t, "base.yaml", results.deletions[0], "could not get correct new deletions")
 }
 
-func TestCalculateTemplateAbsolutePath(t *testing.T) {
+func TestCalculateTemplateAbsolutePathPositiveScenario(t *testing.T) {
 	configuredTemplateDirectory := filepath.Join(os.TempDir(), "templates")
 	defer os.RemoveAll(configuredTemplateDirectory)
 
@@ -136,24 +136,6 @@ func TestCalculateTemplateAbsolutePath(t *testing.T) {
 			require.False(t, skipFile)
 		}
 	})
-
-	t.Run("negative scenarios", func(t *testing.T) {
-		filePathsFromZip := []string{
-			"./../nuclei-templates/../cve/test.yaml",
-			"nuclei-templates/../cve/test.yaml",
-			"nuclei-templates/cve/../test.yaml",
-			"nuclei-templates/././../cve/test.yaml",
-			"nuclei-templates/.././../cve/test.yaml",
-			"nuclei-templates/.././../cve/../test.yaml",
-		}
-
-		for _, filePathFromZip := range filePathsFromZip {
-			calculatedTemplateAbsPath, skipFile, err := calculateTemplateAbsolutePath(filePathFromZip, configuredTemplateDirectory)
-			require.Nil(t, err)
-			require.True(t, skipFile)
-			require.Equal(t, "", calculatedTemplateAbsPath)
-		}
-	})
 }
 
 func zipFromDirectory(zipPath, directory string) error {

v2/internal/runner/update_unix_test.go

@@ -0,0 +1,34 @@
+//go:build !windows
+
+package runner
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestCalculateTemplateAbsolutePathNegativeScenario(t *testing.T) {
+	configuredTemplateDirectory := filepath.Join(os.TempDir(), "templates")
+	defer os.RemoveAll(configuredTemplateDirectory)
+
+	t.Run("negative scenarios", func(t *testing.T) {
+		filePathsFromZip := []string{
+			"./../nuclei-templates/../cve/test.yaml",
+			"nuclei-templates/../cve/test.yaml",
+			"nuclei-templates/cve/../test.yaml",
+			"nuclei-templates/././../cve/test.yaml",
+			"nuclei-templates/.././../cve/test.yaml",
+			"nuclei-templates/.././../cve/../test.yaml",
+		}
+
+		for _, filePathFromZip := range filePathsFromZip {
+			calculatedTemplateAbsPath, skipFile, err := calculateTemplateAbsolutePath(filePathFromZip, configuredTemplateDirectory)
+			require.Nil(t, err)
+			require.True(t, skipFile)
+			require.Equal(t, "", calculatedTemplateAbsPath)
+		}
+	})
+}