X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8e17ce539b4a90711f4a8059a0eff11b9c64207b..94e82b3e5e65cc8792baf0b4d5dc80ae3721760e:/services/arv-git-httpd/git_handler.go?ds=sidebyside

diff --git a/services/arv-git-httpd/git_handler.go b/services/arv-git-httpd/git_handler.go
index 0312b296fc..bb1b1afc73 100644
--- a/services/arv-git-httpd/git_handler.go
+++ b/services/arv-git-httpd/git_handler.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -5,6 +9,9 @@ import (
 	"net"
 	"net/http"
 	"net/http/cgi"
+	"os"
+
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 // gitHandler is an http.Handler that invokes git-http-backend (or
@@ -15,22 +22,35 @@ type gitHandler struct {
 	cgi.Handler
 }
 
-func newGitHandler() http.Handler {
+func newGitHandler(cluster *arvados.Cluster) http.Handler {
+	const glBypass = "GL_BYPASS_ACCESS_CHECKS"
+	const glHome = "GITOLITE_HTTP_HOME"
+	var env []string
+	path := os.Getenv("PATH")
+	if cluster.Git.GitoliteHome != "" {
+		env = append(env,
+			glHome+"="+cluster.Git.GitoliteHome,
+			glBypass+"=1")
+		path = path + ":" + cluster.Git.GitoliteHome + "/bin"
+	} else if home, bypass := os.Getenv(glHome), os.Getenv(glBypass); home != "" || bypass != "" {
+		env = append(env, glHome+"="+home, glBypass+"="+bypass)
+		log.Printf("DEPRECATED: Passing through %s and %s environment variables. Use GitoliteHome configuration instead.", glHome, glBypass)
+	}
+
+	var listen arvados.URL
+	for listen = range cluster.Services.GitHTTP.InternalURLs {
+		break
+	}
+	env = append(env,
+		"GIT_PROJECT_ROOT="+cluster.Git.Repositories,
+		"GIT_HTTP_EXPORT_ALL=",
+		"SERVER_ADDR="+listen.Host,
+		"PATH="+path)
 	return &gitHandler{
 		Handler: cgi.Handler{
-			Path: theConfig.GitCommand,
-			Dir:  theConfig.Root,
-			Env: []string{
-				"GIT_PROJECT_ROOT=" + theConfig.Root,
-				"GIT_HTTP_EXPORT_ALL=",
-				"SERVER_ADDR=" + theConfig.Addr,
-			},
-			InheritEnv: []string{
-				"PATH",
-				// Needed if GitCommand is gitolite-shell:
-				"GITOLITE_HTTP_HOME",
-				"GL_BYPASS_ACCESS_CHECKS",
-			},
+			Path: cluster.Git.GitCommand,
+			Dir:  cluster.Git.Repositories,
+			Env:  env,
 			Args: []string{"http-backend"},
 		},
 	}