Skip to content

Commit 8869c8a

Browse files
fix: Switch to newer DSSE rekor type (#3299)
The intoto v001 type does not persist signatures of the DSSE envelope, as noted in sigstore/rekor#973. We introduced an intoto v002 type shortly after to fix this, but since then, we've introduced another newer type, DSSE v001, which also does not persist the attestation in Rekor (as we discourage using Rekor as storage). I also updated the verifier in slsa-framework/slsa-verifier#742 to search for both Rekor entry types. # Summary ... ## Testing Process ... ## Checklist - [ ] Review the contributing [guidelines](./../CONTRIBUTING.md) - [ ] Add a reference to related issues in the PR description. - [ ] Update documentation if applicable. - [ ] Add unit tests if applicable. - [ ] Add changes to the [CHANGELOG](./../CHANGELOG.md) if applicable. --------- Signed-off-by: Hayden Blauzvern <[email protected]> Signed-off-by: Hayden B <[email protected]> Signed-off-by: laurentsimon <[email protected]> Co-authored-by: laurentsimon <[email protected]>
1 parent 9d81ca7 commit 8869c8a

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

CHANGELOG.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
<!-- toc -->
1111

12+
- [Unreleased](#unreleased)
13+
- [Unreleased: DSSE Rekor Type](#unreleased-dsse-rekor-type)
1214
- [v1.10.0](#v1100)
1315
- [v1.10.0: TUF fix](#v1100-tuf-fix)
1416
- [v1.10.0: Gradle Builder](#v1100-gradle-builder)
@@ -98,9 +100,18 @@ Use the format "X.Y.Z: Go builder" etc. for format headers to avoid header name
98100
duplication."
99101
-->
100102

103+
## Unreleased
104+
105+
### Unreleased: DSSE Rekor Type
106+
107+
- When uploading signed provenance to the log, the entry created in the log is now
108+
a DSSE Rekor type. This fixes a bug where the current intoto type does not
109+
persist provenance signatures. The attestation will no longer be persisted
110+
in Rekor (#3299)
111+
101112
## v1.10.0
102113

103-
Release [v1.10.0] includes bug fixes and new features.
114+
Release [v1.10.0](https://github.com/slsa-framework/slsa-github-generator/releases/tag/v1.10.0) includes bug fixes and new features.
104115

105116
See the [full change list](https://github.com/slsa-framework/slsa-github-generator/compare/v1.9.0...v1.10.0).
106117

signing/sigstore/rekor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (r *Rekor) Upload(ctx context.Context, att signing.Attestation) (signing.Lo
8080
return nil, fmt.Errorf("creating rekor client: %w", err)
8181
}
8282
// TODO: Is it a bug that we need []byte(string(k.Cert)) or else we hit invalid PEM?
83-
logEntry, err := cosign.TLogUploadInTotoAttestation(ctx, rekorClient, att.Bytes(), []byte(string(att.Cert())))
83+
logEntry, err := cosign.TLogUploadDSSEEnvelope(ctx, rekorClient, att.Bytes(), []byte(string(att.Cert())))
8484
if err != nil {
8585
return nil, fmt.Errorf("uploading attestation: %w", err)
8686
}

0 commit comments

Comments
 (0)