fix(misconf): handle dot files better (#3550)

aquasecurity · Feb 5, 2023 · 439c541 · 439c541
1 parent 200e04a
commit 439c541
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/pkg/misconf/scanner.go b/pkg/misconf/scanner.go
@@ -205,9 +205,7 @@ func createPolicyFS(policyPaths []string) (fs.FS, []string, error) {
 		}
 		var cleanPaths []string
 		for _, path := range policyPaths {
-			path = strings.TrimPrefix(path, ".")
-			path = strings.TrimPrefix(path, "/")
-			cleanPaths = append(cleanPaths, path)
+			cleanPaths = append(cleanPaths, filepath.Clean(path))
 		}
 		return os.DirFS(cwd), cleanPaths, nil
 	}

diff --git a/pkg/misconf/scanner_test.go b/pkg/misconf/scanner_test.go
@@ -141,3 +141,33 @@ func Test_FindingFSTarget(t *testing.T) {
 		})
 	}
 }
+
+func Test_createPolicyFS(t *testing.T) {
+	t.Run("inside cwd", func(t *testing.T) {
+		cwd, err := os.Getwd()
+		require.NoError(t, err)
+		require.NoError(t, os.MkdirAll(filepath.Join(cwd, "testdir"), 0750))
+		require.NoError(t, os.MkdirAll(filepath.Join(cwd, ".testdir"), 0750))
+		defer func() {
+			os.RemoveAll(filepath.Join(cwd, "testdir"))
+			os.RemoveAll(filepath.Join(cwd, ".testdir"))
+		}()
+
+		_, got1, err := createPolicyFS([]string{"testdir"})
+		require.NoError(t, err)
+
+		_, got2, err := createPolicyFS([]string{".testdir"})
+		require.NoError(t, err)
+
+		assert.NotEqual(t, got1, got2, "testdir and .testdir are different dirs and should not be equal")
+	})
+
+	t.Run("outside cwd", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "subdir/testdir"), 0750))
+		f, got, err := createPolicyFS([]string{filepath.Join(tmpDir, "subdir/testdir")})
+		require.NoError(t, err)
+		assert.Equal(t, []string{"."}, got)
+		assert.Contains(t, f, "testdir")
+	})
+}