Merge pull request #59 from deepfence/ISSUE-1700

varunsharma0286 · web-flow · commit 1b033a3a4cf9 · 2023-10-31T10:06:16.000+05:30
ISSUE-1700: Fixing the vulnerability scans for registries with no credentials.
diff --git a/sbom/syft/syft.go b/sbom/syft/syft.go
@@ -182,7 +182,7 @@ func GenerateSBOM(ctx context.Context, config utils.Config) ([]byte, error) {
 		syftArgs = append(syftArgs, buildCatalogersArg(config.ScanType, isRegistry)...)
 	}
 
-	if config.RegistryCreds.AuthFilePath != "" {
+	if config.IsRegistry {
 		if !strings.HasPrefix(syftArgs[1], registryPrefix) {
 			syftArgs[1] = registryPrefix + syftArgs[1]
 		}
diff --git a/utils/type.go b/utils/type.go
@@ -38,6 +38,7 @@ type Config struct {
 	GrypeConfigPath       string         `json:"grype_config_path,omitempty"`
 	KeepSbom              bool           `json:"keep_sbom,omitempty"`
 	RegistryCreds         RegistryCreds  `json:"registry_creds,omitempty"`
+	IsRegistry            bool           `json:"is_registry,omitempty"`
 }
 
 type RegistryCreds struct {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ func GenerateSBOM(ctx context.Context, config utils.Config) ([]byte, error) {`
`182`	`182`	`syftArgs = append(syftArgs, buildCatalogersArg(config.ScanType, isRegistry)...)`
`183`	`183`	`}`
`184`	`184`
`185`		`- if config.RegistryCreds.AuthFilePath != "" {`
	`185`	`+ if config.IsRegistry {`
`186`	`186`	`if !strings.HasPrefix(syftArgs[1], registryPrefix) {`
`187`	`187`	`syftArgs[1] = registryPrefix + syftArgs[1]`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ type Config struct {`
`38`	`38`	GrypeConfigPath string `json:"grype_config_path,omitempty"`
`39`	`39`	KeepSbom bool `json:"keep_sbom,omitempty"`
`40`	`40`	RegistryCreds RegistryCreds `json:"registry_creds,omitempty"`
	`41`	+ IsRegistry bool `json:"is_registry,omitempty"`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`type RegistryCreds struct {`