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

GUAC-434: Allow SimpleUserContext/SimpleAuthenticationProvider to provide actual usernames.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-27 15:39:41 -07:00
parent c20adb46a9
commit 612a8b4b97
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleAuthenticationProvider.java
View File

@@ -73,7 +73,7 @@ public abstract class SimpleAuthenticationProvider
return null; return null;
// Return user context restricted to authorized configs // Return user context restricted to authorized configs
return new SimpleUserContext(configs); return new SimpleUserContext(credentials.getUsername(), configs);
} }

19
guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleUserContext.java
View File

@@ -24,6 +24,7 @@ package org.glyptodon.guacamole.net.auth.simple;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.auth.ConnectionGroup; import org.glyptodon.guacamole.net.auth.ConnectionGroup;
import org.glyptodon.guacamole.net.auth.Directory; import org.glyptodon.guacamole.net.auth.Directory;
@@ -60,12 +61,26 @@ public class SimpleUserContext implements UserContext {
/** /**
* Creates a new SimpleUserContext which provides access to only those * Creates a new SimpleUserContext which provides access to only those
* configurations within the given Map. * configurations within the given Map. The username is assigned
* arbitrarily.
* *
* @param configs A Map of all configurations for which the user associated * @param configs A Map of all configurations for which the user associated
* with this UserContext has read access. * with this UserContext has read access.
*/ */
public SimpleUserContext(Map<String, GuacamoleConfiguration> configs) { public SimpleUserContext(Map<String, GuacamoleConfiguration> configs) {
this(UUID.randomUUID().toString(), configs);
}
/**
* Creates a new SimpleUserContext for the user with the given username
* which provides access to only those configurations within the given Map.
*
* @param username The username of the user associated with this
* UserContext.
* @param configs A Map of all configurations for which the user associated
* with this UserContext has read access.
*/
public SimpleUserContext(String username, Map<String, GuacamoleConfiguration> configs) {
// Add root group that contains only configurations // Add root group that contains only configurations
this.connectionGroup = new SimpleConnectionGroup("ROOT", "ROOT", this.connectionGroup = new SimpleConnectionGroup("ROOT", "ROOT",
@@ -73,7 +88,7 @@ public class SimpleUserContext implements UserContext {
new SimpleConnectionGroupDirectory(Collections.EMPTY_LIST)); new SimpleConnectionGroupDirectory(Collections.EMPTY_LIST));
// Build new user from credentials, giving the user an arbitrary name // Build new user from credentials, giving the user an arbitrary name
this.self = new SimpleUser("user", this.self = new SimpleUser(username,
configs, Collections.singleton(connectionGroup)); configs, Collections.singleton(connectionGroup));
// Create user directory for new user // Create user directory for new user