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

fix(java): improve identification for com.graphql-java artifacts (#2397)

Browse Source 
Signed-off-by: Weston Steimel <weston.steimel@proton.me>
This commit is contained in:
Weston Steimel 2023-12-06 18:04:43 +00:00 committed by GitHub
parent fa1baabc05
commit bcc7e90fcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
syft/pkg/cataloger/common/cpe/java_groupid_map.go
View File

@ -1754,4 +1754,25 @@ var DefaultArtifactIDToGroupID = map[string]string{
"ratpack-test": "io.ratpack", "ratpack-test": "io.ratpack",
"ratpack-thymeleaf": "io.ratpack", "ratpack-thymeleaf": "io.ratpack",
"ratpack-thymeleaf3": "io.ratpack", "ratpack-thymeleaf3": "io.ratpack",
"graphiql-spring-boot-autoconfigure": "com.graphql-java",
"graphiql-spring-boot-starter": "com.graphql-java",
"graphql-java": "com.graphql-java",
"graphql-java-annotations": "com.graphql-java",
"graphql-java-extended-scalars": "com.graphql-java",
"graphql-java-extended-validation": "com.graphql-java",
"graphql-java-servlet": "com.graphql-java",
"graphql-java-spring-boot-starter-webflux": "com.graphql-java",
"graphql-java-spring-boot-starter-webmvc": "com.graphql-java",
"graphql-java-spring-webflux": "com.graphql-java",
"graphql-java-spring-webmvc": "com.graphql-java",
"graphql-java-tools": "com.graphql-java",
"graphql-rxjava": "com.graphql-java",
"graphql-spring-boot-autoconfigure": "com.graphql-java",
"graphql-spring-boot-starter": "com.graphql-java",
"graphql-spring-boot-starter-test": "com.graphql-java",
"graphql-spring-boot-test": "com.graphql-java",
"graphql-spring-boot-test-autoconfigure": "com.graphql-java",
"java-dataloader": "com.graphql-java",
"voyager-spring-boot-autoconfigure": "com.graphql-java",
"voyager-spring-boot-starter": "com.graphql-java",
} }

19
test/integration/java_purl_test.go
View File

