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

GUACAMOLE-696: In JDBC module, merge effective groups.

Browse Source
This commit is contained in:
Virtually Nick
2019-02-21 16:19:42 -05:00
parent 215b643600
commit e1fea889ca
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java
View File

@@ -20,6 +20,7 @@
package org.apache.guacamole.auth.jdbc.user; package org.apache.guacamole.auth.jdbc.user;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.apache.guacamole.net.auth.AuthenticatedUser; import org.apache.guacamole.net.auth.AuthenticatedUser;
@@ -168,5 +169,12 @@ public class ModeledAuthenticatedUser extends RemoteAuthenticatedUser {
public void setIdentifier(String identifier) { public void setIdentifier(String identifier) {
user.setIdentifier(identifier); user.setIdentifier(identifier);
} }
@Override
public Set<String> getEffectiveUserGroups() {
Set<String> allGroups = new HashSet<>(user.getEffectiveUserGroups());
allGroups.addAll(super.getEffectiveUserGroups());
return Collections.unmodifiableSet(allGroups);
}
} }