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

Merge pull request #682 from smallstep/helm-ssh

Browse source 
Fix ssh in helm chart values
This commit is contained in:
Mariano Cano 2021-08-26 11:22:49 -07:00 committed by GitHub
commit 8acce7b092
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pki/helm.go
View file

@ -16,9 +16,7 @@ type helmVariables struct {
*linkedca.Configuration *linkedca.Configuration
Defaults *linkedca.Defaults Defaults *linkedca.Defaults
Password string Password string
SSH struct { EnableSSH bool
Enabled bool
}
TLS authconfig.TLSOptions TLS authconfig.TLSOptions
Provisioners []provisioner.Interface Provisioners []provisioner.Interface
} }
@ -48,6 +46,7 @@ func (p *PKI) WriteHelmTemplate(w io.Writer) error {
Configuration: &p.Configuration, Configuration: &p.Configuration,
Defaults: &p.Defaults, Defaults: &p.Defaults,
Password: "", Password: "",
EnableSSH: p.options.enableSSH,
TLS: authconfig.DefaultTLSOptions, TLS: authconfig.DefaultTLSOptions,
Provisioners: provisioners, Provisioners: provisioners,
}); err != nil { }); err != nil {
@ -67,7 +66,7 @@ inject:
federateRoots: [] federateRoots: []
crt: {{ .Intermediate }} crt: {{ .Intermediate }}
key: {{ .IntermediateKey }} key: {{ .IntermediateKey }}
{{- if .SSH.Enabled }} {{- if .EnableSSH }}
ssh: ssh:
hostKey: {{ .Ssh.HostKey }} hostKey: {{ .Ssh.HostKey }}
userKey: {{ .Ssh.UserKey }} userKey: {{ .Ssh.UserKey }}

10
pki/pki.go
View file

@ -408,6 +408,15 @@ func (p *PKI) GenerateKeyPairs(pass []byte) error {
return err return err
} }
var claims *linkedca.Claims
if p.options.enableSSH {
claims = &linkedca.Claims{
Ssh: &linkedca.SSHClaims{
Enabled: true,
},
}
}
// Add JWK provisioner to the configuration. // Add JWK provisioner to the configuration.
publicKey, err := json.Marshal(p.ottPublicKey) publicKey, err := json.Marshal(p.ottPublicKey)
if err != nil { if err != nil {
@ -420,6 +429,7 @@ func (p *PKI) GenerateKeyPairs(pass []byte) error {
p.Authority.Provisioners = append(p.Authority.Provisioners, &linkedca.Provisioner{ p.Authority.Provisioners = append(p.Authority.Provisioners, &linkedca.Provisioner{
Type: linkedca.Provisioner_JWK, Type: linkedca.Provisioner_JWK,
Name: p.options.provisioner, Name: p.options.provisioner,
Claims: claims,
Details: &linkedca.ProvisionerDetails{ Details: &linkedca.ProvisionerDetails{
Data: &linkedca.ProvisionerDetails_JWK{ Data: &linkedca.ProvisionerDetails_JWK{
JWK: &linkedca.JWKProvisioner{ JWK: &linkedca.JWKProvisioner{