mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Minor fixes and comments.

Browse source
This commit is contained in:
Mariano Cano 2020-07-09 15:22:00 -07:00
parent 81cd288104
commit e6fed5e0aa
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
authority/provisioner/jwk.go
View file

@ -32,7 +32,7 @@ type JWK struct {
Key *jose.JSONWebKey `json:"key"`
EncryptedKey string `json:"encryptedKey,omitempty"`
Claims *Claims `json:"claims,omitempty"`
Options *ProvisionerOptions `json:"options"`
Options *ProvisionerOptions `json:"options,omitempty"`
claimer *Claimer
audiences Audiences
}
@ -153,6 +153,7 @@ func (p *JWK) AuthorizeSign(ctx context.Context, token string) ([]SignOption, er
claims.SANs = []string{claims.Subject}
}
// Certificate templates
data := x509util.CreateTemplateData(claims.Subject, claims.SANs)
data.SetToken(claims)

1
authority/provisioner/oidc.go
View file

@ -303,6 +303,7 @@ func (o *OIDC) AuthorizeSign(ctx context.Context, token string) ([]SignOption, e
return nil, errs.Wrap(http.StatusInternalServerError, err, "oidc.AuthorizeSign")
}
// Certificate templates
data := x509util.CreateTemplateData(claims.Subject, []string{claims.Email})
data.SetToken(claims)

2
authority/provisioner/options.go
View file

@ -31,7 +31,7 @@ type ProvisionerOptions struct {
func TemplateOptions(o *ProvisionerOptions, data x509util.TemplateData) (CertificateOptions, error) {
if o != nil {
if data == nil {
data = make(x509util.TemplateData)
data = x509util.NewTemplateData()
}
// Add template data if any.