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

Add TemplateData to SSHSignRequest.

Browse source 
Add some omitempty tags.
This commit is contained in:
Mariano Cano 2020-07-30 14:59:17 -07:00
parent a78f7e8913
commit 3b19bb9796
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/sign.go
View file

@ -14,9 +14,9 @@ import (
type SignRequest struct { type SignRequest struct {
CsrPEM CertificateRequest `json:"csr"` CsrPEM CertificateRequest `json:"csr"`
OTT string `json:"ott"` OTT string `json:"ott"`
NotAfter TimeDuration `json:"notAfter"` NotAfter TimeDuration `json:"notAfter,omitempty"`
NotBefore TimeDuration `json:"notBefore"` NotBefore TimeDuration `json:"notBefore,omitempty"`
TemplateData json.RawMessage `json:"templateData"` TemplateData json.RawMessage `json:"templateData,omitempty"`
} }
// Validate checks the fields of the SignRequest and returns nil if they are ok // Validate checks the fields of the SignRequest and returns nil if they are ok

14
api/ssh.go
View file

@ -36,12 +36,13 @@ type SSHSignRequest struct {
PublicKey []byte `json:"publicKey"` // base64 encoded PublicKey []byte `json:"publicKey"` // base64 encoded
OTT string `json:"ott"` OTT string `json:"ott"`
CertType string `json:"certType,omitempty"` CertType string `json:"certType,omitempty"`
KeyID string `json:"keyID,omitempty"`
Principals []string `json:"principals,omitempty"` Principals []string `json:"principals,omitempty"`
ValidAfter TimeDuration `json:"validAfter,omitempty"` ValidAfter TimeDuration `json:"validAfter,omitempty"`
ValidBefore TimeDuration `json:"validBefore,omitempty"` ValidBefore TimeDuration `json:"validBefore,omitempty"`
AddUserPublicKey []byte `json:"addUserPublicKey,omitempty"` AddUserPublicKey []byte `json:"addUserPublicKey,omitempty"`
KeyID string `json:"keyID"`
IdentityCSR CertificateRequest `json:"identityCSR,omitempty"` IdentityCSR CertificateRequest `json:"identityCSR,omitempty"`
TemplateData json.RawMessage `json:"templateData,omitempty"`
} }
// Validate validates the SSHSignRequest. // Validate validates the SSHSignRequest.
@ -275,11 +276,12 @@ func (h *caHandler) SSHSign(w http.ResponseWriter, r *http.Request) {
} }
opts := provisioner.SignSSHOptions{ opts := provisioner.SignSSHOptions{
CertType: body.CertType, CertType: body.CertType,
KeyID: body.KeyID, KeyID: body.KeyID,
Principals: body.Principals, Principals: body.Principals,
ValidBefore: body.ValidBefore, ValidBefore: body.ValidBefore,
ValidAfter: body.ValidAfter, ValidAfter: body.ValidAfter,
TemplateData: body.TemplateData,
} }
ctx := provisioner.NewContextWithMethod(r.Context(), provisioner.SSHSignMethod) ctx := provisioner.NewContextWithMethod(r.Context(), provisioner.SSHSignMethod)