GUACAMOLE-593: Allow group membership attribute to be configured.#308
Merged
asfgit merged 2 commits intoapache:masterfrom Jul 31, 2018
Merged
GUACAMOLE-593: Allow group membership attribute to be configured.#308asfgit merged 2 commits intoapache:masterfrom
asfgit merged 2 commits intoapache:masterfrom
Conversation
mike-jumper
requested changes
Jul 31, 2018
| connectionSearchFilter.append("(&(objectClass=guacConfigGroup)(|(member="); | ||
| connectionSearchFilter.append("(&(objectClass=guacConfigGroup)"); | ||
| connectionSearchFilter.append("(|("); | ||
| connectionSearchFilter.append(confService.getMemberAttribute()); |
Contributor
There was a problem hiding this comment.
This will need to be escaped with escapingService.escapeLDAPSearchFilter().
| LDAPConnection.SCOPE_SUB, | ||
| "(&(!(objectClass=guacConfigGroup))(member=" + escapingService.escapeLDAPSearchFilter(userDN) + "))", | ||
| "(&(!(objectClass=guacConfigGroup))(" | ||
| + confService.getMemberAttribute() |
Contributor
There was a problem hiding this comment.
This will need to be escaped with escapingService.escapeLDAPSearchFilter(), as well.
|
|
||
| }; | ||
|
|
||
| public static final StringGuacamoleProperty LDAP_MEMBER_ATTRIBUTE = new StringGuacamoleProperty() { |
Contributor
Author
There was a problem hiding this comment.
Wow, not sure why I forgot that. Documented.
| ); | ||
| } | ||
|
|
||
| public String getMemberAttribute() throws GuacamoleException { |
Contributor
There was a problem hiding this comment.
Please document this function.
mike-jumper
approved these changes
Jul 31, 2018
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This allows the group membership attribute to be modified for the LDAP authentication module for directories that use a different one than the default of "member".