luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Improve consistency in error messages (#10537) 

* Improve consistency in error messages

* add changelog entry
This commit is contained in:
Clint 2020-12-11 15:21:53 -06:00 committed by GitHub
parent 1911e92dca
commit 4d81e3be4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/credential/ldap/backend.go
View File

@ -12,6 +12,8 @@ import (
"github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/logical"
) )
const errUserBindFailed = `ldap operation failed: failed to bind as user`
func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) {
b := Backend() b := Backend()
if err := b.Setup(ctx, conf); err != nil { if err := b.Setup(ctx, conf); err != nil {
@ -93,7 +95,7 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri
if b.Logger().IsDebug() { if b.Logger().IsDebug() {
b.Logger().Debug("error getting user bind DN", "error", err) b.Logger().Debug("error getting user bind DN", "error", err)
} }
return nil, logical.ErrorResponse("ldap operation failed: unable to retrieve user bind DN"), nil, nil return nil, logical.ErrorResponse(errUserBindFailed), nil, nil
} }
if b.Logger().IsDebug() { if b.Logger().IsDebug() {
@ -110,7 +112,7 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri
if b.Logger().IsDebug() { if b.Logger().IsDebug() {
b.Logger().Debug("ldap bind failed", "error", err) b.Logger().Debug("ldap bind failed", "error", err)
} }
return nil, logical.ErrorResponse("ldap operation failed: failed to bind as user"), nil, nil return nil, logical.ErrorResponse(errUserBindFailed), nil, nil
} }
// We re-bind to the BindDN if it's defined because we assume // We re-bind to the BindDN if it's defined because we assume

3
changelog/10537.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
auth/ldap: Improve consistency in error messages
```