-
Notifications
You must be signed in to change notification settings - Fork 139
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move email principal to package (#620)
Signed-off-by: Nathan Smith <[email protected]>
- Loading branch information
Showing
5 changed files
with
429 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,7 @@ import ( | |
| "testing" | ||
|
|
||
| ct "github.com/google/certificate-transparency-go" | ||
| "github.com/sigstore/fulcio/pkg/challenges" | ||
| "github.com/sigstore/fulcio/pkg/ca/x509ca" | ||
| "github.com/sigstore/fulcio/pkg/test" | ||
| "github.com/sigstore/sigstore/pkg/cryptoutils" | ||
| "github.com/sigstore/sigstore/pkg/signature" | ||
|
|
@@ -156,6 +156,20 @@ func TestIntermediateCAVerifyCertChain(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| type testPrincipal struct{} | ||
|
|
||
| func (tp testPrincipal) Name(context.Context) string { | ||
| return "doesntmatter" | ||
| } | ||
|
|
||
| func (tp testPrincipal) Embed(ctx context.Context, cert *x509.Certificate) (err error) { | ||
| cert.EmailAddresses = []string{"[email protected]"} | ||
| cert.ExtraExtensions, err = x509ca.Extensions{ | ||
| Issuer: "example.com", | ||
| }.Render() | ||
| return | ||
| } | ||
|
|
||
| func TestCreatePrecertificateAndIssueFinalCertificate(t *testing.T) { | ||
| rootCert, rootKey, _ := test.GenerateRootCA() | ||
| subCert, subKey, _ := test.GenerateSubordinateCA(rootCert, rootKey) | ||
|
|
@@ -164,11 +178,8 @@ func TestCreatePrecertificateAndIssueFinalCertificate(t *testing.T) { | |
| certChain := []*x509.Certificate{subCert, rootCert} | ||
|
|
||
| ica := IntermediateCA{Certs: certChain, Signer: subKey} | ||
| precsc, err := ica.CreatePrecertificate(context.TODO(), &challenges.ChallengeResult{ | ||
| Issuer: "iss", | ||
| TypeVal: challenges.EmailValue, | ||
| Value: "[email protected]", | ||
| }, priv.Public()) | ||
|
|
||
| precsc, err := ica.CreatePrecertificate(context.TODO(), testPrincipal{}, priv.Public()) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("error generating precertificate: %v", err) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,9 +29,7 @@ import ( | |
| "errors" | ||
| "fmt" | ||
| "net/url" | ||
| "reflect" | ||
| "testing" | ||
| "unsafe" | ||
|
|
||
| "github.com/coreos/go-oidc/v3/oidc" | ||
| "github.com/google/go-cmp/cmp" | ||
|
|
@@ -45,26 +43,6 @@ func TestEmbedChallengeResult(t *testing.T) { | |
| WantErr bool | ||
| WantFacts map[string]func(x509.Certificate) error | ||
| }{ | ||
| `Email challenges should set issuer extension and email subject`: { | ||
| Challenge: ChallengeResult{ | ||
| Issuer: `example.com`, | ||
| TypeVal: EmailValue, | ||
| Value: `[email protected]`, | ||
| }, | ||
| WantErr: false, | ||
| WantFacts: map[string]func(x509.Certificate) error{ | ||
| `Certificate should have [email protected] email subject`: func(cert x509.Certificate) error { | ||
| if len(cert.EmailAddresses) != 1 { | ||
| return errors.New("no email SAN set for email challenge") | ||
| } | ||
| if cert.EmailAddresses[0] != `[email protected]` { | ||
| return errors.New("bad email. expected [email protected]") | ||
| } | ||
| return nil | ||
| }, | ||
| `Certificate should have issuer extension set`: factIssuerIs("example.com"), | ||
| }, | ||
| }, | ||
| `Good URI value`: { | ||
| Challenge: ChallengeResult{ | ||
| Issuer: `foo.example.com`, | ||
|
|
@@ -278,62 +256,6 @@ func TestUsernameInvalidChar(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| // reflect hack because "claims" field is unexported by oidc IDToken | ||
| // https://github.com/coreos/go-oidc/pull/329 | ||
| func updateIDToken(idToken *oidc.IDToken, fieldName string, data []byte) { | ||
| val := reflect.Indirect(reflect.ValueOf(idToken)) | ||
| member := val.FieldByName(fieldName) | ||
| pointer := unsafe.Pointer(member.UnsafeAddr()) | ||
| realPointer := (*[]byte)(pointer) | ||
| *realPointer = data | ||
| } | ||
|
|
||
| func TestEmailWithClaims(t *testing.T) { | ||
| tests := map[string]struct { | ||
| InputClaims []byte | ||
| WantErr bool | ||
| }{ | ||
| "Good": { | ||
| InputClaims: []byte(`{"email":"[email protected]", "email_verified":true}`), | ||
| WantErr: false, | ||
| }, | ||
| "Email not verified": { | ||
| InputClaims: []byte(`{"email":"[email protected]", "email_verified":false}`), | ||
| WantErr: true, | ||
| }, | ||
| "Email missing": { | ||
| InputClaims: []byte(`{"email_verified":true}`), | ||
| WantErr: true, | ||
| }, | ||
| } | ||
|
|
||
| ctx := context.Background() | ||
| cfg := &config.FulcioConfig{ | ||
| OIDCIssuers: map[string]config.OIDCIssuer{ | ||
| "email.com": {IssuerURL: "email.com"}, | ||
| }, | ||
| } | ||
| ctx = config.With(ctx, cfg) | ||
|
|
||
| for name, test := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| idToken := &oidc.IDToken{ | ||
| Issuer: `email.com`, | ||
| } | ||
| updateIDToken(idToken, "claims", test.InputClaims) | ||
| _, err := email(ctx, idToken) | ||
| if err != nil { | ||
| if !test.WantErr { | ||
| t.Errorf("%s: %v", name, err) | ||
| } | ||
| return | ||
| } else if test.WantErr { | ||
| t.Errorf("%s: expected error", name) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func failErr(t *testing.T, err error) { | ||
| if err != nil { | ||
| t.Fatal(err) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Copyright 2022 The Sigstore Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package email | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/x509" | ||
| "errors" | ||
|
|
||
| "github.com/coreos/go-oidc/v3/oidc" | ||
| "github.com/sigstore/fulcio/pkg/ca/x509ca" | ||
| "github.com/sigstore/fulcio/pkg/config" | ||
| "github.com/sigstore/fulcio/pkg/identity" | ||
| "github.com/sigstore/fulcio/pkg/oauthflow" | ||
| ) | ||
|
|
||
| type principal struct { | ||
| address string | ||
| issuer string | ||
| } | ||
|
|
||
| func PrincipalFromIDToken(ctx context.Context, token *oidc.IDToken) (identity.Principal, error) { | ||
| emailAddress, emailVerified, err := oauthflow.EmailFromIDToken(token) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if !emailVerified { | ||
| return nil, errors.New("email_verified claim was false") | ||
| } | ||
|
|
||
| cfg, ok := config.FromContext(ctx).GetIssuer(token.Issuer) | ||
| if !ok { | ||
| return nil, errors.New("invalid configuration for OIDC ID Token issuer") | ||
| } | ||
|
|
||
| issuer, err := oauthflow.IssuerFromIDToken(token, cfg.IssuerClaim) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return principal{ | ||
| issuer: issuer, | ||
| address: emailAddress, | ||
| }, nil | ||
| } | ||
|
|
||
| func (p principal) Name(context.Context) string { | ||
| return p.address | ||
| } | ||
|
|
||
| func (p principal) Embed(ctx context.Context, cert *x509.Certificate) error { | ||
| cert.EmailAddresses = []string{p.address} | ||
|
|
||
| var err error | ||
| cert.ExtraExtensions, err = x509ca.Extensions{ | ||
| Issuer: p.issuer, | ||
| }.Render() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.