diff --git a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java index 5b127ad265..e54e5db092 100644 --- a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java +++ b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java @@ -43,6 +43,7 @@ import java.io.IOException; */ public class HttpSessionContextIntegrationFilter2 extends HttpSessionContextIntegrationFilter { public HttpSessionContextIntegrationFilter2() throws ServletException { + setContext(NotSerilizableSecurityContext.class); } public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { diff --git a/core/src/main/java/hudson/security/InvalidatableUserDetails.java b/core/src/main/java/hudson/security/InvalidatableUserDetails.java index 5266e01ce1..dbf3e95e29 100644 --- a/core/src/main/java/hudson/security/InvalidatableUserDetails.java +++ b/core/src/main/java/hudson/security/InvalidatableUserDetails.java @@ -49,6 +49,9 @@ import javax.servlet.http.HttpSession; * See https://hudson.dev.java.net/issues/show_bug.cgi?id=1482 * * @author Kohsuke Kawaguchi + * @deprecated + * Starting 1.285, Hudson stops persisting {@link Authentication} altogether + * (see {@link NotSerilizableSecurityContext}), so there's no need to use this mechanism. */ public interface InvalidatableUserDetails extends UserDetails { boolean isInvalid(); diff --git a/core/src/main/java/hudson/security/NotSerilizableSecurityContext.java b/core/src/main/java/hudson/security/NotSerilizableSecurityContext.java new file mode 100644 index 0000000000..68a8488367 --- /dev/null +++ b/core/src/main/java/hudson/security/NotSerilizableSecurityContext.java @@ -0,0 +1,91 @@ +/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package hudson.security; + +import org.acegisecurity.context.SecurityContext; +import org.acegisecurity.context.SecurityContextImpl; +import org.acegisecurity.Authentication; +import org.acegisecurity.userdetails.UserDetails; + +import javax.servlet.http.HttpSession; + +/** + * The same as {@link SecurityContextImpl} but doesn't serialize {@link Authentication}. + * + *

+ * {@link Authentication} often contains {@link UserDetails} implemented by a plugin, + * but when it's persisted as a part of {@link HttpSession}, such instance will never + * de-serialize correctly because the container isn't aware of additional classloading + * in Hudson. + * + *

+ * Hudson doesn't work with a clustering anyway, and so it's better to just not persist + * Authentication at all. + * + * See http://www.nabble.com/ActiveDirectory-Plugin%3A-ClassNotFoundException-while-loading--persisted-sessions%3A-td22085140.html + * for the problem report. + * + * @author Kohsuke Kawaguchi + * @see HttpSessionContextIntegrationFilter2 + */ +public class NotSerilizableSecurityContext implements SecurityContext { + private transient Authentication authentication; + + public boolean equals(Object obj) { + if (obj instanceof SecurityContextImpl) { + SecurityContextImpl test = (SecurityContextImpl) obj; + + if ((this.getAuthentication() == null) && (test.getAuthentication() == null)) { + return true; + } + + if ((this.getAuthentication() != null) && (test.getAuthentication() != null) + && this.getAuthentication().equals(test.getAuthentication())) { + return true; + } + } + + return false; + } + + public Authentication getAuthentication() { + return authentication; + } + + public int hashCode() { + if (this.authentication == null) { + return -1; + } else { + return this.authentication.hashCode(); + } + } + + public void setAuthentication(Authentication authentication) { + this.authentication = authentication; + } + + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(super.toString()); + + if (this.authentication == null) { + sb.append(": Null authentication"); + } else { + sb.append(": Authentication: ").append(this.authentication); + } + + return sb.toString(); + } +}