From 91cf066db6ff4fc9be4a7e15ff086a811ca449fa Mon Sep 17 00:00:00 2001
From: GGMU <49076226+tomersein@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:10:03 +0300
Subject: [PATCH] support .kar files (#3113)

* add kar

Signed-off-by: tomersein <tomersein@gmail.com>
---
 syft/pkg/cataloger/java/archive_filename.go                | 2 +-
 syft/pkg/cataloger/java/archive_filename_test.go           | 7 +++++++
 syft/pkg/cataloger/java/archive_parser.go                  | 1 +
 syft/pkg/cataloger/java/cataloger_test.go                  | 1 +
 .../test-fixtures/glob-paths/java-archives/example.kar     | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 syft/pkg/cataloger/java/test-fixtures/glob-paths/java-archives/example.kar

diff --git a/syft/pkg/cataloger/java/archive_filename.go b/syft/pkg/cataloger/java/archive_filename.go
index 084371499..cc377e438 100644
--- a/syft/pkg/cataloger/java/archive_filename.go
+++ b/syft/pkg/cataloger/java/archive_filename.go
@@ -108,7 +108,7 @@ func (a archiveFilename) extension() string {
 
 func (a archiveFilename) pkgType() pkg.Type {
 	switch strings.ToLower(a.extension()) {
-	case "jar", "war", "ear", "lpkg", "par", "sar", "nar":
+	case "jar", "war", "ear", "lpkg", "par", "sar", "nar", "kar":
 		return pkg.JavaPkg
 	case "jpi", "hpi":
 		return pkg.JenkinsPluginPkg
diff --git a/syft/pkg/cataloger/java/archive_filename_test.go b/syft/pkg/cataloger/java/archive_filename_test.go
index 5752e7d1a..985604912 100644
--- a/syft/pkg/cataloger/java/archive_filename_test.go
+++ b/syft/pkg/cataloger/java/archive_filename_test.go
@@ -86,6 +86,13 @@ func TestExtractInfoFromJavaArchiveFilename(t *testing.T) {
 			name:      "pkg-extra-field-maven",
 			ty:        pkg.JavaPkg,
 		},
+		{
+			filename:  "pkg-extra-field-maven-4.3.2-rc1.kar",
+			version:   "4.3.2-rc1",
+			extension: "kar",
+			name:      "pkg-extra-field-maven",
+			ty:        pkg.JavaPkg,
+		},
 		{
 			filename:  "/some/path/pkg-extra-field-maven-4.3.2-rc1.jpi",
 			version:   "4.3.2-rc1",
diff --git a/syft/pkg/cataloger/java/archive_parser.go b/syft/pkg/cataloger/java/archive_parser.go
index 663563c61..1de3ab80a 100644
--- a/syft/pkg/cataloger/java/archive_parser.go
+++ b/syft/pkg/cataloger/java/archive_parser.go
@@ -31,6 +31,7 @@ var archiveFormatGlobs = []string{
 	"**/*.nar",
 	"**/*.jpi",
 	"**/*.hpi",
+	"**/*.kar",
 	"**/*.lpkg", // Zip-compressed package used to deploy applications
 	// (aka plugins) to Liferay Portal server. Those files contains .JAR(s) and a .PROPERTIES file, the latter
 	// has information about the application and installation requirements.
diff --git a/syft/pkg/cataloger/java/cataloger_test.go b/syft/pkg/cataloger/java/cataloger_test.go
index da524fc5b..84ba1ea91 100644
--- a/syft/pkg/cataloger/java/cataloger_test.go
+++ b/syft/pkg/cataloger/java/cataloger_test.go
@@ -23,6 +23,7 @@ func Test_ArchiveCataloger_Globs(t *testing.T) {
 				"java-archives/example.par",
 				"java-archives/example.sar",
 				"java-archives/example.nar",
+				"java-archives/example.kar",
 				"java-archives/example.jpi",
 				"java-archives/example.hpi",
 				"java-archives/example.lpkg",
diff --git a/syft/pkg/cataloger/java/test-fixtures/glob-paths/java-archives/example.kar b/syft/pkg/cataloger/java/test-fixtures/glob-paths/java-archives/example.kar
new file mode 100644
index 000000000..0b3d595db
--- /dev/null
+++ b/syft/pkg/cataloger/java/test-fixtures/glob-paths/java-archives/example.kar
@@ -0,0 +1 @@
+example archive
\ No newline at end of file