X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7800f12fccea5675d71159ddf7c868f4074f8f56..8fdac0b6f954b6265798390b95e61f8192b85630:/services/ws/server_test.go

diff --git a/services/ws/server_test.go b/services/ws/server_test.go
index 57c734af2d..b1f943857a 100644
--- a/services/ws/server_test.go
+++ b/services/ws/server_test.go
@@ -1,12 +1,18 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
+	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"sync"
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	check "gopkg.in/check.v1"
 )
 
@@ -28,6 +34,7 @@ func (*serverSuite) testConfig() *wsConfig {
 	cfg.Client = *(arvados.NewClientFromEnv())
 	cfg.Postgres = testDBConfig()
 	cfg.Listen = ":"
+	cfg.ManagementToken = arvadostest.ManagementToken
 	return &cfg
 }
 
@@ -63,10 +70,55 @@ func (s *serverSuite) TestBadDB(c *check.C) {
 
 func (s *serverSuite) TestHealth(c *check.C) {
 	go s.srv.Run()
+	defer s.srv.Close()
 	s.srv.WaitReady()
-	resp, err := http.Get("http://" + s.srv.listener.Addr().String() + "/_health/ping")
+	for _, token := range []string{"", "foo", s.cfg.ManagementToken} {
+		req, err := http.NewRequest("GET", "http://"+s.srv.listener.Addr().String()+"/_health/ping", nil)
+		c.Assert(err, check.IsNil)
+		if token != "" {
+			req.Header.Add("Authorization", "Bearer "+token)
+		}
+		resp, err := http.DefaultClient.Do(req)
+		c.Check(err, check.IsNil)
+		if token == s.cfg.ManagementToken {
+			c.Check(resp.StatusCode, check.Equals, http.StatusOK)
+			buf, err := ioutil.ReadAll(resp.Body)
+			c.Check(err, check.IsNil)
+			c.Check(string(buf), check.Equals, `{"health":"OK"}`+"\n")
+		} else {
+			c.Check(resp.StatusCode, check.Not(check.Equals), http.StatusOK)
+		}
+	}
+}
+
+func (s *serverSuite) TestStatus(c *check.C) {
+	go s.srv.Run()
+	defer s.srv.Close()
+	s.srv.WaitReady()
+	req, err := http.NewRequest("GET", "http://"+s.srv.listener.Addr().String()+"/status.json", nil)
+	c.Assert(err, check.IsNil)
+	resp, err := http.DefaultClient.Do(req)
 	c.Check(err, check.IsNil)
-	buf, err := ioutil.ReadAll(resp.Body)
+	c.Check(resp.StatusCode, check.Equals, http.StatusOK)
+	var status map[string]interface{}
+	err = json.NewDecoder(resp.Body).Decode(&status)
 	c.Check(err, check.IsNil)
-	c.Check(string(buf), check.Equals, `{"health":"OK"}`+"\n")
+	c.Check(status["Version"], check.Not(check.Equals), "")
+}
+
+func (s *serverSuite) TestHealthDisabled(c *check.C) {
+	s.cfg.ManagementToken = ""
+
+	go s.srv.Run()
+	defer s.srv.Close()
+	s.srv.WaitReady()
+
+	for _, token := range []string{"", "foo", arvadostest.ManagementToken} {
+		req, err := http.NewRequest("GET", "http://"+s.srv.listener.Addr().String()+"/_health/ping", nil)
+		c.Assert(err, check.IsNil)
+		req.Header.Add("Authorization", "Bearer "+token)
+		resp, err := http.DefaultClient.Do(req)
+		c.Check(err, check.IsNil)
+		c.Check(resp.StatusCode, check.Equals, http.StatusNotFound)
+	}
 }