X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7521d023fbeb1cabc9e89953e29cd55183af3753..32254a99680b3dbcff053d7c99a26988e1f839eb:/services/arv-git-httpd/server_test.go

diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index 9d2c190d7a..ca5c5f4242 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -8,12 +8,18 @@ import (
 	"strings"
 	"testing"
 
-	check "gopkg.in/check.v1"
 	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+	check "gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&IntegrationSuite{})
 
+const (
+	spectatorToken = "zw2f4gwx8hw8cjre7yp6v1zylhrhn3m5gvjq73rtpwhmknrybu"
+	activeToken    = "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi"
+	anonymousToken = "4kg6k6lzmp9kj4cpkcoxie964cmvjahbt4fod9zru44k4jqdmi"
+)
+
 // IntegrationSuite tests need an API server and an arv-git-httpd server
 type IntegrationSuite struct {
 	tmpRepoRoot string
@@ -23,49 +29,44 @@ type IntegrationSuite struct {
 
 func (s *IntegrationSuite) TestPathVariants(c *check.C) {
 	s.makeArvadosRepo(c)
-	// Spectator token
-	os.Setenv("ARVADOS_API_TOKEN", "zw2f4gwx8hw8cjre7yp6v1zylhrhn3m5gvjq73rtpwhmknrybu")
-	for _, repo := range []string{"foo.git", "foo/.git", "arvados.git", "arvados/.git"} {
-		err := s.runGit(c, "fetch", repo)
+	for _, repo := range []string{"active/foo.git", "active/foo/.git", "arvados.git", "arvados/.git"} {
+		err := s.runGit(c, spectatorToken, "fetch", repo)
 		c.Assert(err, check.Equals, nil)
 	}
 }
 
 func (s *IntegrationSuite) TestReadonly(c *check.C) {
-	// Spectator token
-	os.Setenv("ARVADOS_API_TOKEN", "zw2f4gwx8hw8cjre7yp6v1zylhrhn3m5gvjq73rtpwhmknrybu")
-	err := s.runGit(c, "fetch", "foo.git")
+	err := s.runGit(c, spectatorToken, "fetch", "active/foo.git")
 	c.Assert(err, check.Equals, nil)
-	err = s.runGit(c, "push", "foo.git", "master:newbranchfail")
+	err = s.runGit(c, spectatorToken, "push", "active/foo.git", "master:newbranchfail")
 	c.Assert(err, check.ErrorMatches, `.*HTTP code = 403.*`)
-	_, err = os.Stat(s.tmpRepoRoot + "/.git/refs/heads/newbranchfail")
+	_, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666/.git/refs/heads/newbranchfail")
 	c.Assert(err, check.FitsTypeOf, &os.PathError{})
 }
 
 func (s *IntegrationSuite) TestReadwrite(c *check.C) {
-	// Active user token
-	os.Setenv("ARVADOS_API_TOKEN", "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi")
-	err := s.runGit(c, "fetch", "foo.git")
+	err := s.runGit(c, activeToken, "fetch", "active/foo.git")
 	c.Assert(err, check.Equals, nil)
-	err = s.runGit(c, "push", "foo.git", "master:newbranch")
+	err = s.runGit(c, activeToken, "push", "active/foo.git", "master:newbranch")
 	c.Assert(err, check.Equals, nil)
-	_, err = os.Stat(s.tmpRepoRoot + "/foo/.git/refs/heads/newbranch")
+	_, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666/.git/refs/heads/newbranch")
 	c.Assert(err, check.Equals, nil)
 }
 
 func (s *IntegrationSuite) TestNonexistent(c *check.C) {
-	// Spectator token
-	os.Setenv("ARVADOS_API_TOKEN", "zw2f4gwx8hw8cjre7yp6v1zylhrhn3m5gvjq73rtpwhmknrybu")
-	err := s.runGit(c, "fetch", "thisrepodoesnotexist.git")
-	c.Assert(err, check.ErrorMatches, `.* not found:.*`)
+	err := s.runGit(c, spectatorToken, "fetch", "thisrepodoesnotexist.git")
+	c.Assert(err, check.ErrorMatches, `.* not found.*`)
+}
+
+func (s *IntegrationSuite) TestMissingGitdirReadableRepository(c *check.C) {
+	err := s.runGit(c, activeToken, "fetch", "active/foo2.git")
+	c.Assert(err, check.ErrorMatches, `.* not found.*`)
 }
 
 func (s *IntegrationSuite) TestNoPermission(c *check.C) {
-	// Anonymous token
-	os.Setenv("ARVADOS_API_TOKEN", "4kg6k6lzmp9kj4cpkcoxie964cmvjahbt4fod9zru44k4jqdmi")
-	for _, repo := range []string{"foo.git", "foo/.git"} {
-		err := s.runGit(c, "fetch", repo)
-		c.Assert(err, check.ErrorMatches, `.* not found:.*`)
+	for _, repo := range []string{"active/foo.git", "active/foo/.git"} {
+		err := s.runGit(c, anonymousToken, "fetch", repo)
+		c.Assert(err, check.ErrorMatches, `.* not found.*`)
 	}
 }
 
@@ -81,37 +82,26 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
 	c.Assert(err, check.Equals, nil)
 	s.tmpWorkdir, err = ioutil.TempDir("", "arv-git-httpd")
 	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("git", "init", s.tmpRepoRoot + "/foo").Output()
+	_, err = exec.Command("git", "init", s.tmpRepoRoot+"/zzzzz-s0uqq-382brsig8rp3666").Output()
 	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("sh", "-c", "cd " + s.tmpRepoRoot + "/foo && echo test >test && git add test && git commit -am 'foo: test'").CombinedOutput()
+	_, err = exec.Command("sh", "-c", "cd "+s.tmpRepoRoot+"/zzzzz-s0uqq-382brsig8rp3666 && echo test >test && git add test && git -c user.name=Foo -c user.email=Foo commit -am 'foo: test'").CombinedOutput()
 	c.Assert(err, check.Equals, nil)
 	_, err = exec.Command("git", "init", s.tmpWorkdir).Output()
 	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("sh", "-c", "cd " + s.tmpWorkdir + " && echo work >work && git add work && git commit -am 'workdir: test'").CombinedOutput()
+	_, err = exec.Command("sh", "-c", "cd "+s.tmpWorkdir+" && echo work >work && git add work && git -c user.name=Foo -c user.email=Foo commit -am 'workdir: test'").CombinedOutput()
 	c.Assert(err, check.Equals, nil)
 
 	theConfig = &config{
-		Addr: ":",
+		Addr:       ":",
 		GitCommand: "/usr/bin/git",
-		Root: s.tmpRepoRoot,
+		Root:       s.tmpRepoRoot,
 	}
 	err = s.testServer.Start()
 	c.Assert(err, check.Equals, nil)
 
 	// Clear ARVADOS_API_TOKEN after starting up the server, to
 	// make sure arv-git-httpd doesn't use it.
-	os.Setenv("ARVADOS_API_TOKEN", "")
-
-	_, err = exec.Command("git", "config",
-		"--file", s.tmpWorkdir + "/.git/config",
-		"credential.http://" + s.testServer.Addr + "/.helper",
-		"!foo(){ echo password=$ARVADOS_API_TOKEN; };foo").Output()
-	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("git", "config",
-		"--file", s.tmpWorkdir + "/.git/config",
-		"credential.http://" + s.testServer.Addr + "/.username",
-		"none").Output()
-	c.Assert(err, check.Equals, nil)
+	os.Setenv("ARVADOS_API_TOKEN", "unused-token-placates-client-library")
 }
 
 func (s *IntegrationSuite) TearDownTest(c *check.C) {
@@ -130,23 +120,27 @@ func (s *IntegrationSuite) TearDownTest(c *check.C) {
 	}
 }
 
-func (s *IntegrationSuite) runGit(c *check.C, gitCmd, repo string, args ...string) error {
+func (s *IntegrationSuite) runGit(c *check.C, token, gitCmd, repo string, args ...string) error {
 	cwd, err := os.Getwd()
 	c.Assert(err, check.Equals, nil)
 	defer os.Chdir(cwd)
 	os.Chdir(s.tmpWorkdir)
 
 	gitargs := append([]string{
-		gitCmd, "http://" + s.testServer.Addr + "/" + repo,
+		gitCmd, "http://none:" + token + "@" + s.testServer.Addr + "/" + repo,
 	}, args...)
 	cmd := exec.Command("git", gitargs...)
 	w, err := cmd.StdinPipe()
 	c.Assert(err, check.Equals, nil)
-	go w.Close()
+	w.Close()
 	output, err := cmd.CombinedOutput()
 	c.Log("git ", gitargs, " => ", err)
-	if err != nil {
-		// Easier to match error strings without newlines.
+	c.Log(string(output))
+	if err != nil && len(output) > 0 {
+		// If messages appeared on stderr, they are more
+		// helpful than the err returned by CombinedOutput().
+		//
+		// Easier to match error strings without newlines:
 		err = errors.New(strings.Replace(string(output), "\n", " // ", -1))
 	}
 	return err
@@ -154,9 +148,11 @@ func (s *IntegrationSuite) runGit(c *check.C, gitCmd, repo string, args ...strin
 
 // Make a bare arvados repo at {tmpRepoRoot}/arvados.git
 func (s *IntegrationSuite) makeArvadosRepo(c *check.C) {
-	_, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot + "/arvados.git").Output()
+	msg, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git").CombinedOutput()
+	c.Log(msg)
 	c.Assert(err, check.Equals, nil)
-	_, err = exec.Command("git", "--git-dir", s.tmpRepoRoot + "/arvados.git", "fetch", "../../.git", "master:master").Output()
+	msg, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "HEAD:master").CombinedOutput()
+	c.Log(msg)
 	c.Assert(err, check.Equals, nil)
 }