Add support for Package URLs #397
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -212,7 +212,7 @@ | |
| }, | ||
| "cpes": { | ||
| "type": "array", | ||
| "description": "Affected products defined by CPE. This is an array of CPE values (vulnerable and not), we use an array so that we can make multiple statements about the same version and they are separate (if we used a JSON object we'd essentially be keying on the CPE name and they would have to overlap). Also, this allows things like cveDataVersion or cveDescription to be applied directly to the product entry. This also allows more complex statements such as \"Product X between versions 10.2 and 10.8\" to be put in a machine-readable format. As well since multiple statements can be used multiple branches of the same product can be defined here. NOTE: Consider using the newer applicability block for defining CPE data using the CPE Applicability Language which includes more options for defining CPE Names.", | ||
| "uniqueItems": true, | ||
| "items": { | ||
| "title": "CPE Name", | ||
|
|
@@ -500,6 +500,93 @@ | |
| "required": ["orgId"], | ||
| "additionalProperties": false | ||
| }, | ||
| "applicability": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/applicabilityElement" | ||
| } | ||
| }, | ||
| "applicabilityElement": { | ||
| "description": "Affected products defined using one or more software identifiers and applicability parameters. An operator property allows AND or OR logic between identifiers or combinations thereof. The negate and vulnerable Boolean properties allow applicability combinations to be inverted and/or defined as vulnerable or not. Multiple version fields are provided for capturing ranges of products when defining a Match String Range. NOTE: When defining an applicability block, it is recommended that it align with (as much as possible) the product data provided within the affected block.", | ||
| "properties": { | ||
| "operator": { | ||
| "type": "string", | ||
| "enum": ["AND", "OR"] | ||
| }, | ||
| "negate": { | ||
| "type": "boolean" | ||
| }, | ||
| "nodes": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/node" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "node": { | ||
| "description": "Defines a configuration node in an applicability statement.", | ||
| "properties": { | ||
| "operator": { | ||
| "type": "string", | ||
| "enum": ["AND", "OR"] | ||
| }, | ||
| "negate": { | ||
| "type": "boolean" | ||
| }, | ||
| "cpeMatch": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/cpe_match" | ||
| } | ||
| }, | ||
| "purlMatch": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/purl_match" | ||
| } | ||
| } | ||
| }, | ||
| "allOf": [ | ||
| { "required": ["operator"] }, | ||
| { | ||
| "anyOf": [ | ||
| { "required": ["cpeMatch"] }, | ||
| { "required": ["purlMatch"] } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "purl_match": { | ||
| "description": "purl match string or range", | ||
|
There was a problem hiding this comment.
|
||
| "type": "object", | ||
| "properties": { | ||
| "vulnerable": { | ||
| "type": "boolean" | ||
| }, | ||
| "criteria": { | ||
| "description": "Placeholder until we find a formal purl schema", | ||
|
|
||
| "$ref": "#/definitions/uriType" | ||
| }, | ||
| "matchCriteriaId": { | ||
| "$ref": "#/definitions/uuidType" | ||
| }, | ||
| "versionStartExcluding": { | ||
|
There was a problem hiding this comment. For version ranges, purl uses this https://github.com/package-url/purl-spec/blob/main/VERSION-RANGE-SPEC.rst There was a problem hiding this comment. Yes, our plan is to not use the |
||
| "$ref": "#/definitions/version" | ||
| }, | ||
| "versionStartIncluding": { | ||
| "$ref": "#/definitions/version" | ||
| }, | ||
| "versionEndExcluding": { | ||
| "$ref": "#/definitions/version" | ||
| }, | ||
| "versionEndIncluding": { | ||
| "$ref": "#/definitions/version" | ||
| } | ||
| }, | ||
| "required": ["vulnerable", "criteria"], | ||
| "additionalProperties": false | ||
| }, | ||
| "cpeApplicabilityElement": { | ||
| "description": "Affected products defined using an implementation of the CPE Applicability Language, mostly copied/forked from the NIST NVD CVE API v2.0 schema (optional). An operator property allows AND or OR logic between CPEs or combinations of CPEs. The negate and vulnerable Boolean properties allow CPEs to be inverted and/or defined as vulnerable or not. Multiple version fields are provided for capturing ranges of products when defining a CPE Match String Range. NOTE: When defining a cpeApplicability block, it is recommended that it align with (as much as possible) the product data provided within the affected block.", | ||
| "properties": { | ||
|
|
@@ -608,6 +695,12 @@ | |
| "affected": { | ||
| "$ref": "#/definitions/affected" | ||
| }, | ||
| "applicability": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/applicabilityElement" | ||
| } | ||
| }, | ||
| "cpeApplicability": { | ||
| "type": "array", | ||
| "items": { | ||
|
|
@@ -654,11 +747,20 @@ | |
| "$ref": "#/definitions/taxonomyMappings" | ||
| } | ||
| }, | ||
| "allOf": [ | ||
| { | ||
| "required": [ | ||
| "providerMetadata", | ||
| "descriptions", | ||
| "affected", | ||
| "references" | ||
| ] | ||
| }, | ||
| { | ||
| "not": { | ||
| "required": ["applicability", "cpeApplicability"] | ||
| } | ||
| } | ||
| ], | ||
| "patternProperties": { | ||
| "^x_[^.]*$": {} | ||
|
|
@@ -720,6 +822,12 @@ | |
| "affected": { | ||
| "$ref": "#/definitions/affected" | ||
| }, | ||
| "applicability": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/applicabilityElement" | ||
| } | ||
| }, | ||
| "cpeApplicability": { | ||
| "type": "array", | ||
| "items": { | ||
|
|
@@ -766,8 +874,15 @@ | |
| "$ref": "#/definitions/taxonomyMappings" | ||
| } | ||
| }, | ||
| "allOf": [ | ||
| { | ||
| "required": ["providerMetadata"] | ||
| }, | ||
| { | ||
| "not": { | ||
| "required": ["applicability", "cpeApplicability"] | ||
| } | ||
| } | ||
| ], | ||
| "minProperties": 2, | ||
| "patternProperties": { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not use
purl_match?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, this appears to be a naming error. Will correct it.