diff options
| author | Lucas Charles <me@lucascharles.me> | 2021-02-17 13:49:46 -0800 |
|---|---|---|
| committer | Lucas Charles <me@lucascharles.me> | 2021-03-15 13:47:11 -0700 |
| commit | d539068dc372e46d10adee89e9b96b59156a2bb6 (patch) | |
| tree | 9c37f5ade4a95622b30a7a47befcb46b185b9682 /internal/command/uploadpack | |
| parent | e79f115d93a9f00f3e4f8a22ec770fdf4c3e1947 (diff) | |
| download | gitlab-shell-d539068dc372e46d10adee89e9b96b59156a2bb6.tar.gz | |
chore: Refactor env introspection to rely on command initialization496-move-env-introspection-to-sshenv
Refactors introspection of execution environment to rely on
per-connection state (`gitlab-shell`) or per request (`gitlab-sshd`)
Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/496
Diffstat (limited to 'internal/command/uploadpack')
| -rw-r--r-- | internal/command/uploadpack/gitalycall.go | 6 | ||||
| -rw-r--r-- | internal/command/uploadpack/uploadpack.go | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go index 3ebc8b3..5a8a605 100644 --- a/internal/command/uploadpack/gitalycall.go +++ b/internal/command/uploadpack/gitalycall.go @@ -12,7 +12,7 @@ import ( "gitlab.com/gitlab-org/gitlab-shell/internal/handler" ) -func (c *Command) performGitalyCall(response *accessverifier.Response, gitProtocolVersion string) error { +func (c *Command) performGitalyCall(response *accessverifier.Response) error { gc := &handler.GitalyCommand{ Config: c.Config, ServiceName: string(commandargs.UploadPack), @@ -23,12 +23,12 @@ func (c *Command) performGitalyCall(response *accessverifier.Response, gitProtoc request := &pb.SSHUploadPackRequest{ Repository: &response.Gitaly.Repo, - GitProtocol: gitProtocolVersion, + GitProtocol: c.Args.Env.GitProtocolVersion, GitConfigOptions: response.GitConfigOptions, } return gc.RunGitalyCommand(func(ctx context.Context, conn *grpc.ClientConn) (int32, error) { - ctx, cancel := gc.PrepareContext(ctx, request.Repository, response, request.GitProtocol) + ctx, cancel := gc.PrepareContext(ctx, request.Repository, response, c.Args.Env) defer cancel() rw := c.ReadWriter diff --git a/internal/command/uploadpack/uploadpack.go b/internal/command/uploadpack/uploadpack.go index bf5db2c..fca3823 100644 --- a/internal/command/uploadpack/uploadpack.go +++ b/internal/command/uploadpack/uploadpack.go @@ -2,7 +2,6 @@ package uploadpack import ( "context" - "os" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" @@ -39,14 +38,7 @@ func (c *Command) Execute(ctx context.Context) error { return customAction.Execute(ctx, response) } - var gitProtocolVersion string - if c.Args.RemoteAddr != nil { - gitProtocolVersion = c.Args.GitProtocolVersion - } else { - gitProtocolVersion = os.Getenv(commandargs.GitProtocolEnv) - } - - return c.performGitalyCall(response, gitProtocolVersion) + return c.performGitalyCall(response) } func (c *Command) verifyAccess(ctx context.Context, repo string) (*accessverifier.Response, error) { |