mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
NotSerilizableSecurityContext -> NonSerializableSecurityContext
This commit is contained in:
1 parent
c609a1fbdc
commit
981202e802
5 files changed
+133
-88
No files matched your search
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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}.
|
||||
*
|
||||
* <p>
|
||||
* {@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.
|
||||
*
|
||||
* <p>
|
||||
* 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();
|
||||
}
|
||||
}
|
||||
@@ -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}.
|
||||
*
|
||||
* <p>
|
||||
* {@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.
|
||||
*
|
||||
* <p>
|
||||
* Jenkins doesn't work with a clustering anyway, and so it's better to just not persist
|
||||
* Authentication at all.
|
||||
*
|
||||
* See <a href="http://jenkins.361315.n4.nabble.com/ActiveDirectory-Plugin-ClassNotFoundException-while-loading-persisted-sessions-tp376451.html">the problem report</a>.
|
||||
*
|
||||
* @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();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user