From c67ac736df581bb0935abf13aee8dbcb6a72dbe2 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 10 Sep 2019 10:21:38 +1000 Subject: [PATCH] implement serializable for auth in cluster Signed-off-by: Lachlan Roberts --- .../eclipse/jetty/security/openid/OpenIdAuthenticator.java | 3 +-- .../eclipse/jetty/security/openid/OpenIdConfiguration.java | 6 ++++-- .../eclipse/jetty/security/openid/OpenIdCredentials.java | 4 +++- .../eclipse/jetty/security/openid/OpenIdUserPrincipal.java | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java index bc814984ed0..79725897567 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdAuthenticator.java @@ -319,8 +319,7 @@ public class OpenIdAuthenticator extends LoginAuthenticator if (authentication != null) { // Has authentication been revoked? - if (authentication instanceof Authentication.User && - _loginService != null && + if (authentication instanceof Authentication.User && _loginService != null && !_loginService.validate(((Authentication.User)authentication).getUserIdentity())) { LOG.debug("auth revoked {}", authentication); diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java index d68c862b731..c237676b04b 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java @@ -19,6 +19,7 @@ package org.eclipse.jetty.security.openid; import java.io.InputStream; +import java.io.Serializable; import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -35,10 +36,11 @@ import org.eclipse.jetty.util.log.Logger; * This uses the OpenID Provider URL with the path {@link #CONFIG_PATH} to discover * the required information about the OIDC service. */ -public class OpenIdConfiguration +public class OpenIdConfiguration implements Serializable { private static final Logger LOG = Log.getLogger(OpenIdConfiguration.class); - private static String CONFIG_PATH = "/.well-known/openid-configuration"; + private static final long serialVersionUID = 2227941990601349102L; + private static final String CONFIG_PATH = "/.well-known/openid-configuration"; private final String openIdProvider; private final String issuer; diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java index f8eba14de3a..20917f2bec7 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdCredentials.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.security.openid; import java.io.DataOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -43,9 +44,10 @@ import org.eclipse.jetty.util.log.Logger; * The response is then validated against the {@link OpenIdConfiguration}. *

*/ -public class OpenIdCredentials +public class OpenIdCredentials implements Serializable { private static final Logger LOG = Log.getLogger(OpenIdCredentials.class); + private static final long serialVersionUID = 4766053233370044796L; private final String redirectUri; private final OpenIdConfiguration configuration; diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdUserPrincipal.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdUserPrincipal.java index 7034e4efd94..6ebb46df2a2 100644 --- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdUserPrincipal.java +++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdUserPrincipal.java @@ -18,10 +18,12 @@ package org.eclipse.jetty.security.openid; +import java.io.Serializable; import java.security.Principal; -public class OpenIdUserPrincipal implements Principal +public class OpenIdUserPrincipal implements Principal, Serializable { + private static final long serialVersionUID = 1521094652756670469L; private final OpenIdCredentials _credentials; public OpenIdUserPrincipal(OpenIdCredentials credentials)