Skip to content

Commit

Permalink
Merge branch 'feat/addingType' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathild3r
mathild3r committed May 27, 2021
2 parents c7994a0 + 2c98869 commit 502cf11
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
8 changes: 4 additions & 4 deletions src/lib/convert-issue-to-spdx.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function getVulnerabilityRating(
};

const vulnerabilityRating: types.VulnerabilityRating = {
method: issue.CVSSv3 ? 'CVSS_3' : 'undefined', // must be CVSS_2, CVSS_3, OWASP_RISK or OTHER
method: issue.CVSSv3 ? 'CVSS_3' : undefined, // must be CVSS_2, CVSS_3, OWASP_RISK or OTHER
score: [vulnerabilityRatingScore],
severity: issue.severity, // exploitability score of the vulnerability either None, Low, Medium, High or Critical
vector: issue.CVSSv3,
Expand All @@ -28,7 +28,7 @@ function getExternalReferencesRelationships(
externalReferencesRelationship = references
? references.map((step) => {
return {
category: undefined, // not amndatory,but should be either ADVISORY, ARTICLE, FIX, REPORT or OTHER.
category: 'ADVISORY', // not mandatory,but should be either ADVISORY, ARTICLE, FIX, REPORT or OTHER.
locator: step.url, // url
};
})
Expand Down Expand Up @@ -74,7 +74,7 @@ function getVulnerabilityRelationship(
type: 'AFFECTS',
};

const vulnerabilityfoundBy: types.AffectedBy = {
const vulnerabilityFoundBy: types.AffectedBy = {
to: issue.credit,
type: 'FOUND_BY',
};
Expand All @@ -95,7 +95,7 @@ function getVulnerabilityRelationship(
const relationship: types.VulnerabilityRelationship[] = [
{
affect: vulnerabilityAffect,
foundBy: vulnerabilityfoundBy,
foundBy: vulnerabilityFoundBy,
suppliedBy: vulnerabilitySuppliedBy,
ratedBy: ratedBy,
},
Expand Down
4 changes: 2 additions & 2 deletions src/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface SPDXv3 {
// Single line of text with the following keywords:
// "Person: person name" and optional "(email)"
// "Organization: organization" and optional "(email)"
// "Tool: toolidentifier-version"
// "Tool: toolIdentifier-version"
creator: string;
vulnerabilities: Vulnerability[];
defectResponses?: DefectResponse[];
Expand Down Expand Up @@ -62,7 +62,7 @@ export interface RatedBy {
}

export interface VulnerabilityRating {
method: string; // must be CVSS_2, CVSS_3, OWASP_RISK or OTHER
method: string | undefined; // must be CVSS_2, CVSS_3, OWASP_RISK or OTHER
score: VulnerabilityRatingScore[];
severity: string; // exploitability score of the vulnerability either None, Low, Medium, High or Critical
vector: string; // textual representation of the metric values used
Expand Down
2 changes: 1 addition & 1 deletion test/unit/lib/__snapshots__/convert-issue-to-spdx.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Upgrade \`json\` to version 2.3.0 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://www.ruby-lang.org/en/news/2020/03/19/json-dos-cve-2020-10663/",
},
],
Expand Down
54 changes: 27 additions & 27 deletions test/unit/lib/__snapshots__/index.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Upgrade \`json\` to version 2.3.0 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://www.ruby-lang.org/en/news/2020/03/19/json-dos-cve-2020-10663/",
},
],
Expand Down Expand Up @@ -145,7 +145,7 @@ Affected versions of this gem are vulnerable to arbitrary command executions due
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "http://rubysec.com/advisories/OSVDB-108579",
},
],
Expand Down Expand Up @@ -216,7 +216,7 @@ Affected versions of this gem are vulnerable due to a flaw in \`command/basic.rb
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "http://rubysec.com/advisories/CVE-2014-5002",
},
],
Expand Down Expand Up @@ -296,15 +296,15 @@ Upgrade \`django\` to version 2.2.19, 3.0.13, 3.1.7 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://www.djangoproject.com/weblog/2021/feb/19/security-releases/",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/be8237c7cce24b06aabde0b97afce98ddabbe3b6",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://snyk.io/blog/cache-poisoning-in-popular-open-source-packages/",
},
],
Expand Down Expand Up @@ -410,23 +410,23 @@ Upgrade \`django\` to version 2.2.20, 3.0.14, 3.1.8 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/2820fd1be5dfccbf1216c3845fad8580502473e1",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/4036d62bda0e9e9f6172943794b744a454ca49c2",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/cca0d98118cccf9ae0c6dcf2d6c57fc50469fbf0",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/d4d800ca1addc4141e03c5440a849bb64d1582cd",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/e7fba62248f604c76da4f23dcf1db4a57b0808ea",
},
],
Expand Down Expand Up @@ -529,11 +529,11 @@ Upgrade \`django\` to version 2.2.21, 3.1.9, 3.2.1 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://www.djangoproject.com/weblog/2021/may/04/security-releases/",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/c98f446c188596d4ba6de71d1b77b4a6c5c2a007",
},
],
Expand Down Expand Up @@ -611,19 +611,19 @@ Upgrade \`django\` to version 3.2.2, 3.1.10, 2.2.22 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://www.djangoproject.com/weblog/2021/may/06/security-releases/",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/commit/e1e81aa1c4427411e3c68facdd761229ffea6f6f",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/django/django/pull/14360",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://www.mail-archive.com/[email protected]/msg1804086.html",
},
],
Expand Down Expand Up @@ -766,11 +766,11 @@ Upgrade \`jinja2\` to version 2.11.3 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/pallets/jinja/blob/ab81fd9c277900c85da0c322a2ff9d68a235b2e6/src/jinja2/utils.py%23L20",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/pallets/jinja/pull/1343",
},
],
Expand Down Expand Up @@ -843,7 +843,7 @@ Upgrade \`jinja2\` to version 2.10.1 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://palletsprojects.com/blog/jinja-2-10-1-released",
},
],
Expand Down Expand Up @@ -920,23 +920,23 @@ FileSystemBytecodeCache in Jinja2 2.7.2 does not properly create temporary direc
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/mitsuhiko/jinja2/commit/acb672b6a179567632e032f547582f30fa2f4aa7",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/mitsuhiko/jinja2/pull/292",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/mitsuhiko/jinja2/pull/296",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-0012",
},
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://bugzilla.redhat.com/show_bug.cgi?id=1051421",
},
],
Expand Down Expand Up @@ -1009,7 +1009,7 @@ Upgrade \`jinja2\` to version 2.8.1 or higher.
Object {
"externalReferencesRelationships": Array [
Object {
"category": undefined,
"category": "ADVISORY",
"locator": "https://github.com/pallets/jinja/commit/9b53045c34e61013dc8f09b7e52a555fa16bed16",
},
],
Expand Down Expand Up @@ -1098,7 +1098,7 @@ Upgrade \`jinja2\` to version 2.8.1 or higher.
"cwes": Array [],
"rating": Array [
Object {
"method": "undefined",
"method": undefined,
"score": Array [
Object {
"base": undefined,
Expand Down

0 comments on commit 502cf11

Please sign in to comment.