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.

Sign up for GitHub

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

Jump to bottom

Fix crash with missing checkpoint #260

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Fix crash with missing checkpoint #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 146 additions & 8 deletions pkg/bundle/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (

protobundle "github.com/sigstore/protobuf-specs/gen/pb-go/bundle/v1"
protocommon "github.com/sigstore/protobuf-specs/gen/pb-go/common/v1"
v1 "github.com/sigstore/protobuf-specs/gen/pb-go/common/v1"
rekorv1 "github.com/sigstore/protobuf-specs/gen/pb-go/rekor/v1"
_ "github.com/sigstore/rekor/pkg/types/hashedrekord"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -280,7 +279,79 @@ func Test_validate(t *testing.T) {
},
},
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &v1.PublicKeyIdentifier{},
PublicKey: &protocommon.PublicKeyIdentifier{},
},
},
Content: &protobundle.Bundle_MessageSignature{},
},
},
},
{
name: "v0.1 with inclusion promise & proof without checkpoint",
pb: Bundle{
Bundle: &protobundle.Bundle{
MediaType: "application/vnd.dev.sigstore.bundle+json;version=0.1",
VerificationMaterial: &protobundle.VerificationMaterial{
TlogEntries: []*rekorv1.TransparencyLogEntry{
{
LogIndex: 42,
LogId: &protocommon.LogId{
KeyId: []byte("deadbeef"),
},
KindVersion: &rekorv1.KindVersion{
Kind: "hashedrekord",
Version: "0.0.1",
},
IntegratedTime: 1,
CanonicalizedBody: canonicalTlogBody,
InclusionProof: &rekorv1.InclusionProof{
LogIndex: 42,
RootHash: []byte("b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c"),
},
InclusionPromise: &rekorv1.InclusionPromise{
SignedEntryTimestamp: []byte("1"),
},
},
},
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &protocommon.PublicKeyIdentifier{},
},
},
Content: &protobundle.Bundle_MessageSignature{},
},
},
wantErr: true,
},
{
name: "v0.1 with inclusion proof & promise",
pb: Bundle{
Bundle: &protobundle.Bundle{
MediaType: "application/vnd.dev.sigstore.bundle+json;version=0.1",
VerificationMaterial: &protobundle.VerificationMaterial{
TlogEntries: []*rekorv1.TransparencyLogEntry{
{
LogIndex: 42,
LogId: &protocommon.LogId{
KeyId: []byte("deadbeef"),
},
KindVersion: &rekorv1.KindVersion{
Kind: "hashedrekord",
Version: "0.0.1",
},
IntegratedTime: 1,
CanonicalizedBody: canonicalTlogBody,
InclusionProof: &rekorv1.InclusionProof{
LogIndex: 42,
RootHash: []byte("b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c"),
Checkpoint: &rekorv1.Checkpoint{Envelope: "checkpoint"},
},
InclusionPromise: &rekorv1.InclusionPromise{
SignedEntryTimestamp: []byte("1"),
},
},
},
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &protocommon.PublicKeyIdentifier{},
},
},
Content: &protobundle.Bundle_MessageSignature{},
Expand Down Expand Up @@ -308,7 +379,7 @@ func Test_validate(t *testing.T) {
},
},
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &v1.PublicKeyIdentifier{},
PublicKey: &protocommon.PublicKeyIdentifier{},
},
},
Content: &protobundle.Bundle_MessageSignature{},
Expand All @@ -317,7 +388,40 @@ func Test_validate(t *testing.T) {
wantErr: true,
},
{
name: "v0.2 with inclusion proof",
name: "v0.2 with inclusion proof without checkpoint",
pb: Bundle{
Bundle: &protobundle.Bundle{
MediaType: "application/vnd.dev.sigstore.bundle+json;version=0.2",
VerificationMaterial: &protobundle.VerificationMaterial{
TlogEntries: []*rekorv1.TransparencyLogEntry{
{
LogIndex: 42,
LogId: &protocommon.LogId{
KeyId: []byte("deadbeef"),
},
KindVersion: &rekorv1.KindVersion{
Kind: "hashedrekord",
Version: "0.0.1",
},
IntegratedTime: 1,
CanonicalizedBody: canonicalTlogBody,
InclusionProof: &rekorv1.InclusionProof{
LogIndex: 42,
RootHash: []byte("b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c"),
},
},
},
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &protocommon.PublicKeyIdentifier{},
},
},
Content: &protobundle.Bundle_MessageSignature{},
},
},
wantErr: true,
},
{
name: "v0.2 with inclusion proof with empty checkpoint",
pb: Bundle{
Bundle: &protobundle.Bundle{
MediaType: "application/vnd.dev.sigstore.bundle+json;version=0.2",
Expand All @@ -342,7 +446,41 @@ func Test_validate(t *testing.T) {
},
},
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &v1.PublicKeyIdentifier{},
PublicKey: &protocommon.PublicKeyIdentifier{},
},
},
Content: &protobundle.Bundle_MessageSignature{},
},
},
wantErr: true,
},
{
name: "v0.2 with inclusion proof",
pb: Bundle{
Bundle: &protobundle.Bundle{
MediaType: "application/vnd.dev.sigstore.bundle+json;version=0.2",
VerificationMaterial: &protobundle.VerificationMaterial{
TlogEntries: []*rekorv1.TransparencyLogEntry{
{
LogIndex: 42,
LogId: &protocommon.LogId{
KeyId: []byte("deadbeef"),
},
KindVersion: &rekorv1.KindVersion{
Kind: "hashedrekord",
Version: "0.0.1",
},
IntegratedTime: 1,
CanonicalizedBody: canonicalTlogBody,
InclusionProof: &rekorv1.InclusionProof{
LogIndex: 42,
RootHash: []byte("b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c"),
Checkpoint: &rekorv1.Checkpoint{Envelope: "checkpoint"},
},
},
},
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &protocommon.PublicKeyIdentifier{},
},
},
Content: &protobundle.Bundle_MessageSignature{},
Expand Down Expand Up @@ -370,7 +508,7 @@ func Test_validate(t *testing.T) {
InclusionProof: &rekorv1.InclusionProof{
LogIndex: 42,
RootHash: []byte("b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c"),
Checkpoint: &rekorv1.Checkpoint{},
Checkpoint: &rekorv1.Checkpoint{Envelope: "checkpoint"},
},
},
},
Expand Down Expand Up @@ -404,7 +542,7 @@ func Test_validate(t *testing.T) {
InclusionProof: &rekorv1.InclusionProof{
LogIndex: 42,
RootHash: []byte("b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c"),
Checkpoint: &rekorv1.Checkpoint{},
Checkpoint: &rekorv1.Checkpoint{Envelope: "checkpoint"},
},
},
},
Expand Down Expand Up @@ -818,7 +956,7 @@ func Test_BundleValidation(t *testing.T) {
Content: &protobundle.Bundle_DsseEnvelope{},
VerificationMaterial: &protobundle.VerificationMaterial{
Content: &protobundle.VerificationMaterial_PublicKey{
PublicKey: &v1.PublicKeyIdentifier{},
PublicKey: &protocommon.PublicKeyIdentifier{},
},
TimestampVerificationData: &protobundle.TimestampVerificationData{},
},
Expand Down
7 changes: 7 additions & 0 deletions pkg/tlog/entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ func ParseEntry(protoEntry *v1.TransparencyLogEntry) (entry *Entry, err error) {

rootHash := hex.EncodeToString(protoEntry.InclusionProof.RootHash)

if protoEntry.InclusionProof.Checkpoint == nil {
return nil, fmt.Errorf("inclusion proof missing required checkpoint")
}
if protoEntry.InclusionProof.Checkpoint.Envelope == "" {
return nil, fmt.Errorf("inclusion proof checkpoint empty")
}

inclusionProof = &models.InclusionProof{
LogIndex: swag.Int64(protoEntry.InclusionProof.LogIndex),
RootHash: &rootHash,
Expand Down
Loading