Skip to content

chore: update err msg for policy verification #294

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
shizhMSFT merged 2 commits into from
Apr 7, 2023
Merged

chore: update err msg for policy verification #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
870200e
chore: update err msg for policy verification
qweeah Mar 29, 2023
c830850
change err msg
qweeah Mar 30, 2023
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
4 changes: 2 additions & 2 deletions verifier/trustpolicy/trustpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (policyDoc *Document) Validate() error {
// Verify signature verification is valid
verificationLevel, err := statement.SignatureVerification.GetVerificationLevel()
if err != nil {
return fmt.Errorf("trust policy statement %q has invalid signatureVerification. Error: %w", statement.Name, err)
return fmt.Errorf("trust policy statement %q has invalid signatureVerification: %w", statement.Name, err)
}

// Any signature verification other than "skip" needs a trust store and
Expand Down Expand Up @@ -289,7 +289,7 @@ func LoadDocument() (*Document, error) {
// SignatureVerification struct throws error if SignatureVerification is invalid
func (signatureVerification *SignatureVerification) GetVerificationLevel() (*VerificationLevel, error) {
if signatureVerification.VerificationLevel == "" {
return nil, errors.New("trust policy statement is missing or has empty signature verification level, it must be specified")
return nil, errors.New("signature verification level is empty or missing in the trust policy statement")
}

var baseLevel *VerificationLevel
Expand Down
2 changes: 1 addition & 1 deletion verifier/trustpolicy/trustpolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ func TestValidateInvalidPolicyDocument(t *testing.T) {
policyStatement.SignatureVerification = SignatureVerification{VerificationLevel: "invalid"}
policyDoc.TrustPolicies = []TrustPolicy{policyStatement}
err = policyDoc.Validate()
if err == nil || err.Error() != "trust policy statement \"test-statement-name\" has invalid signatureVerification. Error: invalid signature verification level \"invalid\"" {
if err == nil || err.Error() != "trust policy statement \"test-statement-name\" has invalid signatureVerification: invalid signature verification level \"invalid\"" {
t.Fatalf("policy statement with invalid SignatureVerification should return error")
}

Expand Down