add a fix for windows volumes

Signed-off-by: Simar <[email protected]>
aquasecurity · Apr 7, 2023 · 1baf04c · 1baf04c
1 parent c5869b5
commit 1baf04c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/pkg/fanal/artifact/local/fs_test.go b/pkg/fanal/artifact/local/fs_test.go
@@ -355,7 +355,16 @@ func TestBuildPathsToSkip(t *testing.T) {
 
 func getAbsCleanPath(path string) string {
 	p, _ := filepath.Abs(path)
-	return strings.TrimPrefix(filepath.Clean(p), fmt.Sprintf("%c", os.PathSeparator))
+	switch runtime.GOOS {
+	case "windows":
+		if volume := filepath.VolumeName(p); volume != "" {
+			p = strings.TrimPrefix(filepath.ToSlash(p), volume+"/")
+			return filepath.FromSlash(p)
+		}
+		return strings.TrimPrefix(filepath.Clean(p), fmt.Sprintf("%c", os.PathSeparator))
+	default:
+		return strings.TrimPrefix(filepath.Clean(p), fmt.Sprintf("%c", os.PathSeparator))
+	}
 }
 
 func TestTerraformMisconfigurationScan(t *testing.T) {
@@ -702,8 +711,8 @@ func TestTerraformMisconfigurationScan(t *testing.T) {
 			require.NoError(t, err)
 			require.NotNil(t, got)
 
-			assert.Equal(t, tt.want.Name, got.Name)
-			assert.Equal(t, tt.want.Type, got.Type)
+			assert.Contains(t, got.Name, tt.want.Name)
+			assert.Contains(t, got.Type, tt.want.Type)
 		})
 	}
 }

diff --git a/pkg/misconf/scanner.go b/pkg/misconf/scanner.go
@@ -270,6 +270,7 @@ func getRootDir(filePath string) (string, error) {
 }
 
 // Scan detects misconfigurations.
+// nolint: gocyclo
 func (s *Scanner) Scan(ctx context.Context, files []types.File) ([]types.Misconfiguration, error) {
 	mapMemoryFS := make(map[string]*memoryfs.FS)
 	for t := range s.scanners {
@@ -315,7 +316,12 @@ func (s *Scanner) Scan(ctx context.Context, files []types.File) ([]types.Misconf
 					return nil, xerrors.Errorf("scanfs for %s scan from memoryfs failed: %w", t, err)
 				}
 			} else {
-				results, err = scanner.ScanFS(ctx, extrafs.OSDir(fmt.Sprintf("%c", os.PathSeparator)), rootDir)
+				// Support Windows paths
+				if volume := filepath.VolumeName(rootDir); volume != "" {
+					rootDir = strings.TrimPrefix(filepath.ToSlash(rootDir), volume+"/")
+				}
+
+				results, err = scanner.ScanFS(ctx, extrafs.OSDir("/"), rootDir)
 				if err != nil {
 					return nil, xerrors.Errorf("scanfs for %s scan failed: %w", t, err)
 				}