Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allowing GCP provisioner to issue SSH User Certificates - Option 1 #1557

Closed
wants to merge 1 commit into from
Closed

Allowing GCP provisioner to issue SSH User Certificates - Option 1 #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ To get up and running quickly, or as an alternative to running your own `step-ca
[Documentation](https://smallstep.com/docs) |
[Installation](https://smallstep.com/docs/step-ca/installation) |
[Getting Started](https://smallstep.com/docs/step-ca/getting-started) |
[Contributor's Guide](./docs/CONTRIBUTING.md)
[Contributor's Guide](./CONTRIBUTING.md)

[![GitHub release](https://img.shields.io/github/release/smallstep/certificates.svg)](https://github.com/smallstep/certificates/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/smallstep/certificates)](https://goreportcard.com/report/github.com/smallstep/certificates)
Expand Down
14 changes: 7 additions & 7 deletions authority/provisioner/gcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,18 +398,18 @@ func (p *GCP) AuthorizeSSHSign(_ context.Context, token string) ([]SignOption, e

ce := claims.Google.ComputeEngine
signOptions := []SignOption{}

// Enforce host certificate.
defaults := SignSSHOptions{
CertType: SSHHostCert,
}
defaults := SignSSHOptions{}

// Validated principals.
principals := []string{
fmt.Sprintf("%s.c.%s.internal", ce.InstanceName, ce.ProjectID),
fmt.Sprintf("%s.%s.c.%s.internal", ce.InstanceName, ce.Zone, ce.ProjectID),
}

if claims.Email != "" {
principals = append(principals, claims.Email, SanitizeSSHUserPrincipal(claims.Email))
}

// Only enforce known principals if disable custom sans is true.
if p.DisableCustomSANs {
defaults.Principals = principals
Expand All @@ -426,7 +426,7 @@ func (p *GCP) AuthorizeSSHSign(_ context.Context, token string) ([]SignOption, e
data.SetToken(v)
}

templateOptions, err := CustomSSHTemplateOptions(p.Options, data, sshutil.DefaultIIDTemplate)
templateOptions, err := CustomSSHTemplateOptions(p.Options, data, sshutil.CertificateRequestTemplate)
if err != nil {
return nil, errs.Wrap(http.StatusInternalServerError, err, "gcp.AuthorizeSSHSign")
}
Expand All @@ -445,7 +445,7 @@ func (p *GCP) AuthorizeSSHSign(_ context.Context, token string) ([]SignOption, e
// Require all the fields in the SSH certificate
&sshCertDefaultValidator{},
// Ensure that all principal names are allowed
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), nil),
newSSHNamePolicyValidator(p.ctl.getPolicy().getSSHHost(), p.ctl.getPolicy().getSSHUser()),
// Call webhooks
p.ctl.newWebhookController(
data,
Expand Down
75 changes: 53 additions & 22 deletions authority/provisioner/gcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,21 +630,54 @@ func TestGCP_AuthorizeSSHSign(t *testing.T) {
assert.FatalError(t, err)

hostDuration := p1.ctl.Claimer.DefaultHostSSHCertDuration()
allPrincipals := []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal", "foo@developer.gserviceaccount.com", "foo"}
validHostPrincipals := []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal"}
hostCertRequest := SignSSHOptions{CertType: "host", KeyID: "instance-name", Principals: allPrincipals}
userCertRequest := SignSSHOptions{CertType: "user", KeyID: "foo@developer.gserviceaccount.com", Principals: allPrincipals}
hostCertValidHostsRequest := SignSSHOptions{CertType: "host", KeyID: "instance-name", Principals: validHostPrincipals}
hostCertOneValidHostRequest := SignSSHOptions{CertType: "host", KeyID: "instance-name", Principals: []string{"instance-name.c.project-id.internal"}}
hostCertOneValidZoneHostRequest := SignSSHOptions{CertType: "host", KeyID: "instance-name", Principals: []string{"instance-name.zone.c.project-id.internal"}}
expectedHostOptions := &SignSSHOptions{
CertType: "host", Principals: []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal"},
ValidAfter: NewTimeDuration(tm), ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
CertType: "host",
KeyID: "instance-name",
Principals: allPrincipals,
ValidAfter: NewTimeDuration(tm),
ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
}
expectedUserOptions := &SignSSHOptions{
CertType: "user",
KeyID: "foo@developer.gserviceaccount.com",
Principals: allPrincipals,
ValidAfter: NewTimeDuration(tm),
ValidBefore: NewTimeDuration(tm.Add(p1.ctl.Claimer.DefaultUserSSHCertDuration())),
}
expectedHostOptionsValidHostPrincipals := &SignSSHOptions{
CertType: "host",
KeyID: "instance-name",
Principals: []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal"},
ValidAfter: NewTimeDuration(tm),
ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
}
expectedHostOptionsPrincipal1 := &SignSSHOptions{
CertType: "host", Principals: []string{"instance-name.c.project-id.internal"},
ValidAfter: NewTimeDuration(tm), ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
CertType: "host",
KeyID: "instance-name",
Principals: []string{"instance-name.c.project-id.internal"},
ValidAfter: NewTimeDuration(tm),
ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
}
expectedHostOptionsPrincipal2 := &SignSSHOptions{
CertType: "host", Principals: []string{"instance-name.zone.c.project-id.internal"},
ValidAfter: NewTimeDuration(tm), ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
CertType: "host",
KeyID: "instance-name",
Principals: []string{"instance-name.zone.c.project-id.internal"},
ValidAfter: NewTimeDuration(tm),
ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
}
expectedCustomOptions := &SignSSHOptions{
CertType: "host", Principals: []string{"foo.bar", "bar.foo"},
ValidAfter: NewTimeDuration(tm), ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
CertType: "host",
KeyID: "instance-name",
Principals: []string{"foo.bar", "bar.foo"},
ValidAfter: NewTimeDuration(tm),
ValidBefore: NewTimeDuration(tm.Add(hostDuration)),
}

type args struct {
Expand All @@ -661,20 +694,18 @@ func TestGCP_AuthorizeSSHSign(t *testing.T) {
wantErr bool
wantSignErr bool
}{
{"ok", p1, args{t1, SignSSHOptions{}, pub}, expectedHostOptions, http.StatusOK, false, false},
{"ok-rsa2048", p1, args{t1, SignSSHOptions{}, rsa2048.Public()}, expectedHostOptions, http.StatusOK, false, false},
{"ok-type", p1, args{t1, SignSSHOptions{CertType: "host"}, pub}, expectedHostOptions, http.StatusOK, false, false},
{"ok-principals", p1, args{t1, SignSSHOptions{Principals: []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal"}}, pub}, expectedHostOptions, http.StatusOK, false, false},
{"ok-principal1", p1, args{t1, SignSSHOptions{Principals: []string{"instance-name.c.project-id.internal"}}, pub}, expectedHostOptionsPrincipal1, http.StatusOK, false, false},
{"ok-principal2", p1, args{t1, SignSSHOptions{Principals: []string{"instance-name.zone.c.project-id.internal"}}, pub}, expectedHostOptionsPrincipal2, http.StatusOK, false, false},
{"ok-options", p1, args{t1, SignSSHOptions{CertType: "host", Principals: []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal"}}, pub}, expectedHostOptions, http.StatusOK, false, false},
{"ok-custom", p2, args{t2, SignSSHOptions{Principals: []string{"foo.bar", "bar.foo"}}, pub}, expectedCustomOptions, http.StatusOK, false, false},
{"fail-rsa1024", p1, args{t1, SignSSHOptions{}, rsa1024.Public()}, expectedHostOptions, http.StatusOK, false, true},
{"fail-type", p1, args{t1, SignSSHOptions{CertType: "user"}, pub}, nil, http.StatusOK, false, true},
{"fail-principal", p1, args{t1, SignSSHOptions{Principals: []string{"smallstep.com"}}, pub}, nil, http.StatusOK, false, true},
{"fail-extra-principal", p1, args{t1, SignSSHOptions{Principals: []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal", "smallstep.com"}}, pub}, nil, http.StatusOK, false, true},
{"fail-sshCA-disabled", p3, args{"foo", SignSSHOptions{}, pub}, expectedHostOptions, http.StatusUnauthorized, true, false},
{"fail-invalid-token", p1, args{"foo", SignSSHOptions{}, pub}, expectedHostOptions, http.StatusUnauthorized, true, false},
{"ok", p1, args{t1, hostCertRequest, pub}, expectedHostOptions, http.StatusOK, false, false},
{"ok-rsa2048", p1, args{t1, hostCertRequest, rsa2048.Public()}, expectedHostOptions, http.StatusOK, false, false},
{"ok-type-user", p1, args{t1, userCertRequest, pub}, expectedUserOptions, http.StatusOK, false, false},
{"ok-principals", p1, args{t1, hostCertValidHostsRequest, pub}, expectedHostOptionsValidHostPrincipals, http.StatusOK, false, false},
{"ok-principal1", p1, args{t1, hostCertOneValidHostRequest, pub}, expectedHostOptionsPrincipal1, http.StatusOK, false, false},
{"ok-principal2", p1, args{t1, hostCertOneValidZoneHostRequest, pub}, expectedHostOptionsPrincipal2, http.StatusOK, false, false},
{"ok-custom", p2, args{t2, SignSSHOptions{CertType: "host", KeyID: "instance-name", Principals: []string{"foo.bar", "bar.foo"}}, pub}, expectedCustomOptions, http.StatusOK, false, false},
{"fail-rsa1024", p1, args{t1, SignSSHOptions{CertType: "host"}, rsa1024.Public()}, expectedHostOptions, http.StatusOK, false, true},
{"fail-principal", p1, args{t1, SignSSHOptions{CertType: "host", Principals: []string{"smallstep.com"}}, pub}, nil, http.StatusOK, false, true},
{"fail-extra-principal", p1, args{t1, SignSSHOptions{CertType: "host", Principals: []string{"instance-name.c.project-id.internal", "instance-name.zone.c.project-id.internal", "smallstep.com"}}, pub}, nil, http.StatusOK, false, true},
{"fail-sshCA-disabled", p3, args{"foo", SignSSHOptions{CertType: "host"}, pub}, expectedHostOptions, http.StatusUnauthorized, true, false},
{"fail-invalid-token", p1, args{"foo", SignSSHOptions{CertType: "host"}, pub}, expectedHostOptions, http.StatusUnauthorized, true, false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down