From 981202e802f2fc76ecfeed28bf096b2aeef772a4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 8 Feb 2013 13:15:25 -0500 Subject: [PATCH] NotSerilizableSecurityContext -> NonSerializableSecurityContext --- core/src/main/java/hudson/security/ACL.java | 3 +- .../HttpSessionContextIntegrationFilter2.java | 3 +- .../security/InvalidatableUserDetails.java | 3 +- .../NotSerilizableSecurityContext.java | 111 ++++-------------- .../NonSerializableSecurityContext.java | 101 ++++++++++++++++ 5 files changed, 133 insertions(+), 88 deletions(-) create mode 100644 core/src/main/java/jenkins/security/NonSerializableSecurityContext.java diff --git a/core/src/main/java/hudson/security/ACL.java b/core/src/main/java/hudson/security/ACL.java index 804baffb14..c34ec3e992 100644 --- a/core/src/main/java/hudson/security/ACL.java +++ b/core/src/main/java/hudson/security/ACL.java @@ -23,6 +23,7 @@ */ package hudson.security; +import jenkins.security.NonSerializableSecurityContext; import jenkins.model.Jenkins; import org.acegisecurity.AccessDeniedException; import org.acegisecurity.Authentication; @@ -125,7 +126,7 @@ public abstract class ACL { */ public static SecurityContext impersonate(Authentication auth) { SecurityContext old = SecurityContextHolder.getContext(); - SecurityContextHolder.setContext(new NotSerilizableSecurityContext(auth)); + SecurityContextHolder.setContext(new NonSerializableSecurityContext(auth)); return old; } } diff --git a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java index e54e5db092..e197c872bf 100644 --- a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java +++ b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java @@ -23,6 +23,7 @@ */ package hudson.security; +import jenkins.security.NonSerializableSecurityContext; import org.acegisecurity.context.HttpSessionContextIntegrationFilter; import org.acegisecurity.context.SecurityContext; import org.acegisecurity.Authentication; @@ -43,7 +44,7 @@ import java.io.IOException; */ public class HttpSessionContextIntegrationFilter2 extends HttpSessionContextIntegrationFilter { public HttpSessionContextIntegrationFilter2() throws ServletException { - setContext(NotSerilizableSecurityContext.class); + setContext(NonSerializableSecurityContext.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 b765fff5fc..8c3e2551d4 100644 --- a/core/src/main/java/hudson/security/InvalidatableUserDetails.java +++ b/core/src/main/java/hudson/security/InvalidatableUserDetails.java @@ -28,6 +28,7 @@ import org.acegisecurity.context.SecurityContext; import org.acegisecurity.userdetails.UserDetails; import javax.servlet.http.HttpSession; +import jenkins.security.NonSerializableSecurityContext; /** * {@link UserDetails} that can mark {@link Authentication} invalid. @@ -51,7 +52,7 @@ import javax.servlet.http.HttpSession; * @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. + * (see {@link NonSerializableSecurityContext}), 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 index 0638f59008..c816747ef6 100644 --- a/core/src/main/java/hudson/security/NotSerilizableSecurityContext.java +++ b/core/src/main/java/hudson/security/NotSerilizableSecurityContext.java @@ -1,101 +1,42 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited +/* + * The MIT License * - * 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 + * Copyright 2013 Jesse Glick. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * 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. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. */ + package hudson.security; -import org.acegisecurity.context.SecurityContext; -import org.acegisecurity.context.SecurityContextImpl; +import jenkins.security.NonSerializableSecurityContext; 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. - * - *

- * Jenkins 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 + * @deprecated use {@link NonSerializableSecurityContext} instead */ -public class NotSerilizableSecurityContext implements SecurityContext { - private transient Authentication authentication; +@Deprecated +public class NotSerilizableSecurityContext extends NonSerializableSecurityContext { - public NotSerilizableSecurityContext() { - } + public NotSerilizableSecurityContext() {} public NotSerilizableSecurityContext(Authentication authentication) { - this.authentication = authentication; + super(authentication); } - @Override - public boolean equals(Object obj) { - if (obj instanceof SecurityContext) { - SecurityContext test = (SecurityContext) 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; - } - - @Override - public int hashCode() { - if (this.authentication == null) { - return -1; - } else { - return this.authentication.hashCode(); - } - } - - public void setAuthentication(Authentication authentication) { - this.authentication = authentication; - } - - @Override - 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(); - } } diff --git a/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java b/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java new file mode 100644 index 0000000000..9ebf321cf0 --- /dev/null +++ b/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java @@ -0,0 +1,101 @@ +/* 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 jenkins.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. + * + *

+ * Jenkins doesn't work with a clustering anyway, and so it's better to just not persist + * Authentication at all. + * + * See the problem report. + * + * @author Kohsuke Kawaguchi + * @see HttpSessionContextIntegrationFilter2 + * @since 1.502 + */ +public class NonSerializableSecurityContext implements SecurityContext { + private transient Authentication authentication; + + public NonSerializableSecurityContext() { + } + + public NonSerializableSecurityContext(Authentication authentication) { + this.authentication = authentication; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof SecurityContext) { + SecurityContext test = (SecurityContext) 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; + } + + @Override + public int hashCode() { + if (this.authentication == null) { + return -1; + } else { + return this.authentication.hashCode(); + } + } + + public void setAuthentication(Authentication authentication) { + this.authentication = authentication; + } + + @Override + 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(); + } +}