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-524: Merge correct AuthenticatedUser implementations of Attributes interface.

Browse Source
This commit is contained in:
Nick Couchman
2018-10-03 09:44:52 -04:00
parent 220d9b2994 aae17f3a9f
commit 863670a580
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@
package org.apache.guacamole.auth.jdbc.user;
import java.util.HashMap;
import java.util.Map;
import java.util.Collections;
import java.util.Set;
@@ -47,11 +46,6 @@ public abstract class RemoteAuthenticatedUser implements AuthenticatedUser {
*/
private final String remoteHost;
/**
* Arbitrary attributes associated with this RemoteAuthenticatedUser object.
*/
private Map<String, String> attributes = new HashMap<String, String>();
/**
* The identifiers of any groups of which this user is a member, including
* groups inherited through membership in other groups.
@@ -60,12 +54,12 @@ public abstract class RemoteAuthenticatedUser implements AuthenticatedUser {
@Override
public Map<String, String> getAttributes() {
return attributes;
return Collections.<String, String>emptyMap();
}
@Override
public void setAttributes(Map<String, String> attributes) {
this.attributes = attributes;
// No attributes supported
}
/**

5
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
View File

@@ -232,10 +232,7 @@ public class AuthenticationProviderService {
try {
// Return AuthenticatedUser if bind succeeds
AuthenticatedUser authenticatedUser = authenticatedUserProvider.get();
authenticatedUser.init(credentials);
// Set attributes
authenticatedUser.setAttributes(getLDAPAttributes(ldapConnection, credentials.getUsername()));
authenticatedUser.init(credentials, getLDAPAttributes(ldapConnection, credentials.getUsername()));
return authenticatedUser;

15
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/AuthenticatedUser.java
View File

@@ -20,7 +20,6 @@
package org.apache.guacamole.auth.ldap.user;
import com.google.inject.Inject;
import java.util.HashMap;
import java.util.Map;
import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
import org.apache.guacamole.net.auth.AuthenticationProvider;
@@ -47,16 +46,22 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
/**
* Arbitrary attributes associated with this AuthenticatedUser object.
*/
private Map<String, String> attributes = new HashMap<String, String>();
private Map<String, String> attributes;
/**
* Initializes this AuthenticatedUser using the given credentials.
* Initializes this AuthenticatedUser using the given credentials and
* arbitrary attributes.
*
* @param credentials
* The credentials provided when this user was authenticated.
*
* @param attributes
* The map of arbitrary attribute name/value pairs to associate with
* this AuthenticatedUser.
*/
public void init(Credentials credentials) {
public void init(Credentials credentials, Map<String, String> attributes) {
this.credentials = credentials;
this.attributes = attributes;
setIdentifier(credentials.getUsername());
}
@@ -67,7 +72,7 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
@Override
public void setAttributes(Map<String, String> attributes) {
this.attributes = attributes;
// All attributes are read-only
}
@Override