From a51a0874b62b827fb135b20e33cbea3f05279f4c Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Fri, 12 May 2017 11:14:00 -0700 Subject: [PATCH] Update the error when no key can be found to a more clear error text (#2720) --- builtin/logical/transit/path_datakey.go | 2 +- builtin/logical/transit/path_decrypt.go | 2 +- builtin/logical/transit/path_encrypt.go | 2 +- builtin/logical/transit/path_hmac.go | 4 ++-- builtin/logical/transit/path_rewrap.go | 2 +- builtin/logical/transit/path_sign_verify.go | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/logical/transit/path_datakey.go b/builtin/logical/transit/path_datakey.go index 36c6aea424..c1a21d7f2b 100644 --- a/builtin/logical/transit/path_datakey.go +++ b/builtin/logical/transit/path_datakey.go @@ -97,7 +97,7 @@ func (b *backend) pathDatakeyWrite( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } newKey := make([]byte, 32) diff --git a/builtin/logical/transit/path_decrypt.go b/builtin/logical/transit/path_decrypt.go index c66931d44f..9750bebff6 100644 --- a/builtin/logical/transit/path_decrypt.go +++ b/builtin/logical/transit/path_decrypt.go @@ -119,7 +119,7 @@ func (b *backend) pathDecryptWrite( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } for i, item := range batchInputItems { diff --git a/builtin/logical/transit/path_encrypt.go b/builtin/logical/transit/path_encrypt.go index b4281d60e1..937d4c864d 100644 --- a/builtin/logical/transit/path_encrypt.go +++ b/builtin/logical/transit/path_encrypt.go @@ -233,7 +233,7 @@ func (b *backend) pathEncryptWrite( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } // Process batch request items. If encryption of any request diff --git a/builtin/logical/transit/path_hmac.go b/builtin/logical/transit/path_hmac.go index 31c156f0b9..6ddf5df1ce 100644 --- a/builtin/logical/transit/path_hmac.go +++ b/builtin/logical/transit/path_hmac.go @@ -79,7 +79,7 @@ func (b *backend) pathHMACWrite( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } key, err := p.HMACKey(p.LatestVersion) @@ -162,7 +162,7 @@ func (b *backend) pathHMACVerify( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } if ver > p.LatestVersion { diff --git a/builtin/logical/transit/path_rewrap.go b/builtin/logical/transit/path_rewrap.go index 167656a6e8..173188e9fb 100644 --- a/builtin/logical/transit/path_rewrap.go +++ b/builtin/logical/transit/path_rewrap.go @@ -113,7 +113,7 @@ func (b *backend) pathRewrapWrite( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } for i, item := range batchInputItems { diff --git a/builtin/logical/transit/path_sign_verify.go b/builtin/logical/transit/path_sign_verify.go index ff018808e0..c0f814f2ed 100644 --- a/builtin/logical/transit/path_sign_verify.go +++ b/builtin/logical/transit/path_sign_verify.go @@ -145,7 +145,7 @@ func (b *backend) pathSignWrite( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } if !p.Type.SigningSupported() { @@ -222,7 +222,7 @@ func (b *backend) pathVerifyWrite( return nil, err } if p == nil { - return logical.ErrorResponse("policy not found"), logical.ErrInvalidRequest + return logical.ErrorResponse("encryption key not found"), logical.ErrInvalidRequest } valid, err := p.VerifySignature(hashedInput, sig)