source: when base is set, responsePath should be absolute

syft/source/directory_resolver.go

@@ -330,12 +330,19 @@ func (r directoryResolver) responsePath(path string) string {
 		path = posixToWindows(path)
 	}
 
-	// always return references relative to the request path (not absolute path)
+	// clean references to the request path (either the root, or the base if set)
 	if filepath.IsAbs(path) {
-		// we need to account for the cwd relative to the running process and the given root for the directory resolver
-		prefix := filepath.Clean(filepath.Join(r.currentWd, r.currentWdRelativeToRoot))
-		return strings.TrimPrefix(path, prefix+string(filepath.Separator))
+		var prefix string
+		if r.base != "" {
+			prefix = r.base
+		} else {
+			// we need to account for the cwd relative to the running process and the given root for the directory resolver
+			prefix = filepath.Clean(filepath.Join(r.currentWd, r.currentWdRelativeToRoot))
+			prefix += string(filepath.Separator)
+		}
+		path = strings.TrimPrefix(path, prefix)
 	}
+
 	return path
 }
 

syft/source/directory_resolver_test.go

@@ -898,47 +898,47 @@ func TestDirectoryResolver_FilesByPath_baseRoot(t *testing.T) {
 			root:  "./test-fixtures/symlinks-base/",
 			input: "./base",
 			expected: []string{
-				"base",
+				"/base",
 			},
 		},
 		{
 			name:  "should follow a link with a pivoted root",
 			root:  "./test-fixtures/symlinks-base/",
 			input: "./foo",
 			expected: []string{
-				"base",
+				"/base",
 			},
 		},
 		{
 			name:  "should follow a relative link with extra parents",
 			root:  "./test-fixtures/symlinks-base/",
 			input: "./bar",
 			expected: []string{
-				"base",
+				"/base",
 			},
 		},
 		{
 			name:  "should follow an absolute link with extra parents",
 			root:  "./test-fixtures/symlinks-base/",
 			input: "./baz",
 			expected: []string{
-				"base",
+				"/base",
 			},
 		},
 		{
 			name:  "should follow an absolute link with extra parents",
 			root:  "./test-fixtures/symlinks-base/",
 			input: "./sub/link",
 			expected: []string{
-				"sub/item",
+				"/sub/item",
 			},
 		},
 		{
 			name:  "should follow chained pivoted link",
 			root:  "./test-fixtures/symlinks-base/",
 			input: "./chain",
 			expected: []string{
-				"base",
+				"/base",
 			},
 		},
 	}