Skip to content

Type assert the entry bundle when verifying inclusion proof #2755

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

Merged
Hayden-IO merged 2 commits into from
Mar 3, 2026
Merged

Type assert the entry bundle when verifying inclusion proof #2755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0662f30
Type assert the entry bundle when verifying inclusion proof
Hayden-IO Feb 17, 2026
0eeb2ad
Update verify.go
Hayden-IO Mar 3, 2026
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
7 changes: 6 additions & 1 deletion pkg/verify/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"encoding/json"
"errors"
"fmt"
"reflect"

"github.com/cyberphone/json-canonicalization/go/src/webpki.org/jsoncanonicalizer"
"github.com/sigstore/rekor/pkg/generated/client"
Expand Down Expand Up @@ -155,7 +156,11 @@ func VerifyInclusion(ctx context.Context, e *models.LogEntryAnon) error {
}

// Verify the inclusion proof.
entryBytes, err := base64.StdEncoding.DecodeString(e.Body.(string))
b, ok := e.Body.(string)
if !ok {
return fmt.Errorf("entry body must be a string, was %s", reflect.TypeOf(e.Body))
}
entryBytes, err := base64.StdEncoding.DecodeString(b)
if err != nil {
return err
}
Expand Down
23 changes: 22 additions & 1 deletion pkg/verify/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,35 @@ func TestInclusion(t *testing.T) {
},
wantErr: true,
},
{
name: "invalid inclusion - body not string",
e: models.LogEntryAnon{
Body: 123,
IntegratedTime: &time,
LogID: &logID,
LogIndex: conv.Pointer(int64(1)),
Verification: &models.LogEntryAnonVerification{
InclusionProof: &models.InclusionProof{
TreeSize: conv.Pointer(int64(2)),
RootHash: conv.Pointer("5be1758dd2228acfaf2546b4b6ce8aa40c82a3748f3dcb550e0d67ba34f02a45"),
LogIndex: conv.Pointer(int64(1)),
Hashes: []string{
"59a575f157274702c38de3ab1e1784226f391fb79500ebf9f02b4439fb77574c",
},
},
SignedEntryTimestamp: strfmt.Base64("MEUCIHJj8xP+oPTd4BAXhO2lcbRplnKW2FafMiFo0gIDGUcYAiEA80BJ8QikiupGAv3R3dtSvZ1ICsAOQat10cFKPqBkLBM="),
},
},
wantErr: true,
},
} {
t.Run(string(test.name), func(t *testing.T) {
ctx := context.Background()

gotErr := VerifyInclusion(ctx, &test.e)

if (gotErr != nil) != test.wantErr {
t.Fatalf("VerifyInclusion = %t, wantErr %t", gotErr, test.wantErr)
t.Fatalf("VerifyInclusion = %s, wantErr %t", gotErr.Error(), test.wantErr)
}
})
}
Expand Down