X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d9c9f862f9bec00285d39dd64d2b677af9aabe92..13ea738547ce7232c152873970770c21e97d2830:/lib/controller/handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 723e1011f9..39c2b1c68e 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -5,9 +5,11 @@
 package controller
 
 import (
+	"bytes"
 	"context"
 	"crypto/tls"
 	"encoding/json"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -36,13 +38,15 @@ var _ = check.Suite(&HandlerSuite{})
 type HandlerSuite struct {
 	cluster *arvados.Cluster
 	handler *Handler
+	logbuf  *bytes.Buffer
 	ctx     context.Context
 	cancel  context.CancelFunc
 }
 
 func (s *HandlerSuite) SetUpTest(c *check.C) {
+	s.logbuf = &bytes.Buffer{}
 	s.ctx, s.cancel = context.WithCancel(context.Background())
-	s.ctx = ctxlog.Context(s.ctx, ctxlog.New(os.Stderr, "json", "debug"))
+	s.ctx = ctxlog.Context(s.ctx, ctxlog.New(io.MultiWriter(os.Stderr, s.logbuf), "json", "debug"))
 	s.cluster = &arvados.Cluster{
 		ClusterID:  "zzzzz",
 		PostgreSQL: integrationTestCluster().PostgreSQL,
@@ -200,17 +204,21 @@ func (s *HandlerSuite) TestProxyDiscoveryDoc(c *check.C) {
 	c.Check(len(dd.Schemas), check.Not(check.Equals), 0)
 }
 
-func (s *HandlerSuite) TestRequestTimeout(c *check.C) {
-	s.cluster.API.RequestTimeout = arvados.Duration(time.Nanosecond)
-	req := httptest.NewRequest("GET", "/discovery/v1/apis/arvados/v1/rest", nil)
+// Handler should give up and exit early if request context is
+// cancelled due to client hangup, httpserver.HandlerWithDeadline,
+// etc.
+func (s *HandlerSuite) TestRequestCancel(c *check.C) {
+	ctx, cancel := context.WithCancel(context.Background())
+	req := httptest.NewRequest("GET", "/discovery/v1/apis/arvados/v1/rest", nil).WithContext(ctx)
 	resp := httptest.NewRecorder()
+	cancel()
 	s.handler.ServeHTTP(resp, req)
 	c.Check(resp.Code, check.Equals, http.StatusBadGateway)
 	var jresp httpserver.ErrorResponse
 	err := json.Unmarshal(resp.Body.Bytes(), &jresp)
 	c.Check(err, check.IsNil)
 	c.Assert(len(jresp.Errors), check.Equals, 1)
-	c.Check(jresp.Errors[0], check.Matches, `.*context deadline exceeded.*`)
+	c.Check(jresp.Errors[0], check.Matches, `.*context canceled`)
 }
 
 func (s *HandlerSuite) TestProxyWithoutToken(c *check.C) {
@@ -317,6 +325,16 @@ func (s *HandlerSuite) TestValidateRemoteToken(c *check.C) {
 	}
 }
 
+func (s *HandlerSuite) TestLogTokenUUID(c *check.C) {
+	req := httptest.NewRequest("GET", "https://0.0.0.0/arvados/v1/users/current", nil)
+	req.Header.Set("Authorization", "Bearer "+arvadostest.ActiveTokenV2)
+	req = req.WithContext(s.ctx)
+	resp := httptest.NewRecorder()
+	httpserver.LogRequests(s.handler).ServeHTTP(resp, req)
+	c.Check(resp.Code, check.Equals, http.StatusOK)
+	c.Check(s.logbuf.String(), check.Matches, `(?ms).*"tokenUUIDs":\["`+strings.Split(arvadostest.ActiveTokenV2, "/")[1]+`"\].*`)
+}
+
 func (s *HandlerSuite) TestCreateAPIToken(c *check.C) {
 	req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil)
 	auth, err := s.handler.createAPItoken(req, arvadostest.ActiveUserUUID, nil)
@@ -367,16 +385,14 @@ func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, ski
 	for k := range direct {
 		if _, ok := skippedFields[k]; ok {
 			continue
-		} else if val, ok := proxied[k]; ok {
-			if direct["kind"] == "arvados#collection" && k == "manifest_text" {
-				// Tokens differ from request to request
-				c.Check(strings.Split(val.(string), "+A")[0], check.Equals, strings.Split(direct[k].(string), "+A")[0])
-			} else {
-				c.Check(val, check.DeepEquals, direct[k],
-					check.Commentf("RailsAPI %s key %q's value %q differs from controller's %q.", direct["kind"], k, direct[k], val))
-			}
-		} else {
+		} else if val, ok := proxied[k]; !ok {
 			c.Errorf("%s's key %q missing on controller's response.", direct["kind"], k)
+		} else if direct["kind"] == "arvados#collection" && k == "manifest_text" {
+			// Tokens differ from request to request
+			c.Check(strings.Split(val.(string), "+A")[0], check.Equals, strings.Split(direct[k].(string), "+A")[0])
+		} else {
+			c.Check(val, check.DeepEquals, direct[k],
+				check.Commentf("RailsAPI %s key %q's value %q differs from controller's %q.", direct["kind"], k, direct[k], val))
 		}
 	}
 }