http: /sys/seal-status should return 400 if still uninitialized

benjarrell · Mar 31, 2015 · e657ac8 · e657ac8
1 parent 5102c89
commit e657ac8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/http/sys_seal.go b/http/sys_seal.go
@@ -3,6 +3,7 @@ package http
 import (
 	"encoding/hex"
 	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/hashicorp/errwrap"
@@ -92,6 +93,11 @@ func handleSysSealStatusRaw(core *vault.Core, w http.ResponseWriter, r *http.Req
 		respondError(w, http.StatusInternalServerError, err)
 		return
 	}
+	if sealConfig == nil {
+		respondError(w, http.StatusBadRequest, fmt.Errorf(
+			"server is not yet initialized"))
+		return
+	}
 
 	respondOk(w, &SealStatusResponse{
 		Sealed:   sealed,

diff --git a/http/sys_seal_test.go b/http/sys_seal_test.go
@@ -34,6 +34,18 @@ func TestSysSealStatus(t *testing.T) {
 	}
 }
 
+func TestSysSealStatus_uninit(t *testing.T) {
+	core := vault.TestCore(t)
+	ln, addr := TestServer(t, core)
+	defer ln.Close()
+
+	resp, err := http.Get(addr + "/v1/sys/seal-status")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	testResponseStatus(t, resp, 400)
+}
+
 func TestSysSeal(t *testing.T) {
 	core := vault.TestCore(t)
 	vault.TestCoreInit(t, core)