Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve consistency in error messages #10537

Merged
merged 2 commits into from
Dec 11, 2020
Merged

Improve consistency in error messages #10537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f901a83
Improve consistency in error messages
catsby Dec 11, 2020
f43dc3c
add changelog entry
catsby Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions builtin/credential/ldap/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
"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) {
b := Backend()
if err := b.Setup(ctx, conf); err != nil {
Expand Down Expand Up @@ -93,7 +95,7 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri
if b.Logger().IsDebug() {
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() {
Expand All @@ -110,7 +112,7 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri
if b.Logger().IsDebug() {
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
Expand Down
3 changes: 3 additions & 0 deletions changelog/10537.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
auth/ldap: Improve consistency in error messages
```