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 handling of verify-attestation types for URIs #2159

Merged
merged 3 commits into from Aug 16, 2022
Merged

fix handling of verify-attestation types for URIs #2159

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34a009e
fix handling of verify-attestation types for URIs
otms61 Aug 13, 2022
339b889
test: add a test to verify URI-type attestation
otms61 Aug 16, 2022
fee1370
test: fix cue used in verify-attstation
otms61 Aug 16, 2022
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
11 changes: 8 additions & 3 deletions pkg/policy/attestation.go
View file
Open in desktop
Expand Up @@ -39,8 +39,9 @@ import (
// match the attestation.
func AttestationToPayloadJSON(ctx context.Context, predicateType string, verifiedAttestation oci.Signature) ([]byte, error) {
// Check the predicate up front, no point in wasting time if it's invalid.
predicateURI, ok := options.PredicateTypeMap[predicateType]
if !ok {
predicateURI, err := options.ParsePredicateType(predicateType)

if err != nil {
return nil, fmt.Errorf("invalid predicate type: %s", predicateType)
}

Expand Down Expand Up @@ -132,7 +133,11 @@ func AttestationToPayloadJSON(ctx context.Context, predicateType string, verifie
return nil, fmt.Errorf("marshaling CosignVulnStatement: %w", err)
}
default:
return nil, fmt.Errorf("unsupported predicate type: %s", predicateType)
// Valid URI type reaches here.
payload, err = json.Marshal(statement)
if err != nil {
return nil, fmt.Errorf("generating Statement: %w", err)
}
}
return payload, nil
}