STRLCPY/syft

Add support for nar files. (#1727)

- Update README.md to show that nar is now supported.
- Created a java-archives/example.nar so that the tests wouldn't break.
- Add nar glob and as an option for pkgType.

Closes #1701

Signed-off-by: Shane Dell <[email protected]>

Shane Dell committed with GitHub 1 year ago

16ebcb24

1 parent 30583858

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 6 files Show one by one

■ ■ ■ ■ ■ ■

README.md

		skipped 41 lines
42	42		- Erlang (rebar3)
43	43		- Go (go.mod, Go binaries)
44	44		- Haskell (cabal, stack)
45		-	- Java (jar, ear, war, par, sar, native-image)
	45	+	- Java (jar, ear, war, par, sar, nar, native-image)
46	46		- JavaScript (npm, yarn)
47	47		- Jenkins Plugins (jpi, hpi)
48	48		- Nix (outputs in /nix/store)
		skipped 622 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/java/archive_filename.go

		skipped 107 lines
108	108
109	109		func (a archiveFilename) pkgType() pkg.Type {
110	110		switch strings.ToLower(a.extension()) {
111		-	case "jar", "war", "ear", "lpkg", "par", "sar":
	111	+	case "jar", "war", "ear", "lpkg", "par", "sar", "nar":
112	112		return pkg.JavaPkg
113	113		case "jpi", "hpi":
114	114		return pkg.JenkinsPluginPkg
		skipped 5 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/java/archive_filename_test.go

		skipped 79 lines
80	80		ty: pkg.JavaPkg,
81	81		},
82	82		{
	83	+	filename: "pkg-extra-field-maven-4.3.2-rc1.nar",
	84	+	version: "4.3.2-rc1",
	85	+	extension: "nar",
	86	+	name: "pkg-extra-field-maven",
	87	+	ty: pkg.JavaPkg,
	88	+	},
	89	+	{
83	90		filename: "/some/path/pkg-extra-field-maven-4.3.2-rc1.jpi",
84	91		version: "4.3.2-rc1",
85	92		extension: "jpi",
		skipped 118 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/java/archive_parser.go

		skipped 23 lines
24	24		"*/.ear",
25	25		"*/.par",
26	26		"*/.sar",
	27	+	"*/.nar",
27	28		"*/.jpi",
28	29		"*/.hpi",
29	30		"*/.lpkg", // Zip-compressed package used to deploy applications
		skipped 431 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/java/cataloger_test.go

		skipped 20 lines
21	21		"java-archives/example.ear",
22	22		"java-archives/example.par",
23	23		"java-archives/example.sar",
	24	+	"java-archives/example.nar",
24	25		"java-archives/example.jpi",
25	26		"java-archives/example.hpi",
26	27		"java-archives/example.lpkg",
		skipped 62 lines

syft/pkg/cataloger/java/test-fixtures/glob-paths/java-archives/example.nar

Binary file.