Skip to content

Make ssh commands used in the git smart transport compatible with libgit2 (#852) #854

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
lhchavez merged 2 commits into from
Nov 9, 2021
Merged

Make ssh commands used in the git smart transport compatible with libgit2 (#852) #854

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddadabb
Make ssh commands used in the git smart transport compatible with lib…
darkowlzz Nov 7, 2021
a4e63f4
Please run checks
lhchavez Nov 9, 2021
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: 10 additions & 2 deletions ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"net"
"net/url"
"runtime"
"strings"
"unsafe"

"golang.org/x/crypto/ssh"
Expand Down Expand Up @@ -74,6 +75,13 @@ func (t *sshSmartSubtransport) Action(urlString string, action SmartServiceActio
return nil, err
}

// Escape \ and '.
uPath := strings.Replace(u.Path, `\`, `\\`, -1)
uPath = strings.Replace(uPath, `'`, `\'`, -1)

// TODO: Add percentage decode similar to libgit2.
// Refer: https://github.com/libgit2/libgit2/blob/358a60e1b46000ea99ef10b4dd709e92f75ff74b/src/str.c#L455-L481

var cmd string
switch action {
case SmartServiceActionUploadpackLs, SmartServiceActionUploadpack:
Expand All @@ -83,7 +91,7 @@ func (t *sshSmartSubtransport) Action(urlString string, action SmartServiceActio
}
t.Close()
}
cmd = fmt.Sprintf("git-upload-pack %q", u.Path)
cmd = fmt.Sprintf("git-upload-pack '%s'", uPath)

case SmartServiceActionReceivepackLs, SmartServiceActionReceivepack:
if t.currentStream != nil {
Expand All @@ -92,7 +100,7 @@ func (t *sshSmartSubtransport) Action(urlString string, action SmartServiceActio
}
t.Close()
}
cmd = fmt.Sprintf("git-receive-pack %q", u.Path)
cmd = fmt.Sprintf("git-receive-pack '%s'", uPath)

default:
return nil, fmt.Errorf("unexpected action: %v", action)
Expand Down