X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9bc0194676e3f22b41976fefc6146d7dd965d173..08d5c8073523b4c5d72413d8e2095f3b68b58190:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 88b86e063b..6a349dae21 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -1,22 +1,22 @@
 package main
 
 import (
+	"bytes"
 	"crypto/md5"
-	"crypto/tls"
 	"fmt"
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	"git.curoverse.com/arvados.git/sdk/go/keepclient"
-	. "gopkg.in/check.v1"
-	"io"
 	"io/ioutil"
 	"log"
 	"net/http"
-	"net/url"
+	"net/http/httptest"
 	"os"
 	"strings"
 	"testing"
 	"time"
+
+	. "gopkg.in/check.v1"
 )
 
 // Gocheck boilerplate
@@ -36,6 +36,8 @@ var _ = Suite(&NoKeepServerSuite{})
 // Test with no keepserver to simulate errors
 type NoKeepServerSuite struct{}
 
+var TestProxyUUID = "zzzzz-bi6l4-lrixqc4fxofbmzz"
+
 // Wait (up to 1 second) for keepproxy to listen on a port. This
 // avoids a race condition where we hit a "connection refused" error
 // because we start testing the proxy too soon.
@@ -43,7 +45,7 @@ func waitForListener() {
 	const (
 		ms = 5
 	)
-	for i := 0; listener == nil && i < 1000; i += ms {
+	for i := 0; listener == nil && i < 10000; i += ms {
 		time.Sleep(ms * time.Millisecond)
 	}
 	if listener == nil {
@@ -73,6 +75,10 @@ func (s *ServerRequiredSuite) TearDownSuite(c *C) {
 
 func (s *NoKeepServerSuite) SetUpSuite(c *C) {
 	arvadostest.StartAPI()
+	// We need API to have some keep services listed, but the
+	// services themselves should be unresponsive.
+	arvadostest.StartKeep(2, false)
+	arvadostest.StopKeep(2)
 }
 
 func (s *NoKeepServerSuite) SetUpTest(c *C) {
@@ -83,106 +89,86 @@ func (s *NoKeepServerSuite) TearDownSuite(c *C) {
 	arvadostest.StopAPI()
 }
 
-func setupProxyService() {
-
-	client := &http.Client{Transport: &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
+func runProxy(c *C, args []string, bogusClientToken bool) *keepclient.KeepClient {
+	args = append([]string{"keepproxy"}, args...)
+	os.Args = append(args, "-listen=:0")
+	listener = nil
+	go main()
+	waitForListener()
 
-	var req *http.Request
-	var err error
-	if req, err = http.NewRequest("POST", fmt.Sprintf("https://%s/arvados/v1/keep_services", os.Getenv("ARVADOS_API_HOST")), nil); err != nil {
-		panic(err.Error())
+	arv, err := arvadosclient.MakeArvadosClient()
+	c.Assert(err, Equals, nil)
+	if bogusClientToken {
+		arv.ApiToken = "bogus-token"
 	}
-	req.Header.Add("Authorization", fmt.Sprintf("OAuth2 %s", os.Getenv("ARVADOS_API_TOKEN")))
-
-	reader, writer := io.Pipe()
+	kc := keepclient.New(arv)
+	sr := map[string]string{
+		TestProxyUUID: "http://" + listener.Addr().String(),
+	}
+	kc.SetServiceRoots(sr, sr, sr)
+	kc.Arvados.External = true
 
-	req.Body = reader
+	return kc
+}
 
-	go func() {
-		data := url.Values{}
-		data.Set("keep_service", `{
-  "service_host": "localhost",
-  "service_port": 29950,
-  "service_ssl_flag": false,
-  "service_type": "proxy"
-}`)
+func (s *ServerRequiredSuite) TestDesiredReplicas(c *C) {
+	kc := runProxy(c, nil, false)
+	defer closeListener()
 
-		writer.Write([]byte(data.Encode()))
-		writer.Close()
-	}()
+	content := []byte("TestDesiredReplicas")
+	hash := fmt.Sprintf("%x", md5.Sum(content))
 
-	var resp *http.Response
-	if resp, err = client.Do(req); err != nil {
-		panic(err.Error())
-	}
-	if resp.StatusCode != 200 {
-		panic(resp.Status)
+	for _, kc.Want_replicas = range []int{0, 1, 2} {
+		locator, rep, err := kc.PutB(content)
+		c.Check(err, Equals, nil)
+		c.Check(rep, Equals, kc.Want_replicas)
+		if rep > 0 {
+			c.Check(locator, Matches, fmt.Sprintf(`^%s\+%d(\+.+)?$`, hash, len(content)))
+		}
 	}
 }
 
-func runProxy(c *C, args []string, port int, bogusClientToken bool) *keepclient.KeepClient {
-	if bogusClientToken {
-		os.Setenv("ARVADOS_API_TOKEN", "bogus-token")
-	}
-	arv, err := arvadosclient.MakeArvadosClient()
-	c.Assert(err, Equals, nil)
-	kc := keepclient.KeepClient{
-		Arvados:       &arv,
-		Want_replicas: 2,
-		Using_proxy:   true,
-		Client:        &http.Client{},
-	}
-	locals := map[string]string{
-		"proxy": fmt.Sprintf("http://localhost:%v", port),
-	}
-	writableLocals := map[string]string{
-		"proxy": fmt.Sprintf("http://localhost:%v", port),
-	}
-	kc.SetServiceRoots(locals, writableLocals, nil)
-	c.Check(kc.Using_proxy, Equals, true)
-	c.Check(len(kc.LocalRoots()), Equals, 1)
-	for _, root := range kc.LocalRoots() {
-		c.Check(root, Equals, fmt.Sprintf("http://localhost:%v", port))
-	}
-	log.Print("keepclient created")
-	if bogusClientToken {
-		arvadostest.ResetEnv()
-	}
-
-	{
-		os.Args = append(args, fmt.Sprintf("-listen=:%v", port))
-		listener = nil
-		go main()
-	}
-
-	return &kc
-}
+func (s *ServerRequiredSuite) TestPutWrongContentLength(c *C) {
+	kc := runProxy(c, nil, false)
+	defer closeListener()
 
-func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
-	log.Print("TestPutAndGet start")
+	content := []byte("TestPutWrongContentLength")
+	hash := fmt.Sprintf("%x", md5.Sum(content))
 
-	os.Args = []string{"keepproxy", "-listen=:29950"}
-	listener = nil
-	go main()
-	time.Sleep(100 * time.Millisecond)
+	// If we use http.Client to send these requests to the network
+	// server we just started, the Go http library automatically
+	// fixes the invalid Content-Length header. In order to test
+	// our server behavior, we have to call the handler directly
+	// using an httptest.ResponseRecorder.
+	rtr := MakeRESTRouter(true, true, kc)
 
-	setupProxyService()
+	type testcase struct {
+		sendLength   string
+		expectStatus int
+	}
 
-	os.Setenv("ARVADOS_EXTERNAL_CLIENT", "true")
-	arv, err := arvadosclient.MakeArvadosClient()
-	c.Assert(err, Equals, nil)
-	kc, err := keepclient.MakeKeepClient(&arv)
-	c.Assert(err, Equals, nil)
-	c.Check(kc.Arvados.External, Equals, true)
-	c.Check(kc.Using_proxy, Equals, true)
-	c.Check(len(kc.LocalRoots()), Equals, 1)
-	for _, root := range kc.LocalRoots() {
-		c.Check(root, Equals, "http://localhost:29950")
+	for _, t := range []testcase{
+		{"1", http.StatusBadRequest},
+		{"", http.StatusLengthRequired},
+		{"-1", http.StatusLengthRequired},
+		{"abcdef", http.StatusLengthRequired},
+	} {
+		req, err := http.NewRequest("PUT",
+			fmt.Sprintf("http://%s/%s+%d", listener.Addr().String(), hash, len(content)),
+			bytes.NewReader(content))
+		c.Assert(err, IsNil)
+		req.Header.Set("Content-Length", t.sendLength)
+		req.Header.Set("Authorization", "OAuth2 4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
+		req.Header.Set("Content-Type", "application/octet-stream")
+
+		resp := httptest.NewRecorder()
+		rtr.ServeHTTP(resp, req)
+		c.Check(resp.Code, Equals, t.expectStatus)
 	}
-	os.Setenv("ARVADOS_EXTERNAL_CLIENT", "")
+}
 
-	waitForListener()
+func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
+	kc := runProxy(c, nil, false)
 	defer closeListener()
 
 	hash := fmt.Sprintf("%x", md5.Sum([]byte("foo")))
@@ -254,15 +240,10 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		c.Check(blocklen, Equals, int64(0))
 		log.Print("Finished Get zero block")
 	}
-
-	log.Print("TestPutAndGet done")
 }
 
 func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
-	log.Print("TestPutAskGetForbidden start")
-
-	kc := runProxy(c, []string{"keepproxy"}, 29951, true)
-	waitForListener()
+	kc := runProxy(c, nil, true)
 	defer closeListener()
 
 	hash := fmt.Sprintf("%x", md5.Sum([]byte("bar")))
@@ -300,15 +281,10 @@ func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
 		c.Check(blocklen, Equals, int64(0))
 		log.Print("Get")
 	}
-
-	log.Print("TestPutAskGetForbidden done")
 }
 
 func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
-	log.Print("TestGetDisabled start")
-
-	kc := runProxy(c, []string{"keepproxy", "-no-get"}, 29952, false)
-	waitForListener()
+	kc := runProxy(c, []string{"-no-get"}, false)
 	defer closeListener()
 
 	hash := fmt.Sprintf("%x", md5.Sum([]byte("baz")))
@@ -346,38 +322,26 @@ func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
 		c.Check(blocklen, Equals, int64(0))
 		log.Print("Get")
 	}
-
-	log.Print("TestGetDisabled done")
 }
 
 func (s *ServerRequiredSuite) TestPutDisabled(c *C) {
-	log.Print("TestPutDisabled start")
-
-	kc := runProxy(c, []string{"keepproxy", "-no-put"}, 29953, false)
-	waitForListener()
+	kc := runProxy(c, []string{"-no-put"}, false)
 	defer closeListener()
 
-	{
-		hash2, rep, err := kc.PutB([]byte("quux"))
-		c.Check(hash2, Equals, "")
-		c.Check(rep, Equals, 0)
-		c.Check(err, Equals, keepclient.InsufficientReplicasError)
-		log.Print("PutB")
-	}
-
-	log.Print("TestPutDisabled done")
+	hash2, rep, err := kc.PutB([]byte("quux"))
+	c.Check(hash2, Equals, "")
+	c.Check(rep, Equals, 0)
+	c.Check(err, Equals, keepclient.InsufficientReplicasError)
 }
 
 func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
-	runProxy(c, []string{"keepproxy"}, 29954, false)
-	waitForListener()
+	runProxy(c, nil, false)
 	defer closeListener()
 
 	{
 		client := http.Client{}
 		req, err := http.NewRequest("OPTIONS",
-			fmt.Sprintf("http://localhost:29954/%x+3",
-				md5.Sum([]byte("foo"))),
+			fmt.Sprintf("http://%s/%x+3", listener.Addr().String(), md5.Sum([]byte("foo"))),
 			nil)
 		req.Header.Add("Access-Control-Request-Method", "PUT")
 		req.Header.Add("Access-Control-Request-Headers", "Authorization, X-Keep-Desired-Replicas")
@@ -392,8 +356,7 @@ func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
 
 	{
 		resp, err := http.Get(
-			fmt.Sprintf("http://localhost:29954/%x+3",
-				md5.Sum([]byte("foo"))))
+			fmt.Sprintf("http://%s/%x+3", listener.Addr().String(), md5.Sum([]byte("foo"))))
 		c.Check(err, Equals, nil)
 		c.Check(resp.Header.Get("Access-Control-Allow-Headers"), Equals, "Authorization, Content-Length, Content-Type, X-Keep-Desired-Replicas")
 		c.Check(resp.Header.Get("Access-Control-Allow-Origin"), Equals, "*")
@@ -401,14 +364,13 @@ func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPostWithoutHash(c *C) {
-	runProxy(c, []string{"keepproxy"}, 29955, false)
-	waitForListener()
+	runProxy(c, nil, false)
 	defer closeListener()
 
 	{
 		client := http.Client{}
 		req, err := http.NewRequest("POST",
-			"http://localhost:29955/",
+			"http://"+listener.Addr().String()+"/",
 			strings.NewReader("qux"))
 		req.Header.Add("Authorization", "OAuth2 4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
 		req.Header.Add("Content-Type", "application/octet-stream")
@@ -444,8 +406,7 @@ func (s *ServerRequiredSuite) TestStripHint(c *C) {
 //   With a valid but non-existing prefix (expect "\n")
 //   With an invalid prefix (expect error)
 func (s *ServerRequiredSuite) TestGetIndex(c *C) {
-	kc := runProxy(c, []string{"keepproxy"}, 28852, false)
-	waitForListener()
+	kc := runProxy(c, nil, false)
 	defer closeListener()
 
 	// Put "index-data" blocks
@@ -479,7 +440,7 @@ func (s *ServerRequiredSuite) TestGetIndex(c *C) {
 		{hash[:3], true, false},  // with matching prefix
 		{"abcdef", false, false}, // with no such prefix
 	} {
-		indexReader, err := kc.GetIndex("proxy", spec.prefix)
+		indexReader, err := kc.GetIndex(TestProxyUUID, spec.prefix)
 		c.Assert(err, Equals, nil)
 		indexResp, err := ioutil.ReadAll(indexReader)
 		c.Assert(err, Equals, nil)
@@ -502,13 +463,12 @@ func (s *ServerRequiredSuite) TestGetIndex(c *C) {
 	}
 
 	// GetIndex with invalid prefix
-	_, err = kc.GetIndex("proxy", "xyz")
+	_, err = kc.GetIndex(TestProxyUUID, "xyz")
 	c.Assert((err != nil), Equals, true)
 }
 
 func (s *ServerRequiredSuite) TestPutAskGetInvalidToken(c *C) {
-	kc := runProxy(c, []string{"keepproxy"}, 28852, false)
-	waitForListener()
+	kc := runProxy(c, nil, false)
 	defer closeListener()
 
 	// Put a test block
@@ -544,9 +504,9 @@ func (s *ServerRequiredSuite) TestAskGetKeepProxyConnectionError(c *C) {
 	c.Assert(err, Equals, nil)
 
 	// keepclient with no such keep server
-	kc := keepclient.New(&arv)
+	kc := keepclient.New(arv)
 	locals := map[string]string{
-		"proxy": "http://localhost:12345",
+		TestProxyUUID: "http://localhost:12345",
 	}
 	kc.SetServiceRoots(locals, nil, nil)
 
@@ -567,22 +527,24 @@ func (s *ServerRequiredSuite) TestAskGetKeepProxyConnectionError(c *C) {
 }
 
 func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {
-	kc := runProxy(c, []string{"keepproxy"}, 29999, false)
-	waitForListener()
+	kc := runProxy(c, nil, false)
 	defer closeListener()
 
-	// Ask should result in temporary connection refused error
 	hash := fmt.Sprintf("%x", md5.Sum([]byte("foo")))
-	_, _, err := kc.Ask(hash)
-	c.Check(err, NotNil)
-	errNotFound, _ := err.(*keepclient.ErrNotFound)
-	c.Check(errNotFound.Temporary(), Equals, true)
-	c.Assert(strings.Contains(err.Error(), "HTTP 502"), Equals, true)
-
-	// Get should result in temporary connection refused error
-	_, _, _, err = kc.Get(hash)
-	c.Check(err, NotNil)
-	errNotFound, _ = err.(*keepclient.ErrNotFound)
-	c.Check(errNotFound.Temporary(), Equals, true)
-	c.Assert(strings.Contains(err.Error(), "HTTP 502"), Equals, true)
+	for _, f := range []func() error{
+		func() error {
+			_, _, err := kc.Ask(hash)
+			return err
+		},
+		func() error {
+			_, _, _, err := kc.Get(hash)
+			return err
+		},
+	} {
+		err := f()
+		c.Assert(err, NotNil)
+		errNotFound, _ := err.(*keepclient.ErrNotFound)
+		c.Check(errNotFound.Temporary(), Equals, true)
+		c.Check(err, ErrorMatches, `.*HTTP 502.*`)
+	}
 }