@ -62,7 +62,6 @@ var noAssertion = map[string]string{
"/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-xml-1.1.jar": "pkg:maven/commons-jelly/commons-jelly-tags-xml@1.1", "/packages/hudson.war:WEB-INF/lib/commons-jelly-tags-xml-1.1.jar": "pkg:maven/commons-jelly/commons-jelly-tags-xml@1.1",
"/packages/hudson.war:WEB-INF/slave.jar": "pkg:maven/org.jvnet.hudson.main/remoting@1.390", "/packages/hudson.war:WEB-INF/slave.jar": "pkg:maven/org.jvnet.hudson.main/remoting@1.390",
"/packages/minio-8.3.8.jar": "pkg:maven/io.minio/minio@8.3.8", "/packages/minio-8.3.8.jar": "pkg:maven/io.minio/minio@8.3.8",
"/packages/graphql-java-20.0.jar": "pkg:maven/com.graphql-java/graphql-java@20.0",
"/packages/hudson.war:WEB-INF/lib/xpp3_min-1.1.4c.jar": "pkg:maven/xpp3_min/xpp3_min@1.1.4c", "/packages/hudson.war:WEB-INF/lib/xpp3_min-1.1.4c.jar": "pkg:maven/xpp3_min/xpp3_min@1.1.4c",
"/packages/hudson.war:WEB-INF/lib/xpp3-1.1.4c.jar": "pkg:maven/xpp3/xpp3@1.1.4c", "/packages/hudson.war:WEB-INF/lib/xpp3-1.1.4c.jar": "pkg:maven/xpp3/xpp3@1.1.4c",
"/packages/hudson.war:WEB-INF/lib/groovy-all-1.6.0.jar": "pkg:maven/org.codehaus.groovy/groovy-all@1.6.0", "/packages/hudson.war:WEB-INF/lib/groovy-all-1.6.0.jar": "pkg:maven/org.codehaus.groovy/groovy-all@1.6.0",
@ -190,15 +189,15 @@ var expectedPURLs = map[string]string{
// "/packages/dubbo-3.1.4.jar:org.apache.dubbo:dubbo-xds": "pkg:maven/org.apache.dubbo/dubbo-xds@3.1.4", // "/packages/dubbo-3.1.4.jar:org.apache.dubbo:dubbo-xds": "pkg:maven/org.apache.dubbo/dubbo-xds@3.1.4",
// "/packages/dubbo-3.1.4.jar:org.apache.dubbo:dubbo": "pkg:maven/org.apache.dubbo/dubbo@3.1.4", // "/packages/dubbo-3.1.4.jar:org.apache.dubbo:dubbo": "pkg:maven/org.apache.dubbo/dubbo@3.1.4",
// "/packages/dubbo-3.1.4.jar": "pkg:maven/org.apache.dubbo/dubbo@3.1.4", // "/packages/dubbo-3.1.4.jar": "pkg:maven/org.apache.dubbo/dubbo@3.1.4",
"/packages/elasticsearch-8.10.2.jar": "pkg:maven/org.elasticsearch/elasticsearch@8.10.2", "/packages/elasticsearch-8.10.2.jar": "pkg:maven/org.elasticsearch/elasticsearch@8.10.2",
"/packages/elasticsearch-rest-client-sniffer-7.17.11.jar": "pkg:maven/org.elasticsearch.client/elasticsearch-rest-client-sniffer@7.17.11", "/packages/elasticsearch-rest-client-sniffer-7.17.11.jar": "pkg:maven/org.elasticsearch.client/elasticsearch-rest-client-sniffer@7.17.11",
"/packages/example-java-app-gradle-0.1.0.ear": "pkg:maven/example-java-app-gradle/example-java-app-gradle@0.1.0", "/packages/example-java-app-gradle-0.1.0.ear": "pkg:maven/example-java-app-gradle/example-java-app-gradle@0.1.0",
"/packages/geode-core-1.14.3.jar": "pkg:maven/org.apache.geode/geode-core@1.14.3", "/packages/geode-core-1.14.3.jar": "pkg:maven/org.apache.geode/geode-core@1.14.3",
"/packages/github-api-1.118.jar": "pkg:maven/org.kohsuke/github-api@1.118", "/packages/github-api-1.118.jar": "pkg:maven/org.kohsuke/github-api@1.118",
"/packages/google-oauth-client-1.25.0.jar": "pkg:maven/com.google.oauth-client/google-oauth-client@1.25.0", "/packages/google-oauth-client-1.25.0.jar": "pkg:maven/com.google.oauth-client/google-oauth-client@1.25.0",
"/packages/graphql-java-20.0.jar:com.google.guava:guava": "pkg:maven/com.google.guava/guava@31.0.1-jre", "/packages/graphql-java-20.0.jar:com.google.guava:guava": "pkg:maven/com.google.guava/guava@31.0.1-jre",
"/packages/graphql-java-20.0.jar:org.antlr:antlr4-runtime": "pkg:maven/org.antlr/antlr4-runtime@4.9.3", "/packages/graphql-java-20.0.jar:org.antlr:antlr4-runtime": "pkg:maven/org.antlr/antlr4-runtime@4.9.3",
// "/packages/graphql-java-20.0.jar": "pkg:maven/com.graphql-java/graphql-java@20.0", "/packages/graphql-java-20.0.jar": "pkg:maven/com.graphql-java/graphql-java@20.0",
"/packages/guava-29.0-jre.jar": "pkg:maven/com.google.guava/guava@29.0-jre", "/packages/guava-29.0-jre.jar": "pkg:maven/com.google.guava/guava@29.0-jre",
"/packages/hadoop-common-3.3.2.jar": "pkg:maven/org.apache.hadoop/hadoop-common@3.3.2", "/packages/hadoop-common-3.3.2.jar": "pkg:maven/org.apache.hadoop/hadoop-common@3.3.2",
"/packages/hazelcast-5.2.4.jar:com.fasterxml.jackson.core:jackson-core": "pkg:maven/com.fasterxml.jackson.core/jackson-core@2.15.2", "/packages/hazelcast-5.2.4.jar:com.fasterxml.jackson.core:jackson-core": "pkg:maven/com.fasterxml.jackson.core/jackson-core@2.15.2",