From aab6d7bb32ca206aaeebacc8d2fb870041e5a5b9 Mon Sep 17 00:00:00 2001 From: Marton Soos Date: Fri, 10 Apr 2020 11:38:24 +0200 Subject: [PATCH 1/3] Add credential malformed error message --- pkg/secrethub/credentials/encoding.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/secrethub/credentials/encoding.go b/pkg/secrethub/credentials/encoding.go index 0f871d47..33f2d2c9 100644 --- a/pkg/secrethub/credentials/encoding.go +++ b/pkg/secrethub/credentials/encoding.go @@ -22,9 +22,10 @@ var ( ErrInvalidCredentialHeaderField = errCredentials.Code("invalid_credential_header_field").ErrorPref("invalid header field: %s") ErrCannotDecodeCredentialHeader = errCredentials.Code("invalid_credential_header").ErrorPref("cannot decode credential header: %v") ErrUnsupportedCredentialType = errCredentials.Code("unsupported_credential_type").ErrorPref("unsupported credential type: %s") - ErrCannotDecodeCredentialPayload = errCredentials.Code("invalid_credential_header").ErrorPref("cannot decode credential payload: %v") + ErrCannotDecodeCredentialPayload = errCredentials.Code("invalid_credential_payload").ErrorPref("cannot decode credential payload: %v") ErrCannotDecodeEncryptedCredential = errCredentials.Code("cannot_decode_encrypted_credential").Error("cannot decode an encrypted credential without a key") ErrCannotDecryptCredential = errCredentials.Code("cannot_decrypt_credential").Error("passphrase is incorrect") + ErrMalformedCredential = errCredentials.Code("malformed_credential").Error("credential is malformed") ErrInvalidKey = errCredentials.Code("invalid_key").Error("the given key is not valid for the encryption algorithm") ) @@ -226,7 +227,7 @@ type rsaPrivateKeyDecoder struct{} func (d rsaPrivateKeyDecoder) Decode(payload []byte) (*RSACredential, error) { key, err := x509.ParsePKCS1PrivateKey(payload) if err != nil { - return nil, err + return nil, ErrMalformedCredential } return &RSACredential{ From 03676132ca65b4089be5206514c5ca6747274fff Mon Sep 17 00:00:00 2001 From: Marton Soos Date: Fri, 10 Apr 2020 14:11:07 +0200 Subject: [PATCH 2/3] Wrap credential malformed error --- pkg/secrethub/credentials/encoding.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/secrethub/credentials/encoding.go b/pkg/secrethub/credentials/encoding.go index 33f2d2c9..6d68e960 100644 --- a/pkg/secrethub/credentials/encoding.go +++ b/pkg/secrethub/credentials/encoding.go @@ -25,7 +25,7 @@ var ( ErrCannotDecodeCredentialPayload = errCredentials.Code("invalid_credential_payload").ErrorPref("cannot decode credential payload: %v") ErrCannotDecodeEncryptedCredential = errCredentials.Code("cannot_decode_encrypted_credential").Error("cannot decode an encrypted credential without a key") ErrCannotDecryptCredential = errCredentials.Code("cannot_decrypt_credential").Error("passphrase is incorrect") - ErrMalformedCredential = errCredentials.Code("malformed_credential").Error("credential is malformed") + ErrMalformedCredential = errCredentials.Code("malformed_credential").ErrorPref("credential is malformed: %v") ErrInvalidKey = errCredentials.Code("invalid_key").Error("the given key is not valid for the encryption algorithm") ) @@ -227,7 +227,7 @@ type rsaPrivateKeyDecoder struct{} func (d rsaPrivateKeyDecoder) Decode(payload []byte) (*RSACredential, error) { key, err := x509.ParsePKCS1PrivateKey(payload) if err != nil { - return nil, ErrMalformedCredential + return nil, ErrMalformedCredential(err) } return &RSACredential{ From b5efabfd0d36389974052939ff424c003b604265 Mon Sep 17 00:00:00 2001 From: Marton Soos Date: Mon, 18 May 2020 19:46:27 +0200 Subject: [PATCH 3/3] Revert change in error code --- pkg/secrethub/credentials/encoding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/secrethub/credentials/encoding.go b/pkg/secrethub/credentials/encoding.go index 6d68e960..3ed72ddf 100644 --- a/pkg/secrethub/credentials/encoding.go +++ b/pkg/secrethub/credentials/encoding.go @@ -22,7 +22,7 @@ var ( ErrInvalidCredentialHeaderField = errCredentials.Code("invalid_credential_header_field").ErrorPref("invalid header field: %s") ErrCannotDecodeCredentialHeader = errCredentials.Code("invalid_credential_header").ErrorPref("cannot decode credential header: %v") ErrUnsupportedCredentialType = errCredentials.Code("unsupported_credential_type").ErrorPref("unsupported credential type: %s") - ErrCannotDecodeCredentialPayload = errCredentials.Code("invalid_credential_payload").ErrorPref("cannot decode credential payload: %v") + ErrCannotDecodeCredentialPayload = errCredentials.Code("invalid_credential_header").ErrorPref("cannot decode credential payload: %v") ErrCannotDecodeEncryptedCredential = errCredentials.Code("cannot_decode_encrypted_credential").Error("cannot decode an encrypted credential without a key") ErrCannotDecryptCredential = errCredentials.Code("cannot_decrypt_credential").Error("passphrase is incorrect") ErrMalformedCredential = errCredentials.Code("malformed_credential").ErrorPref("credential is malformed: %v")