Removing invalid negative paths for windows

dev
mzack 2021-12-20 14:11:55 +01:00
parent 8e62abe6e7
commit 0a9f890fdd
2 changed files with 35 additions and 19 deletions

View File

@ -119,7 +119,7 @@ func TestDownloadReleaseAndUnzipDeletion(t *testing.T) {
require.Equal(t, "base.yaml", results.deletions[0], "could not get correct new deletions") 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") configuredTemplateDirectory := filepath.Join(os.TempDir(), "templates")
defer os.RemoveAll(configuredTemplateDirectory) defer os.RemoveAll(configuredTemplateDirectory)
@ -136,24 +136,6 @@ func TestCalculateTemplateAbsolutePath(t *testing.T) {
require.False(t, skipFile) 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 { func zipFromDirectory(zipPath, directory string) error {

View File

@ -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)
}
})
}