Skip to content

Commit

Permalink
update vuln attestation to (opiniatedly) follow intoto/vulns v0.1 spec (
Browse files Browse the repository at this point in the history 
#2194)

Signed-off-by: Brandon Lum <lumjjb@gmail.com>
  • Loading branch information
@lumjjb
lumjjb authored Oct 21, 2024
1 parent 0b6f4a9 commit ff4744b
Show file tree
Hide file tree
Showing 11 changed files with 109 additions and 154 deletions.
9 changes: 6 additions & 3 deletions internal/testing/dochelper/dochelper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

jsoniter "github.com/json-iterator/go"

attestation_vuln "github.com/guacsec/guac/pkg/certifier/attestation"
attestation_vuln "github.com/guacsec/guac/pkg/certifier/attestation/vuln"
"github.com/guacsec/guac/pkg/handler/processor"
)

Expand Down Expand Up @@ -173,8 +173,11 @@ func DocEqualWithTimestamp(gotDoc, wantDoc *processor.Document) (bool, error) {
}

// change the timestamp to match else it will fail to compare
want.Predicate.Metadata.ScannedOn = &testTime
got.Predicate.Metadata.ScannedOn = &testTime
want.Predicate.Metadata.ScanStartedOn = &testTime
got.Predicate.Metadata.ScanStartedOn = &testTime

want.Predicate.Metadata.ScanFinishedOn = &testTime
got.Predicate.Metadata.ScanFinishedOn = &testTime

