Split out HTTP handler tests into their own file.

Refs #2328

diff --git a/services/keep/src/keep/keep_test.go b/services/keep/src/keep/keep_test.go
index d3536d6c53dce0b158d2518a1dc44daea0706205..6642c72211a4c1fb44bd0cd02b6a64955c1b515f 100644 (file)
--- a/services/keep/src/keep/keep_test.go
+++ b/services/keep/src/keep/keep_test.go
@@ -4,13 +4,10 @@ import (
        "bytes"
        "fmt"
        "io/ioutil"
-       "net/http"
-       "net/http/httptest"
        "os"
        "path"
        "regexp"
        "testing"
-       "time"
 )
 
 var TEST_BLOCK = []byte("The quick brown fox jumps over the lazy dog.")
@@ -395,234 +392,6 @@ func TestNodeStatus(t *testing.T) {
        }
 }
 
-// ========================================
-// Tests for HTTP handlers
-// ========================================
-
-func TestGetHandler(t *testing.T) {
-       defer teardown()
-
-       // Prepare two test Keep volumes. Our block is stored on the second volume.
-       KeepVM = MakeTestVolumeManager(2)
-       defer func() { KeepVM.Quit() }()
-
-       vols := KeepVM.Volumes()
-       if err := vols[0].Put(TEST_HASH, TEST_BLOCK); err != nil {
-               t.Error(err)
-       }
-
-       // Set up a REST router for testing the handlers.
-       rest := NewRESTRouter()
-
-       // Test an unsigned GET request.
-       test_url := "http://localhost:25107/" + TEST_HASH
-       req, _ := http.NewRequest("GET", test_url, nil)
-       resp := httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != 200 {
-               t.Errorf("bad response code: %v", resp)
-       }
-       if bytes.Compare(resp.Body.Bytes(), TEST_BLOCK) != 0 {
-               t.Errorf("bad response body: %v", resp)
-       }
-
-       // Enable permissions.
-       enforce_permissions = true
-       PermissionSecret = []byte(known_key)
-       permission_ttl = 300
-       expiry := time.Now().Add(time.Duration(permission_ttl) * time.Second)
-
-       // Test GET with a signed locator.
-       test_url = "http://localhost:25107/" + SignLocator(TEST_HASH, known_token, expiry)
-       resp = httptest.NewRecorder()
-       req, _ = http.NewRequest("GET", test_url, nil)
-       req.Header.Set("Authorization", "OAuth "+known_token)
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != 200 {
-               t.Errorf("signed request: bad response code: %v", resp)
-       }
-       if bytes.Compare(resp.Body.Bytes(), TEST_BLOCK) != 0 {
-               t.Errorf("signed request: bad response body: %v", resp)
-       }
-
-       // Test GET with an unsigned locator.
-       test_url = "http://localhost:25107/" + TEST_HASH
-       resp = httptest.NewRecorder()
-       req, _ = http.NewRequest("GET", test_url, nil)
-       req.Header.Set("Authorization", "OAuth "+known_token)
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != PermissionError.HTTPCode {
-               t.Errorf("unsigned request: bad response code: %v", resp)
-       }
-
-       // Test GET with a signed locator and an unauthenticated request.
-       test_url = "http://localhost:25107/" + SignLocator(TEST_HASH, known_token, expiry)
-       resp = httptest.NewRecorder()
-       req, _ = http.NewRequest("GET", test_url, nil)
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != PermissionError.HTTPCode {
-               t.Errorf("signed locator, unauthenticated request: bad response code: %v", resp)
-       }
-
-       // Test GET with an expired, signed locator.
-       expired_ts := time.Now().Add(-time.Hour)
-       test_url = "http://localhost:25107/" + SignLocator(TEST_HASH, known_token, expired_ts)
-       resp = httptest.NewRecorder()
-       req, _ = http.NewRequest("GET", test_url, nil)
-       req.Header.Set("Authorization", "OAuth "+known_token)
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != ExpiredError.HTTPCode {
-               t.Errorf("expired signature: bad response code: %v", resp)
-       }
-}
-
-func TestPutHandler(t *testing.T) {
-       defer teardown()
-
-       // Prepare two test Keep volumes.
-       KeepVM = MakeTestVolumeManager(2)
-       defer func() { KeepVM.Quit() }()
-
-       // Set up a REST router for testing the handlers.
-       rest := NewRESTRouter()
-
-       // Execute a PUT request.
-       test_url := "http://localhost:25107/" + TEST_HASH
-       test_body := bytes.NewReader(TEST_BLOCK)
-       req, _ := http.NewRequest("PUT", test_url, test_body)
-       resp := httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != 200 {
-               t.Errorf("bad response code: %v", resp)
-       }
-       if resp.Body.String() != TEST_HASH {
-               t.Errorf("bad response body: %v", resp)
-       }
-
-       // Add a permission key.
-       // When a permission key is available, the locator returned
-       // from a PUT request will be signed.
-       PermissionSecret = []byte(known_key)
-
-       // An authenticated PUT request returns a signed locator.
-       test_url = "http://localhost:25107/" + TEST_HASH
-       test_body = bytes.NewReader(TEST_BLOCK)
-       req, _ = http.NewRequest("PUT", test_url, test_body)
-       req.Header.Set("Authorization", "OAuth "+known_token)
-       resp = httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != 200 {
-               t.Errorf("bad response code: %v", resp)
-       }
-       if !VerifySignature(resp.Body.String(), known_token) {
-               t.Errorf("bad response body: %v", resp)
-       }
-
-       // An unauthenticated PUT request returns an unsigned locator
-       // even when a permission key is available.
-       test_url = "http://localhost:25107/" + TEST_HASH
-       test_body = bytes.NewReader(TEST_BLOCK)
-       req, _ = http.NewRequest("PUT", test_url, test_body)
-       resp = httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != 200 {
-               t.Errorf("bad response code: %v", resp)
-       }
-       if resp.Body.String() != TEST_HASH {
-               t.Errorf("bad response body: %v", resp)
-       }
-}
-
-func TestIndexHandler(t *testing.T) {
-       defer teardown()
-
-       // Set up Keep volumes and populate them.
-       // Include multiple blocks on different volumes, and
-       // some metadata files.
-       KeepVM = MakeTestVolumeManager(2)
-       defer func() { KeepVM.Quit() }()
-
-       vols := KeepVM.Volumes()
-       vols[0].Put(TEST_HASH, TEST_BLOCK)
-       vols[1].Put(TEST_HASH_2, TEST_BLOCK_2)
-
-       // Set up a REST router for testing the handlers.
-       rest := NewRESTRouter()
-
-       // Requests for /index with a prefix are okay even if unauthenticated.
-       test_url := "http://localhost:25107/index/" + TEST_HASH[0:5]
-       req, _ := http.NewRequest("GET", test_url, nil)
-       resp := httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       expected := `^` + TEST_HASH + `\+\d+ \d+\n$`
-       match, _ := regexp.MatchString(expected, resp.Body.String())
-       if !match {
-               t.Errorf("IndexHandler returned:\n%s", resp.Body.String())
-       }
-
-       // Unauthenticated /index requests: fail.
-       test_url = "http://localhost:25107/index"
-       req, _ = http.NewRequest("GET", test_url, nil)
-       resp = httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != PermissionError.HTTPCode {
-               t.Errorf("unauthenticated /index: %+v", resp)
-       }
-
-       // Authenticated /index requests by a non-superuser: also fail.
-       test_url = "http://localhost:25107/index"
-       req, _ = http.NewRequest("GET", test_url, nil)
-       req.Header.Set("Authorization", "OAuth "+known_token)
-       resp = httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != PermissionError.HTTPCode {
-               t.Errorf("authenticated /index: %+v", resp)
-       }
-
-       // Even superuser /index requests fail if enforce_permissions is off!
-       enforce_permissions = false
-       data_manager_token = "DATA MANAGER TOKEN"
-       test_url = "http://localhost:25107/index"
-       req, _ = http.NewRequest("GET", test_url, nil)
-       req.Header.Set("Authorization", "OAuth "+data_manager_token)
-       resp = httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != PermissionError.HTTPCode {
-               t.Errorf("superuser /index (permissions off): %+v", resp)
-       }
-
-       // Superuser /index requests with enforce_permissions set: succeed!
-       enforce_permissions = true
-       data_manager_token = "DATA MANAGER TOKEN"
-       test_url = "http://localhost:25107/index"
-       req, _ = http.NewRequest("GET", test_url, nil)
-       req.Header.Set("Authorization", "OAuth "+data_manager_token)
-       resp = httptest.NewRecorder()
-       rest.ServeHTTP(resp, req)
-
-       if resp.Code != http.StatusOK {
-               t.Errorf("superuser /index: %+v", resp)
-       }
-       expected = `^` + TEST_HASH + `\+\d+ \d+\n` +
-               TEST_HASH_2 + `\+\d+ \d+\n$`
-       match, _ = regexp.MatchString(expected, resp.Body.String())
-       if !match {
-               t.Errorf("superuser /index:\n%s", resp.Body.String())
-       }
-}
-
 // ========================================
 // Helper functions for unit tests.
 // ========================================