Skip to content

Commit 02ed784

Browse files
committed
Do not enable by default ForwardAgent.
1 parent 348cf9b commit 02ed784

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

Diff for: authority/ssh_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func TestAuthority_GetSSHConfig(t *testing.T) {
412412
}
413413
userOutputWithUserData := []templates.Output{
414414
{Name: "include.tpl", Type: templates.File, Comment: "#", Path: "ssh/include", Content: []byte("Host *\n\tInclude /home/user/.step/ssh/config")},
415-
{Name: "config.tpl", Type: templates.File, Comment: "#", Path: "ssh/config", Content: []byte("Match exec \"step ssh check-host %h\"\n\tForwardAgent yes\n\tUserKnownHostsFile /home/user/.step/ssh/known_hosts\n\tProxyCommand step ssh proxycommand %r %h %p\n")},
415+
{Name: "config.tpl", Type: templates.File, Comment: "#", Path: "ssh/config", Content: []byte("Match exec \"step ssh check-host %h\"\n\tUserKnownHostsFile /home/user/.step/ssh/known_hosts\n\tProxyCommand step ssh proxycommand %r %h %p\n")},
416416
}
417417
hostOutputWithUserData := []templates.Output{
418418
{Name: "sshd_config.tpl", Type: templates.File, Comment: "#", Path: "/etc/ssh/sshd_config", Content: []byte("TrustedUserCAKeys /etc/ssh/ca.pub\nHostCertificate /etc/ssh/ssh_host_ecdsa_key-cert.pub\nHostKey /etc/ssh/ssh_host_ecdsa_key")},

Diff for: authority/testdata/templates/config.tpl

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Match exec "step ssh check-host %h"
2-
ForwardAgent yes
32
{{- if .User.User }}
43
User {{.User.User}}
54
{{- end }}

Diff for: pki/templates.go

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ var SSHTemplateData = map[string]string{
4242
//
4343
// Note: on windows ProxyCommand requires the full path
4444
"config.tpl": `Match exec "step ssh check-host %h"
45-
ForwardAgent yes
4645
{{- if .User.User }}
4746
User {{.User.User}}
4847
{{- end }}

0 commit comments

Comments
 (0)