crypt/step-ca-cli
1
0
Fork 0
mirror of https://github.com/smallstep/cli.git synced 2025-08-07 16:02:54 +03:00
Code Activity

Merge branch 'master' into nebulous

Browse Source
This commit is contained in:
Mariano Cano
2022-02-01 16:39:53 -08:00
parent 7a151e01bb ab7a838c7c
commit e204fcc82a
28 changed files with 1830 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
command/ssh/certificate.go
View File

@@ -40,8 +40,8 @@ func certificateCommand() cli.Command {
[**--add-user**] [**--not-before**=<time|duration>]
[**--not-after**=<time|duration>] [**--token**=<token>] [**--issuer**=<name>]
[**--no-password**] [**--insecure**] [**--force**] [**--x5c-cert**=<file>]
[**--x5c-key**=<file>] [**--k8ssa-token-path**=<file>] [**--ca-url**=<uri>]
[**--root**=<file>] [**--context**=<name>]`,
[**--x5c-key**=<file>] [**--k8ssa-token-path**=<file>] [**--no-agent**]
[**--ca-url**=<uri>] [**--root**=<file>] [**--context**=<name>]`,
Description: `**step ssh certificate** command generates an SSH key pair and creates a
certificate using [step certificates](https://github.com/smallstep/certificates).
@@ -95,6 +95,11 @@ Generate a new SSH key pair and user certificate:
$ step ssh certificate mariano@work id_ecdsa
'''
Generate a new SSH key pair and user certificate and do not add to SSH agent:
'''
$ step ssh certificate mariano@work id_ecdsa --no-agent
'''
Generate a new SSH key pair and user certificate and set the lifetime to 2hrs:
'''
$ step ssh certificate mariano@work id_ecdsa --not-after 2h
@@ -170,6 +175,10 @@ $ step ssh certificate --token $TOKEN mariano@work id_ecdsa
flags.NebulaCert,
flags.NebulaKey,
flags.K8sSATokenPathFlag,
cli.BoolFlag{
Name: "no-agent",
Usage: "Do not add the generated certificate and associated private key to the SSH agent.",
},
flags.CaConfig,
flags.CaURL,
flags.Root,
@@ -462,7 +471,7 @@ func certificateAction(ctx *cli.Context) error {
ui.PrintSelected("Certificate", crtFile)
// Attempt to add key to agent if private key defined.
if priv != nil && certType == provisioner.SSHUserCert {
if !ctx.Bool("no-agent") && priv != nil && certType == provisioner.SSHUserCert {
if agent, err := sshutil.DialAgent(); err != nil {
ui.Printf(`{{ "%s" | red }} {{ "SSH Agent:" | bold }} %v`+"\n", ui.IconBad, err)
} else {