Skip to content

fix(java): improve identification for org.elasticsearch artifacts#2383

Merged
westonsteimel merged 1 commit intomainfrom
improve-org.elasticsearch-java-artifact-identification
Dec 1, 2023
Merged

fix(java): improve identification for org.elasticsearch artifacts#2383
westonsteimel merged 1 commit intomainfrom
improve-org.elasticsearch-java-artifact-identification

Conversation

@westonsteimel
Copy link
Copy Markdown
Contributor

@westonsteimel westonsteimel commented Dec 1, 2023

Elasticsearch jars currently end up with incorrect groupids because syft ends up taking the groupid from the Implementation-Title field in the manifest, and those contain a # suffix on them like
org.elasticsearch.plugin#lang-mustache;6.8.15. Syft strips off the component after the ;, but this enhances the logic to also strip off the part after the #

An example jar that can be used to demonstrate this is https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch/8.10.2/elasticsearch-8.10.2.jar

This also adds manual mapping for the major elasticsearch components which are named uniquely enough to go in the map as a fallback in any scenarios where the other logic fails

@westonsteimel westonsteimel added the bug Something isn't working label Dec 1, 2023
@westonsteimel westonsteimel requested a review from a team December 1, 2023 12:00
@westonsteimel westonsteimel enabled auto-merge (squash) December 1, 2023 12:00
@westonsteimel westonsteimel force-pushed the improve-org.elasticsearch-java-artifact-identification branch from 98a1e0e to ffbbad6 Compare December 1, 2023 12:08
Comment thread syft/pkg/cataloger/common/cpe/java_groupid_map.go Outdated
@westonsteimel westonsteimel force-pushed the improve-org.elasticsearch-java-artifact-identification branch 3 times, most recently from e829696 to 130dfc9 Compare December 1, 2023 12:32
@westonsteimel westonsteimel force-pushed the improve-org.elasticsearch-java-artifact-identification branch from 130dfc9 to 828a955 Compare December 1, 2023 12:37
Signed-off-by: Weston Steimel <weston.steimel@proton.me>
@westonsteimel westonsteimel force-pushed the improve-org.elasticsearch-java-artifact-identification branch from 828a955 to 4ed4957 Compare December 1, 2023 13:02
@westonsteimel westonsteimel enabled auto-merge (squash) December 1, 2023 13:24
@westonsteimel westonsteimel merged commit 11039f4 into main Dec 1, 2023
@westonsteimel westonsteimel deleted the improve-org.elasticsearch-java-artifact-identification branch December 1, 2023 14:22
spiffcs added a commit to coheigea/syft that referenced this pull request Dec 5, 2023
* main: (40 commits)
  chore(deps): bump anchore/sbom-action from 0.15.0 to 0.15.1 (anchore#2392)
  Retrieve remote licenses using pom.properties when there is no pom.xml (anchore#2315)
  fix(java): improve identification for org.apache.tapestry artifacts (anchore#2384)
  fix(java): improve identification for io.ratpack artifacts (anchore#2379)
  fix(java): improve identification for org.apache.cassandra artifacts (anchore#2386)
  fix(java): improve identification for org.neo4j.procedure artifacts (anchore#2388)
  fix: bump fangs for ptr summarize fix (anchore#2387)
  fix(java): improve identification for org.elasticsearch artifacts (anchore#2383)
  fix(java): improve identification for org.apache.geode artifacts (anchore#2382)
  fix(java): improve identification for org.apache.tomcat.embed artifacts (anchore#2381)
  fix(java): improve identification for io.projectreactor.netty artifacts (anchore#2378)
  fix(java): improve identification for org.eclipse.platform artifacts (anchore#2349)
  Generalize UI events for cataloging tasks (anchore#2369)
  chore(deps): update tools to latest versions (anchore#2376)
  chore(deps): bump github.com/google/go-containerregistry (anchore#2377)
  chore: fix tests failing due to Mac Rosetta cache (anchore#2374)
  fix: improve dotnet portable executable identification (anchore#2133)
  fix file metadata cataloger to use resolved locations (anchore#2370)
  fix: logging level for parsing potential PE files (anchore#2367)
  only remove breaking-change label when there are schema changes (anchore#2371)
  ...

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
…chore#2383)

Signed-off-by: Weston Steimel <weston.steimel@proton.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants