Skip to content

Commit a2a84a6

Browse files
kanywststeiza
andauthored
Update cert identity verify functions to ensure some criteria is specified (#645)
Signed-off-by: Zach Steindler <[email protected]> Co-authored-by: Zach Steindler <[email protected]>
1 parent 4594ab4 commit a2a84a6

2 files changed

Lines changed: 20 additions & 10 deletions

File tree

‎pkg/verify/certificate_identity.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ func (s *SubjectAlternativeNameMatcher) MarshalJSON() ([]byte, error) {
118118
// Verify checks if the actualCert matches the SANMatcher's Value and
119119
// Regexp – if those values have been provided.
120120
func (s SubjectAlternativeNameMatcher) Verify(actualCert certificate.Summary) error {
121+
if s.SubjectAlternativeName == "" && s.Regexp.String() == "" {
122+
return errors.New("when verifying a certificate identity, there must be subject alternative name criteria")
123+
}
121124
if s.SubjectAlternativeName != "" &&
122125
actualCert.SubjectAlternativeName != s.SubjectAlternativeName {
123126
return &ErrValueMismatch{"SAN", string(s.SubjectAlternativeName), string(actualCert.SubjectAlternativeName)}
@@ -150,6 +153,9 @@ func (i *IssuerMatcher) MarshalJSON() ([]byte, error) {
150153
}
151154

152155
func (i IssuerMatcher) Verify(actualCert certificate.Summary) error {
156+
if i.Issuer == "" && i.Regexp.String() == "" {
157+
return errors.New("when verifying a certificate identity, must specify Issuer criteria")
158+
}
153159
if i.Issuer != "" &&
154160
actualCert.Issuer != i.Issuer {
155161
return &ErrValueMismatch{"issuer", string(i.Issuer), string(actualCert.Issuer)}

‎pkg/verify/certificate_identity_test.go‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,27 @@ func TestCertificateIdentityVerify(t *testing.T) {
5858
}
5959

6060
// First, let's test happy paths:
61-
issuerOnlyID, _ := certIDForTesting("", "", ActionsIssuerValue, "", "")
62-
assert.NoError(t, issuerOnlyID.Verify(actualCert))
61+
values, _ := certIDForTesting(SigstoreSanValue, "", ActionsIssuerValue, "", "")
62+
assert.NoError(t, values.Verify(actualCert))
6363

64-
issuerOnlyRegex, _ := certIDForTesting("", "", "", ActionsIssuerRegex, "")
65-
assert.NoError(t, issuerOnlyRegex.Verify(actualCert))
66-
67-
sanValueOnly, _ := certIDForTesting(SigstoreSanValue, "", "", "", "")
68-
assert.NoError(t, sanValueOnly.Verify(actualCert))
69-
70-
sanRegexOnly, _ := certIDForTesting("", SigstoreSanRegex, "", "", "")
71-
assert.NoError(t, sanRegexOnly.Verify(actualCert))
64+
regexMatches, _ := certIDForTesting("", SigstoreSanRegex, "", ActionsIssuerRegex, "")
65+
assert.NoError(t, regexMatches.Verify(actualCert))
7266

7367
// multiple values can be specified
7468
sanRegexAndIssuer, _ := certIDForTesting("", SigstoreSanRegex, ActionsIssuerValue, "", "github-hosted")
7569
assert.NoError(t, sanRegexAndIssuer.Verify(actualCert))
7670

7771
// unhappy paths:
72+
// ensure we error when underspecified
73+
empty, _ := certIDForTesting("", "", "", "", "")
74+
assert.Error(t, empty.Verify(actualCert))
75+
76+
justSan, _ := certIDForTesting(SigstoreSanValue, "", "", "", "")
77+
assert.Error(t, justSan.Verify(actualCert))
78+
79+
justIssuerRegex, _ := certIDForTesting("", "", "", ActionsIssuerRegex, "")
80+
assert.Error(t, justIssuerRegex.Verify(actualCert))
81+
7882
// wrong issuer
7983
sanRegexAndWrongIssuer, _ := certIDForTesting("", SigstoreSanRegex, "https://token.actions.example.com", "", "")
8084
errValueMismatch := &ErrValueMismatch{}

0 commit comments

Comments
 (0)