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

Merge commit '15379d1' into javascript_parser_fix_author

Browse Source 
Signed-off-by: Toure <tdunnon@gmail.com>
This commit is contained in:
Toure 2020-10-22 14:08:33 -04:00
commit 94e448a818
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ type PackageJSON struct {
Homepage string `json:"homepage"` Homepage string `json:"homepage"`
Description string `json:"description"` Description string `json:"description"`
Dependencies map[string]string `json:"dependencies"` Dependencies map[string]string `json:"dependencies"`
Repository Repository `json:"repository"`
} }
type Author struct { type Author struct {
@ -35,10 +36,17 @@ type Author struct {
URL string `json:"url" mapstruct:"url"` URL string `json:"url" mapstruct:"url"`
} }
type Repository struct {
Type string `json:"type"`
URL string `json:"url"`
}
// match example: "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)" // match example: "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)"
// ---> name: "Isaac Z. Schlueter" email: "i@izs.me" url: "http://blog.izs.me" // ---> name: "Isaac Z. Schlueter" email: "i@izs.me" url: "http://blog.izs.me"
var authorPattern = regexp.MustCompile(`^\s*(?P<name>[^<(]*)(\s+<(?P<email>.*)>)?(\s\((?P<url>.*)\))?\s*$`) var authorPattern = regexp.MustCompile(`^\s*(?P<name>[^<(]*)(\s+<(?P<email>.*)>)?(\s\((?P<url>.*)\))?\s*$`)
// This method implements the UnmarshalJSON interface to help normalize
// the json structure.
func (a *Author) UnmarshalJSON(b []byte) error { func (a *Author) UnmarshalJSON(b []byte) error {
var authorStr string var authorStr string
var fields map[string]string var fields map[string]string
@ -98,6 +106,7 @@ func parsePackageJSON(_ string, reader io.Reader) ([]pkg.Package, error) {
Metadata: pkg.NpmMetadata{ Metadata: pkg.NpmMetadata{
Author: p.Author.String(), Author: p.Author.String(),
Homepage: p.Homepage, Homepage: p.Homepage,
URL: p.Repository.URL,
}, },
}) })
} }

2
syft/cataloger/javascript/parse_package_json_test.go
View File

@ -24,6 +24,7 @@ func TestParsePackageJSON(t *testing.T) {
Metadata: pkg.NpmMetadata{ Metadata: pkg.NpmMetadata{
Author: "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)", Author: "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
Homepage: "https://docs.npmjs.com/", Homepage: "https://docs.npmjs.com/",
URL: "https://github.com/npm/cli",
}, },
}, },
}, },
@ -38,6 +39,7 @@ func TestParsePackageJSON(t *testing.T) {
Metadata: pkg.NpmMetadata{ Metadata: pkg.NpmMetadata{
Author: "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)", Author: "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
Homepage: "https://docs.npmjs.com/", Homepage: "https://docs.npmjs.com/",
URL: "https://github.com/npm/cli",
}, },
}, },
}, },

4
syft/cataloger/javascript/test-fixtures/pkg-json/package-nested-author.json
View File

@ -8,5 +8,9 @@
"email": "i@izs.me", "email": "i@izs.me",
"url": "http://blog.izs.me" "url": "http://blog.izs.me"
}, },
"repository": {
"type": "git",
"url": "https://github.com/npm/cli"
},
"license": "Artistic-2.0" "license": "Artistic-2.0"
} }

1
syft/pkg/npm_metadata.go
View File

@ -9,4 +9,5 @@ type NpmMetadata struct {
License string `mapstructure:"license" json:"license"` License string `mapstructure:"license" json:"license"`
Homepage string `mapstructure:"homepage" json:"homepage"` Homepage string `mapstructure:"homepage" json:"homepage"`
Description string `mapstructure:"description" json:"description"` Description string `mapstructure:"description" json:"description"`
URL string `mapstructure:"url" json:"url"`
} }