return reflect.DeepEqual(want, got), nil
}
Expand Down
15 changes: 3 additions & 12 deletions internal/testing/testdata/exampledata/certify-novuln.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,13 @@
],
"predicateType": "https://in-toto.io/attestation/vulns/v0.1",
"predicate": {
"invocation": {
"parameters": [""],
"uri": "guac",
"event_id": "",
"producer_id": "guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {
"uri": "",
"version": ""
}
"version": "0.0.14"
},
"metadata": {
"scannedOn": "2022-11-21T17:45:50.52Z"
"scanStartedOn": "2022-11-21T17:45:50.52Z",
"scanFinishedOn": "2022-11-21T17:45:50.52Z"
}
}
}
31 changes: 8 additions & 23 deletions internal/testing/testdata/exampledata/certify-vuln.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,26 @@
],
"predicateType": "https://in-toto.io/attestation/vulns/v0.1",
"predicate": {
"invocation": {
"parameters": [""],
"uri": "guac",
"event_id": "",
"producer_id": "guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {
"uri": "",
"version": ""
},
"result": [{
"vulnerability_id": "GHSA-7rjr-3q55-vv33",
"aliases": [""]
"id": "GHSA-7rjr-3q55-vv33"
}, {
"vulnerability_id": "GHSA-8489-44mv-ggj8",
"aliases": [""]
"id": "GHSA-8489-44mv-ggj8"
}, {
"vulnerability_id": "GHSA-fxph-q3j8-mv87",
"aliases": [""]
"id": "GHSA-fxph-q3j8-mv87"
}, {
"vulnerability_id": "GHSA-jfh8-c2jp-5v3q",
"aliases": [""]
"id": "GHSA-jfh8-c2jp-5v3q"
}, {
"vulnerability_id": "GHSA-p6xc-xr62-6r2g",
"aliases": [""]
"id": "GHSA-p6xc-xr62-6r2g"
}, {
"vulnerability_id": "GHSA-vwqq-5vrc-xw9h",
"aliases": [""]
"id": "GHSA-vwqq-5vrc-xw9h"
}]
},
"metadata": {
"scannedOn": "2022-11-21T17:45:50.52Z"
"scanStartedOn": "2022-11-21T17:45:50.52Z",
"scanFinishedOn": "2022-11-21T17:45:50.52Z"
}
}
}
98 changes: 32 additions & 66 deletions internal/testing/testdata/testdata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1893,23 +1893,20 @@ var (
],
"predicate_type":"https://in-toto.io/attestation/vulns/v0.1",
"predicate":{
"invocation":{
"uri":"guac",
"producer_id":"guacsec/guac"
},
"scanner":{
"uri":"osv.dev",
"version":"0.0.14",
"db":{
},
"result":[
{
"vulnerability_id":"GHSA-599f-7c49-w659"
"id":"GHSA-599f-7c49-w659"
}
]
},
"metadata":{
"scannedOn":"2022-11-22T13:18:58.063182-05:00"
"scanStartedOn":"2022-11-22T13:19:18.825699-05:00",
"scanFinishedOn":"2022-11-22T13:19:18.825699-05:00"
}
}
}`
Expand All @@ -1922,17 +1919,13 @@ var (
],
"predicate_type":"https://in-toto.io/attestation/vulns/v0.1",
"predicate":{
"invocation":{
"uri":"guac",
"producer_id":"guacsec/guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {}
"version": "0.0.14"
},
"metadata":{
"scannedOn":"2022-11-22T13:19:18.825699-05:00"
"scanStartedOn":"2022-11-22T13:19:18.825699-05:00",
"scanFinishedOn":"2022-11-22T13:19:18.825699-05:00"
}
}
}`
Expand All @@ -1945,17 +1938,13 @@ var (
],
"predicate_type":"https://in-toto.io/attestation/vulns/v0.1",
"predicate":{
"invocation":{
"uri":"guac",
"producer_id":"guacsec/guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {}
"version": "0.0.14"
},
"metadata":{
"scannedOn":"2022-11-22T13:19:18.825699-05:00"
"scanStartedOn":"2022-11-22T13:19:18.825699-05:00",
"scanFinishedOn":"2022-11-22T13:19:18.825699-05:00"
}
}
}`
Expand All @@ -1968,38 +1957,35 @@ var (
],
"predicate_type":"https://in-toto.io/attestation/vulns/v0.1",
"predicate":{
"invocation":{
"uri":"guac",
"producer_id":"guacsec/guac"
},
"scanner":{
"uri":"osv.dev",
"version":"0.0.14",
"db":{
},
"result":[
{
"vulnerability_id":"GHSA-7rjr-3q55-vv33"
"id":"GHSA-7rjr-3q55-vv33"
},
{
"vulnerability_id":"GHSA-8489-44mv-ggj8"
"id":"GHSA-8489-44mv-ggj8"
},
{
"vulnerability_id":"GHSA-fxph-q3j8-mv87"
"id":"GHSA-fxph-q3j8-mv87"
},
{
"vulnerability_id":"GHSA-jfh8-c2jp-5v3q"
"id":"GHSA-jfh8-c2jp-5v3q"
},
{
"vulnerability_id":"GHSA-p6xc-xr62-6r2g"
"id":"GHSA-p6xc-xr62-6r2g"
},
{
"vulnerability_id":"GHSA-vwqq-5vrc-xw9h"
"id":"GHSA-vwqq-5vrc-xw9h"
}
]
},
"metadata":{
"scannedOn":"2022-11-22T13:18:31.607996-05:00"
"scanStartedOn":"2022-11-22T13:19:18.825699-05:00",
"scanFinishedOn":"2022-11-22T13:19:18.825699-05:00"
}
}
}`
Expand Down Expand Up @@ -2029,17 +2015,13 @@ var (
],
"predicate_type": "https://in-toto.io/attestation/vulns/v0.1",
"predicate": {
"invocation": {
"uri": "guac",
"producer_id": "guacsec/guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {}
"version": "0.0.14"
},
"metadata": {
"scannedOn": "2023-02-15T11:10:08.986308-08:00"
"scanStartedOn":"2022-11-22T13:19:18.825699-05:00",
"scanFinishedOn":"2022-11-22T13:19:18.825699-05:00"
}
}
}`
Expand All @@ -2053,17 +2035,13 @@ var (
],
"predicate_type": "https://in-toto.io/attestation/vulns/v0.1",
"predicate": {
"invocation": {
"uri": "guac",
"producer_id": "guacsec/guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {}
"version": "0.0.14"
},
"metadata": {
"scannedOn": "2023-02-15T11:10:08.986401-08:00"
"scanStartedOn":"2022-11-22T13:19:18.825699-05:00",
"scanFinishedOn":"2022-11-22T13:19:18.825699-05:00"
}
}
}`
Expand All @@ -2077,17 +2055,13 @@ var (
],
"predicate_type": "https://in-toto.io/attestation/vulns/v0.1",
"predicate": {
"invocation": {
"uri": "guac",
"producer_id": "guacsec/guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {}
"version": "0.0.14"
},
"metadata": {
"scannedOn": "2023-02-15T11:10:08.98646-08:00"
"scanStartedOn":"2022-11-22T13:19:18.825699-05:00",
"scanFinishedOn":"2022-11-22T13:19:18.825699-05:00"
}
}
}`
Expand All @@ -2101,22 +2075,18 @@ var (
],
"predicate_type": "https://in-toto.io/attestation/vulns/v0.1",
"predicate": {
"invocation": {
"uri": "guac",
"producer_id": "guacsec/guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {},
"result": [
{
"vulnerability_id": "GHSA-9ph3-v2vh-3qx7"
"id": "GHSA-9ph3-v2vh-3qx7"
}
]
},
"metadata": {
"scannedOn": "2023-02-15T11:10:08.986506-08:00"
"scanStartedOn":"2023-02-15T11:10:08.986506-08:00",
"scanFinishedOn":"2023-02-15T11:10:08.986506-08:00"
}
}
}`
Expand All @@ -2130,22 +2100,18 @@ var (
],
"predicate_type": "https://in-toto.io/attestation/vulns/v0.1",
"predicate": {
"invocation": {
"uri": "guac",
"producer_id": "guacsec/guac"
},
"scanner": {
"uri": "osv.dev",
"version": "0.0.14",
"db": {},
"result": [
{
"vulnerability_id": "GHSA-53jx-vvf9-4x38"
"id": "GHSA-53jx-vvf9-4x38"
}
]
},
"metadata": {
"scannedOn": "2023-02-15T11:10:08.986592-08:00"
"scanStartedOn":"2023-02-15T11:10:08.986506-08:00",
"scanFinishedOn":"2023-02-15T11:10:08.986506-08:00"
}
}
}`
Expand Down
4 changes: 4 additions & 0 deletions ...tifier/attestation/attestation_license.go → ...ttestation/license/attestation_license.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,7 @@ type ClearlyDefinedPredicate struct {
Definition Definition `json:"definition,omitempty"`
Metadata Metadata `json:"metadata,omitempty"`
}

type Metadata struct {
ScannedOn *time.Time `json:"scannedOn,omitempty"`
}
Loading

0 comments on commit ff4744b

Please sign in to comment.