Fix handling of multiple LDAP user bind patterns #8134
Merged
Conversation
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
hashhar
force-pushed
the
hashhar/multi-ldap-binds
branch
2 times, most recently
from
99c74b5
to
e0fd4d6
Compare
hashhar
force-pushed
the
hashhar/multi-ldap-binds
branch
4 times, most recently
from
d59d73f
to
34e87df
Compare
hashhar
commented
May 31, 2021
...ts-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite7NonGeneric.java
Outdated
Show resolved
Hide resolved
| @@ -1,7 +1,7 @@ | |||
| password-authenticator.name=ldap | |||
| ldap.url=ldaps://ldapserver:636 | |||
| ldap.ssl-trust-certificate=/etc/openldap/certs/openldap-certificate.pem | |||
| ldap.user-base-dn=ou=Asia,dc=presto,dc=testldap,dc=com | |||
| ldap.user-base-dn=dc=presto,dc=testldap,dc=com | |||
There was a problem hiding this comment.
I've added uid=EuropeUser,ou=Europe and uid=AmericanUser,ou=America who are a memberOf DefaultGroup so both of them should be able to run queries provided they can bind to LDAP.
I've changed the ldap.user-bind-pattern to include both ou=America and ou=Asia so that every user except EuropeUser can bind. And base-dn has been changed to remove ou=Asia because we want to search every ou.
Merged
|
@kokosing @lukasz-walkiewicz @dain PTAL at the changes. |
It's possible and expected for some authentication attempts to fail when testing multiple LDAP bind patterns. In such cases we should ignore all AccessDeniedExceptions except any that get thrown when testing the last pattern.
hashhar
force-pushed
the
hashhar/multi-ldap-binds
branch
from
34e87df
to
3222de6
Compare
hashhar
commented
Jun 22, 2021
| @@ -47,7 +47,7 @@ | |||
| testOnEnvironment(SinglenodeLdapAndFile.class).withGroups("ldap", "ldap_and_file", "ldap_cli", "ldap_and_file_cli").build(), | |||
| testOnEnvironment(SinglenodeLdapInsecure.class).withGroups("ldap").build(), | |||
| testOnEnvironment(SinglenodeLdapReferrals.class).withGroups("ldap").build(), | |||
| testOnEnvironment(SinglenodeLdapBindDn.class).withGroups("ldap").build(), | |||
| testOnEnvironment(SinglenodeLdapBindDn.class).withGroups("ldap").withExcludedGroups("ldap_multiple_binds").build(), | |||
There was a problem hiding this comment.
The BindDn env uses a fixed bind user which cannot be used together with bind patterns obviously. So an exclusion was needed.
kokosing
approved these changes
Jun 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Attempt to implement #8022 correctly.