oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix package.json parsing for multiple licenses objects

Browse Source 
Signed-off-by: Dan Luhring <dan.luhring@anchore.com>
This commit is contained in:
Dan Luhring 2020-11-14 10:35:16 -05:00
parent 4d4e242251
commit fc99538d78
No known key found for this signature in database
GPG Key ID: 9CEE23D079426CEF
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
syft/cataloger/javascript/parse_package_json.go
View File

@ -24,6 +24,7 @@ type PackageJSON struct {
Latest []string `json:"latest"` Latest []string `json:"latest"`
Author Author `json:"author"` Author Author `json:"author"`
License json.RawMessage `json:"license"` License json.RawMessage `json:"license"`
Licenses []license `json:"licenses,omitempty"`
Name string `json:"name"` Name string `json:"name"`
Homepage string `json:"homepage"` Homepage string `json:"homepage"`
Description string `json:"description"` Description string `json:"description"`
@ -131,6 +132,28 @@ func licenseFromJSON(b []byte) (string, error) {
return "", errors.New("unable to unmarshal license field as either string or object") return "", errors.New("unable to unmarshal license field as either string or object")
} }
func licensesFromJSON(p PackageJSON) ([]string, error) {
singleLicense, err := licenseFromJSON(p.License)
if err == nil {
return []string{singleLicense}, nil
}
// The "licenses" field is deprecated. It should be inspected as a last resort.
if p.Licenses != nil {
mapLicenses := func(licenses []license) []string {
mappedLicenses := make([]string, len(licenses))
for i, l := range licenses {
mappedLicenses[i] = l.Type
}
return mappedLicenses
}
return mapLicenses(p.Licenses), nil
}
return nil, fmt.Errorf("unable to parse license field: %w", err)
}
// parsePackageJson parses a package.json and returns the discovered JavaScript packages. // parsePackageJson parses a package.json and returns the discovered JavaScript packages.
func parsePackageJSON(_ string, reader io.Reader) ([]pkg.Package, error) { func parsePackageJSON(_ string, reader io.Reader) ([]pkg.Package, error) {
packages := make([]pkg.Package, 0) packages := make([]pkg.Package, 0)
@ -144,11 +167,10 @@ func parsePackageJSON(_ string, reader io.Reader) ([]pkg.Package, error) {
return nil, fmt.Errorf("failed to parse package.json file: %w", err) return nil, fmt.Errorf("failed to parse package.json file: %w", err)
} }
singleLicense, err := licenseFromJSON(p.License) licenses, err := licensesFromJSON(p)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to parse package.json file: %w", err) return nil, fmt.Errorf("failed to parse package.json file: %w", err)
} }
licenses := []string{singleLicense}
packages = append(packages, pkg.Package{ packages = append(packages, pkg.Package{
Name: p.Name, Name: p.Name,