safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-593: Allow group membership attribute to be configured.

Browse Source
This commit is contained in:
Nick Couchman
2018-07-30 16:45:51 -04:00
parent 5ce0c0f035
commit 343b21aba5
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConfigurationService.java
View File

@@ -358,5 +358,12 @@ public class ConfigurationService {
LDAPGuacamoleProperties.LDAP_USER_ATTRIBUTES
);
}
public String getMemberAttribute() throws GuacamoleException {
return environment.getProperty(
LDAPGuacamoleProperties.LDAP_MEMBER_ATTRIBUTE,
"member"
);
}
}

7
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPGuacamoleProperties.java
View File

@@ -215,4 +215,11 @@ public class LDAPGuacamoleProperties {
public String getName() { return "ldap-user-attributes"; }
};
public static final StringGuacamoleProperty LDAP_MEMBER_ATTRIBUTE = new StringGuacamoleProperty() {
@Override
public String getName() { return "ldap-member-attribute"; }
};
}

10
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
View File

@@ -245,7 +245,10 @@ public class ConnectionService {
StringBuilder connectionSearchFilter = new StringBuilder();
// Add the prefix to the search filter, prefix filter searches for guacConfigGroups with the userDN as the member attribute value
connectionSearchFilter.append("(&(objectClass=guacConfigGroup)(|(member=");
connectionSearchFilter.append("(&(objectClass=guacConfigGroup)");
connectionSearchFilter.append("(|(");
connectionSearchFilter.append(confService.getMemberAttribute());
connectionSearchFilter.append("=");
connectionSearchFilter.append(escapingService.escapeLDAPSearchFilter(userDN));
connectionSearchFilter.append(")");
@@ -257,7 +260,10 @@ public class ConnectionService {
LDAPSearchResults userRoleGroupResults = ldapConnection.search(
groupBaseDN,
LDAPConnection.SCOPE_SUB,
"(&(!(objectClass=guacConfigGroup))(member=" + escapingService.escapeLDAPSearchFilter(userDN) + "))",
"(&(!(objectClass=guacConfigGroup))("
+ confService.getMemberAttribute()
+ "=" + escapingService.escapeLDAPSearchFilter(userDN)
+ "))",
null,
false,
confService.getLDAPSearchConstraints()