Repository: incubator-guacamole-client Updated Branches: refs/heads/master 7325b7e9c -> 139cca986
GUACAMOLE-5: Do not bind/inject AuthenticationProvider. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/cadaefa5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/cadaefa5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/cadaefa5 Branch: refs/heads/master Commit: cadaefa5f6ddf45b8eb1f09dc42fd8603725113a Parents: 7325b7e Author: Michael Jumper <[email protected]> Authored: Tue Jul 26 21:21:17 2016 -0700 Committer: Michael Jumper <[email protected]> Committed: Tue Jul 26 21:28:31 2016 -0700 ---------------------------------------------------------------------- .../auth/jdbc/JDBCAuthenticationProviderModule.java | 16 +--------------- .../jdbc/sharing/SharedConnectionUserContext.java | 4 +++- .../guacamole/auth/jdbc/user/UserContext.java | 8 +------- .../auth/mysql/MySQLAuthenticationProvider.java | 2 +- .../PostgreSQLAuthenticationProvider.java | 3 +-- 5 files changed, 7 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/cadaefa5/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java index 708ec3e..f2ef805 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java @@ -74,7 +74,6 @@ import org.apache.guacamole.auth.jdbc.sharingprofile.SharingProfileMapper; import org.apache.guacamole.auth.jdbc.sharingprofile.SharingProfileParameterMapper; import org.apache.guacamole.auth.jdbc.sharingprofile.SharingProfileService; import org.apache.guacamole.auth.jdbc.tunnel.RestrictedGuacamoleTunnelService; -import org.apache.guacamole.net.auth.AuthenticationProvider; import org.mybatis.guice.MyBatisModule; import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider; @@ -94,26 +93,14 @@ public class JDBCAuthenticationProviderModule extends MyBatisModule { private final JDBCEnvironment environment; /** - * The AuthenticationProvider which is using this module to configure - * injection. - */ - private final AuthenticationProvider authProvider; - - /** * Creates a new JDBC authentication provider module that configures the * various injected base classes using the given environment, and provides * connections using the given socket service. * - * @param authProvider - * The AuthenticationProvider which is using this module to configure - * injection. - * * @param environment * The environment to use to configure injected classes. */ - public JDBCAuthenticationProviderModule(AuthenticationProvider authProvider, - JDBCEnvironment environment) { - this.authProvider = authProvider; + public JDBCAuthenticationProviderModule(JDBCEnvironment environment) { this.environment = environment; } @@ -143,7 +130,6 @@ public class JDBCAuthenticationProviderModule extends MyBatisModule { // Bind core implementations of guacamole-ext classes bind(ActiveConnectionDirectory.class); bind(ActiveConnectionPermissionSet.class); - bind(AuthenticationProvider.class).toInstance(authProvider); bind(JDBCEnvironment.class).toInstance(environment); bind(ConnectionDirectory.class); bind(ConnectionGroupDirectory.class); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/cadaefa5/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionUserContext.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionUserContext.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionUserContext.java index 37b344a..67d70c6 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionUserContext.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/SharedConnectionUserContext.java @@ -61,7 +61,6 @@ public class SharedConnectionUserContext implements UserContext { /** * The AuthenticationProvider that created this SharedConnectionUserContext. */ - @Inject private AuthenticationProvider authProvider; /** @@ -118,6 +117,9 @@ public class SharedConnectionUserContext implements UserContext { Collection<String> connectionIdentifiers = Collections.singletonList(connection.getIdentifier()); + // Associate the originating authentication provider + this.authProvider = user.getAuthenticationProvider(); + // The connection directory should contain only the shared connection this.connectionDirectory = new SimpleConnectionDirectory( Collections.<Connection>singletonList(connection)); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/cadaefa5/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java index 5ddea97..a3c646f 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/UserContext.java @@ -54,12 +54,6 @@ public class UserContext extends RestrictedObject implements org.apache.guacamole.net.auth.UserContext { /** - * The AuthenticationProvider that created this UserContext. - */ - @Inject - private AuthenticationProvider authProvider; - - /** * User directory restricted by the permissions of the user associated * with this context. */ @@ -127,7 +121,7 @@ public class UserContext extends RestrictedObject @Override public AuthenticationProvider getAuthenticationProvider() { - return authProvider; + return getCurrentUser().getAuthenticationProvider(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/cadaefa5/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java index 5cf740c..8db48b7 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProvider.java @@ -65,7 +65,7 @@ public class MySQLAuthenticationProvider implements AuthenticationProvider { new MySQLAuthenticationProviderModule(environment), // Configure JDBC authentication core - new JDBCAuthenticationProviderModule(this, environment) + new JDBCAuthenticationProviderModule(environment) ); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/cadaefa5/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java index b289e9d..cd37d05 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProvider.java @@ -26,7 +26,6 @@ import org.apache.guacamole.net.auth.AuthenticationProvider; import org.apache.guacamole.net.auth.Credentials; import org.apache.guacamole.net.auth.UserContext; import org.apache.guacamole.auth.jdbc.JDBCAuthenticationProviderModule; -import org.apache.guacamole.auth.jdbc.JDBCEnvironment; import org.apache.guacamole.auth.jdbc.user.AuthenticationProviderService; import org.apache.guacamole.net.auth.AuthenticatedUser; import org.slf4j.Logger; @@ -73,7 +72,7 @@ public class PostgreSQLAuthenticationProvider implements AuthenticationProvider new PostgreSQLAuthenticationProviderModule(environment), // Configure JDBC authentication core - new JDBCAuthenticationProviderModule(this, environment) + new JDBCAuthenticationProviderModule(environment) );
