Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Switch to newer DSSE rekor type #3299

Merged
merged 8 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- toc -->

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

## Unreleased

### Unreleased: DSSE Rekor Type

- When uploading signed provenance to the log, the entry created in the log is now
a DSSE Rekor type. This fixes a bug where the current intoto type does not
persist provenance signatures. The attestation will no longer be persisted
in Rekor (#3299)

## v1.10.0

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

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

Expand Down
2 changes: 1 addition & 1 deletion signing/sigstore/rekor.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (r *Rekor) Upload(ctx context.Context, att signing.Attestation) (signing.Lo
return nil, fmt.Errorf("creating rekor client: %w", err)
}
// TODO: Is it a bug that we need []byte(string(k.Cert)) or else we hit invalid PEM?
logEntry, err := cosign.TLogUploadInTotoAttestation(ctx, rekorClient, att.Bytes(), []byte(string(att.Cert())))
logEntry, err := cosign.TLogUploadDSSEEnvelope(ctx, rekorClient, att.Bytes(), []byte(string(att.Cert())))
if err != nil {
return nil, fmt.Errorf("uploading attestation: %w", err)
}
Expand Down