mirror of
https://github.com/anchore/syft.git
synced 2025-11-18 00:43:20 +01:00
fix: openjdk detection pattern (#1415)
This commit is contained in:
parent
0f1e8fca14
commit
b1d6dae203
@ -116,6 +116,20 @@ func TestClassifierCataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "positive-java-openjdk-lts",
|
||||||
|
fixtureDir: "test-fixtures/classifiers/positive/openjdk-lts",
|
||||||
|
expected: pkg.Package{
|
||||||
|
Name: "java",
|
||||||
|
Version: "11.0.17+8-LTS",
|
||||||
|
Type: "binary",
|
||||||
|
Locations: singleLocation("java"),
|
||||||
|
Metadata: pkg.BinaryMetadata{
|
||||||
|
Classifier: "java-binary-openjdk",
|
||||||
|
VirtualPath: "java",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "positive-java-oracle",
|
name: "positive-java-oracle",
|
||||||
fixtureDir: "test-fixtures/classifiers/positive/oracle",
|
fixtureDir: "test-fixtures/classifiers/positive/oracle",
|
||||||
|
|||||||
@ -38,8 +38,9 @@ var defaultClassifiers = []classifier{
|
|||||||
Class: "java-binary-openjdk",
|
Class: "java-binary-openjdk",
|
||||||
FileGlob: "**/java",
|
FileGlob: "**/java",
|
||||||
EvidenceMatcher: fileContentsVersionMatcher(
|
EvidenceMatcher: fileContentsVersionMatcher(
|
||||||
|
// [NUL]openjdk[NUL]java[NUL]0.0[NUL]11.0.17+8-LTS[NUL]
|
||||||
// [NUL]openjdk[NUL]java[NUL]1.8[NUL]1.8.0_352-b08[NUL]
|
// [NUL]openjdk[NUL]java[NUL]1.8[NUL]1.8.0_352-b08[NUL]
|
||||||
`(?m)\x00openjdk\x00java\x00(?P<release>[0-9]+[.0-9]+)\x00(?P<version>[0-9]+[-._a-zA-Z0-9]+)\x00`),
|
`(?m)\x00openjdk\x00java\x00(?P<release>[0-9]+[.0-9]*)\x00(?P<version>[0-9]+[^\x00]+)\x00`),
|
||||||
Package: "java",
|
Package: "java",
|
||||||
// TODO the updates might need to be part of the CPE, like: 1.8.0:update152
|
// TODO the updates might need to be part of the CPE, like: 1.8.0:update152
|
||||||
CPEs: singleCPE("cpe:2.3:a:oracle:openjdk:*:*:*:*:*:*:*:*"),
|
CPEs: singleCPE("cpe:2.3:a:oracle:openjdk:*:*:*:*:*:*:*:*"),
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user