Repository: incubator-guacamole-client Updated Branches: refs/heads/master 93e42f829 -> b64247dfb
GUACAMOLE-393: Add session invalidation hooks to AuthenticatedUser. 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/c20457f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/c20457f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/c20457f8 Branch: refs/heads/master Commit: c20457f89b6d0658bbb684264e06d71fb608817f Parents: b90a989 Author: Michael Jumper <[email protected]> Authored: Mon May 29 19:03:42 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Mon Sep 25 11:47:25 2017 -0700 ---------------------------------------------------------------------- .../guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java | 5 +++++ .../apache/guacamole/net/auth/AbstractAuthenticatedUser.java | 5 +++++ .../java/org/apache/guacamole/net/auth/AuthenticatedUser.java | 7 +++++++ .../src/main/java/org/apache/guacamole/GuacamoleSession.java | 3 +++ 4 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/c20457f8/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java index a3848f4..24118af 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java @@ -136,4 +136,9 @@ public abstract class RemoteAuthenticatedUser implements AuthenticatedUser { return authenticationProvider; } + @Override + public void invalidate() { + // Nothing to invalidate + } + } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/c20457f8/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java index 730eec0..08b9b4e 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java @@ -29,4 +29,9 @@ public abstract class AbstractAuthenticatedUser extends AbstractIdentifiable // Prior functionality now resides within AbstractIdentifiable + @Override + public void invalidate() { + // Nothing to invalidate + } + } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/c20457f8/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java index 7f363f2..f6ceb3a 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java @@ -49,4 +49,11 @@ public interface AuthenticatedUser extends Identifiable { */ Credentials getCredentials(); + /** + * Invalidates this authenticated user and their associated token such that + * they are no longer logged in. This function will be automatically + * invoked when the user logs out, or when their session expires. + */ + void invalidate(); + } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/c20457f8/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java ---------------------------------------------------------------------- diff --git a/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java b/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java index de81453..17168af 100644 --- a/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java +++ b/guacamole/src/main/java/org/apache/guacamole/GuacamoleSession.java @@ -252,6 +252,9 @@ public class GuacamoleSession { } } + // Invalidate the authenticated user object + authenticatedUser.invalidate(); + } }
