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

Make tsh puttyconfig disable GSSApi auth #48323

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Make tsh puttyconfig disable GSSApi auth #48323

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
12 changes: 12 additions & 0 deletions tool/tsh/common/putty_config_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ const puttyDwordProxyLogToTerm = `00000002` // only until session starts
const puttyPermitRSASHA1 = `00000000`
const puttyPermitRSASHA256 = `00000001`
const puttyPermitRSASHA512 = `00000001`
const puttyAuthGSSAPI = `00000000`
const puttyAuthGSSAPIKEX = `00000000`

// despite the strings/ints in struct, these are stored in the registry as DWORDs
type puttyRegistrySessionDwords struct {
Expand All @@ -60,6 +62,8 @@ type puttyRegistrySessionDwords struct {
ProxyPort int // dword
ProxyMethod string // dword
ProxyLogToTerm string // dword
AuthGSSAPI string // dword
AuthGSSAPIKEX string // dword
}

type puttyRegistrySessionStrings struct {
Expand Down Expand Up @@ -93,6 +97,8 @@ func addPuTTYSession(proxyHostname string, hostname string, port int, login stri
ProxyPort: puttyDefaultProxyPort,
ProxyMethod: puttyDwordProxyMethod,
ProxyLogToTerm: puttyDwordProxyLogToTerm,
AuthGSSAPI: puttyAuthGSSAPI,
AuthGSSAPIKEX: puttyAuthGSSAPIKEX,
}

sessionStrings := puttyRegistrySessionStrings{
Expand Down Expand Up @@ -130,6 +136,12 @@ func addPuTTYSession(proxyHostname string, hostname string, port int, login stri
if err := registry.WriteDword(pk, "ProxyLogToTerm", sessionDwords.ProxyLogToTerm); err != nil {
return trace.Wrap(err)
}
if err := registry.WriteDword(pk, "AuthGSSAPI", sessionDwords.AuthGSSAPI); err != nil {
return trace.Wrap(err)
}
if err := registry.WriteDword(pk, "AuthGSSAPIKEX", sessionDwords.AuthGSSAPIKEX); err != nil {
return trace.Wrap(err)
}

// write strings
if err := registry.WriteString(pk, "Hostname", sessionStrings.Hostname); err != nil {
Expand Down
Loading