From 2a410f31b633ec5a994ecf1ff39dc8ffb9c6f828 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Mon, 18 Jan 2021 18:36:25 +0000 Subject: RFC: Simple built-in SSH server --- internal/command/uploadpack/uploadpack.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'internal/command/uploadpack/uploadpack.go') 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) { -- cgit v1.2.1