VAULT 18227/introduce cap ldap library #22185
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import ( | |
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/cap/ldap" | ||
| "github.com/hashicorp/go-secure-stdlib/strutil" | ||
|
|
||
| "github.com/hashicorp/vault/sdk/framework" | ||
|
|
@@ -76,82 +77,25 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri | |
| return "", nil, logical.ErrorResponse("password cannot be of zero length when passwordless binds are being denied"), nil, nil | ||
| } | ||
|
|
||
| ldapClient, err := ldap.NewClient(ctx, ldaputil.ConvertConfig(cfg.ConfigEntry)) | ||
| if err != nil { | ||
| return "", nil, logical.ErrorResponse(err.Error()), nil, nil | ||
| } | ||
|
|
||
| // Clean connection | ||
|
There was a problem hiding this comment. All of the code deleted below is implemented via the We do need to specify options to also get |
||
| defer ldapClient.Close(ctx) | ||
|
|
||
| c, err := ldapClient.Authenticate(ctx, username, password, ldap.WithGroups(), ldap.WithUserAttributes()) | ||
| if err != nil { | ||
| if strings.Contains(err.Error(), "discovery of user bind DN failed") || | ||
| strings.Contains(err.Error(), "unable to bind user") { | ||
|
Comment on lines
+90
to
+91
There was a problem hiding this comment. A little manual, as the |
||
| return "", nil, logical.ErrorResponse(errUserBindFailed), nil, logical.ErrInvalidCredentials | ||
| } | ||
|
|
||
| return "", nil, logical.ErrorResponse(err.Error()), nil, nil | ||
| } | ||
|
|
||
| ldapGroups := c.Groups | ||
| ldapResponse := &logical.Response{ | ||
| Data: map[string]interface{}{}, | ||
| } | ||
|
|
@@ -162,6 +106,10 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri | |
| ldapResponse.AddWarning(errString) | ||
| } | ||
|
|
||
| for _, warning := range c.Warnings { | ||
| ldapResponse.AddWarning(string(warning)) | ||
| } | ||
|
|
||
| var allGroups []string | ||
| canonicalUsername := username | ||
| cs := *cfg.CaseSensitiveNames | ||
|
|
@@ -206,13 +154,11 @@ func (b *backend) Login(ctx context.Context, req *logical.Request, username stri | |
| return username, policies, ldapResponse, allGroups, nil | ||
| } | ||
|
|
||
|
Comment on lines
-209
to
-213
There was a problem hiding this comment. The implementation of this can be found here. I believe it boils down to finding the 'CN' (common name) attribute. |
||
| cn := c.UserAttributes["cn"] | ||
|
There was a problem hiding this comment. I'm not sure this is quite correct. It appears that There was a problem hiding this comment. You're right, thanks for catching this! |
||
| if len(cn) == 0 { | ||
| return "", nil, logical.ErrorResponse("missing entity alias attribute value"), nil, nil | ||
| } | ||
| entityAliasAttribute := cn[0] | ||
|
|
||
| return entityAliasAttribute, policies, ldapResponse, allGroups, nil | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| ```release-note:improvement | ||
| auth/ldap: introduce cap/ldap.Client for LDAP authentication | ||
| auth/ldap: deprecates `connection_timeout` in favor of `request_timeout` for timeouts | ||
| sdk/ldaputil: deprecates Client in favor of cap/ldap.Client | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👋🏼