signatory tests got refactored

ecadlabs · Jul 26, 2021 · 355f8fa · 355f8fa
1 parent 9998b2e
commit 355f8fa
Show file tree

Hide file tree

Showing 11 changed files with 221 additions and 362 deletions.
diff --git a/cmd/commands/root.go b/cmd/commands/root.go
@@ -56,10 +56,10 @@ func NewRootCommand(c *Context, name string) *cobra.Command {
 				Policy:      pol,
 				Vaults:      conf.Vaults,
 				Interceptor: metrics.Interceptor,
-				Watermark:   signatory.NewInMemoryWatermark(),
+				Watermark:   &signatory.InMemoryWatermark{},
 			}
 
-			sig, err := signatory.NewSignatory(c.Context, &sigConf)
+			sig, err := signatory.New(c.Context, &sigConf)
 			if err != nil {
 				return err
 			}

diff --git a/cmd/signatory-cli/main.go b/cmd/signatory-cli/main.go
@@ -16,6 +16,7 @@ import (
 	_ "github.com/ecadlabs/signatory/pkg/vault/cloudkms"
 	_ "github.com/ecadlabs/signatory/pkg/vault/file"
 	_ "github.com/ecadlabs/signatory/pkg/vault/ledger"
+	_ "github.com/ecadlabs/signatory/pkg/vault/mem"
 	_ "github.com/ecadlabs/signatory/pkg/vault/yubi"
 )
 

diff --git a/cmd/signatory/main.go b/cmd/signatory/main.go
@@ -15,6 +15,7 @@ import (
 	_ "github.com/ecadlabs/signatory/pkg/vault/cloudkms"
 	_ "github.com/ecadlabs/signatory/pkg/vault/file"
 	_ "github.com/ecadlabs/signatory/pkg/vault/ledger"
+	_ "github.com/ecadlabs/signatory/pkg/vault/mem"
 	_ "github.com/ecadlabs/signatory/pkg/vault/yubi"
 )
 

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
@@ -92,8 +92,7 @@ func TestSign(t *testing.T) {
 
 			handler, err := srv.Handler()
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			s := httptest.NewServer(handler)
@@ -106,21 +105,18 @@ func TestSign(t *testing.T) {
 
 			req, err := http.NewRequest("POST", s.URL+"/keys/03123453", body)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 			resp, err := s.Client().Do(req)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			require.Equal(t, c.StatusCode, resp.StatusCode)
 
 			b, err := ioutil.ReadAll(resp.Body)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			require.Equal(t, c.Expected, string(b))
@@ -165,30 +161,26 @@ func TestGetPublicKey(t *testing.T) {
 
 			handler, err := srv.Handler()
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			s := httptest.NewServer(handler)
 			defer s.Close()
 
 			req, err := http.NewRequest("GET", s.URL+"/keys/03123453", nil)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 			resp, err := s.Client().Do(req)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			require.Equal(t, c.StatusCode, resp.StatusCode)
 
 			b, err := ioutil.ReadAll(resp.Body)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			require.Equal(t, c.Expected, string(b))
@@ -233,8 +225,7 @@ func TestSignedRequest(t *testing.T) {
 
 			handler, err := srv.Handler()
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			s := httptest.NewServer(handler)
@@ -250,13 +241,11 @@ func TestSignedRequest(t *testing.T) {
 
 			req, err := http.NewRequest("POST", u.String(), body)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 			resp, err := s.Client().Do(req)
 			if err != nil {
-				t.Error(err)
-				return
+				t.Fatal(err)
 			}
 
 			require.Equal(t, c.StatusCode, resp.StatusCode)

diff --git a/pkg/signatory/signatory.go b/pkg/signatory/signatory.go
@@ -253,8 +253,8 @@ func (s *Signatory) Sign(ctx context.Context, req *SignRequest) (string, error)
 	}
 	l.WithField("raw", hex.EncodeToString(req.Message)).Log(level, "About to sign raw bytes")
 
-	if !s.config.Watermark.IsSafeToSign(req.PublicKeyHash, msg) {
-		err = ErrNotSafeToSign
+	if err = s.config.Watermark.IsSafeToSign(req.PublicKeyHash, msg); err != nil {
+		err = errors.Wrap(err, http.StatusForbidden)
 		l.Error(err)
 		return "", err
 	}
@@ -417,8 +417,8 @@ type Config struct {
 	VaultFactory vault.Factory
 }
 
-// NewSignatory returns Signatory instance
-func NewSignatory(ctx context.Context, c *Config) (*Signatory, error) {
+// New returns Signatory instance
+func New(ctx context.Context, c *Config) (*Signatory, error) {
 	s := &Signatory{
 		config: *c,
 		vaults: make(map[string]vault.Vault, len(c.Vaults)),