Skip to content

fix: handle XShell 8 extended handshake (trailing key name) for agent forwarding #2

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

Merged
zzmark merged 1 commit into from
Nov 11, 2026
Merged

fix: handle XShell 8 extended handshake (trailing key name) for agent forwarding #2

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
6 changes: 4 additions & 2 deletions app/xshell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,10 @@ func xshellHandshake(conn net.Conn, cookie string) error {
if int(initMsg.Length) != len(cookie) {
return fmt.Errorf("xagent: invalid cookie length")
}
if int(initMsg.Length) < len(initMsg.Cookie) {
return fmt.Errorf("xagent: invalid message length")
// Newer XShell (8) may append extra data (e.g. a key name) after the cookie
// in the handshake frame; keep only the first Length bytes.
if len(initMsg.Cookie) > int(initMsg.Length) {
initMsg.Cookie = initMsg.Cookie[:initMsg.Length]
}

cookieRemain := make([]byte, int(initMsg.Length)-len(initMsg.Cookie))
Expand Down
Loading