mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 21:27:40 +00:00
GUACAMOLE-696: Merge changes taking database groups into account with respect to database objects when user is otherwise external to the database.
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
|
||||
package org.apache.guacamole.auth.jdbc.user;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
import java.util.Collections;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
@@ -168,5 +169,11 @@ public class ModeledAuthenticatedUser extends RemoteAuthenticatedUser {
|
||||
public void setIdentifier(String identifier) {
|
||||
user.setIdentifier(identifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getEffectiveUserGroups() {
|
||||
return Sets.union(user.getEffectiveUserGroups(),
|
||||
super.getEffectiveUserGroups());
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user