diff options
author | Lorenz Brun <lorenz@dolansoft.org> | 2021-01-18 18:36:25 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2021-01-18 18:36:25 +0000 |
commit | 2a410f31b633ec5a994ecf1ff39dc8ffb9c6f828 (patch) | |
tree | 6ccc8b187438d1a218ee0ec833c339fa8faa8dd1 /internal/command/uploadpack/uploadpack.go | |
parent | 0e5660917f0316a2197ffc5add7a8f01d3e428be (diff) | |
download | gitlab-shell-2a410f31b633ec5a994ecf1ff39dc8ffb9c6f828.tar.gz |
RFC: Simple built-in SSH server
Diffstat (limited to 'internal/command/uploadpack/uploadpack.go')
-rw-r--r-- | internal/command/uploadpack/uploadpack.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/internal/command/uploadpack/uploadpack.go b/internal/command/uploadpack/uploadpack.go index fca3823..bf5db2c 100644 --- a/internal/command/uploadpack/uploadpack.go +++ b/internal/command/uploadpack/uploadpack.go @@ -2,6 +2,7 @@ package uploadpack import ( "context" + "os" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" @@ -38,7 +39,14 @@ func (c *Command) Execute(ctx context.Context) error { return customAction.Execute(ctx, response) } - return c.performGitalyCall(response) + var gitProtocolVersion string + if c.Args.RemoteAddr != nil { + gitProtocolVersion = c.Args.GitProtocolVersion + } else { + gitProtocolVersion = os.Getenv(commandargs.GitProtocolEnv) + } + + return c.performGitalyCall(response, gitProtocolVersion) } func (c *Command) verifyAccess(ctx context.Context, repo string) (*accessverifier.Response, error) { |