Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Codestyle

This commit is contained in:
Rob Winch 2016-04-01 09:52:15 -05:00
parent d900c78f11
commit f49cd5faba
2 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java
View File

@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.AuthenticationTrustResolver; import org.springframework.security.authentication.AuthenticationTrustResolver;
@ -158,23 +159,25 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory {
this.trustResolver = trustResolver; this.trustResolver = trustResolver;
} }
@Override
public HttpServletRequest create(HttpServletRequest request, public HttpServletRequest create(HttpServletRequest request,
HttpServletResponse response) { HttpServletResponse response) {
return new Servlet3SecurityContextHolderAwareRequestWrapper(request, rolePrefix, return new Servlet3SecurityContextHolderAwareRequestWrapper(request,
response); this.rolePrefix, response);
} }
private class Servlet3SecurityContextHolderAwareRequestWrapper extends private class Servlet3SecurityContextHolderAwareRequestWrapper
SecurityContextHolderAwareRequestWrapper { extends SecurityContextHolderAwareRequestWrapper {
private final HttpServletResponse response; private final HttpServletResponse response;
public Servlet3SecurityContextHolderAwareRequestWrapper( public Servlet3SecurityContextHolderAwareRequestWrapper(
HttpServletRequest request, String rolePrefix, HttpServletRequest request, String rolePrefix,
HttpServletResponse response) { HttpServletResponse response) {
super(request, trustResolver, rolePrefix); super(request, HttpServlet3RequestFactory.this.trustResolver, rolePrefix);
this.response = response; this.response = response;
} }
@Override
public AsyncContext getAsyncContext() { public AsyncContext getAsyncContext() {
AsyncContext asyncContext = super.getAsyncContext(); AsyncContext asyncContext = super.getAsyncContext();
if (asyncContext == null) { if (asyncContext == null) {
@ -183,22 +186,26 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory {
return new SecurityContextAsyncContext(asyncContext); return new SecurityContextAsyncContext(asyncContext);
} }
@Override
public AsyncContext startAsync() { public AsyncContext startAsync() {
AsyncContext startAsync = super.startAsync(); AsyncContext startAsync = super.startAsync();
return new SecurityContextAsyncContext(startAsync); return new SecurityContextAsyncContext(startAsync);
} }
@Override
public AsyncContext startAsync(ServletRequest servletRequest, public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse) throws IllegalStateException { ServletResponse servletResponse) throws IllegalStateException {
AsyncContext startAsync = super.startAsync(servletRequest, servletResponse); AsyncContext startAsync = super.startAsync(servletRequest, servletResponse);
return new SecurityContextAsyncContext(startAsync); return new SecurityContextAsyncContext(startAsync);
} }
public boolean authenticate(HttpServletResponse response) throws IOException, @Override
ServletException { public boolean authenticate(HttpServletResponse response)
AuthenticationEntryPoint entryPoint = authenticationEntryPoint; throws IOException, ServletException {
AuthenticationEntryPoint entryPoint = HttpServlet3RequestFactory.this.authenticationEntryPoint;
if (entryPoint == null) { if (entryPoint == null) {
logger.debug("authenticationEntryPoint is null, so allowing original HttpServletRequest to handle authenticate"); HttpServlet3RequestFactory.this.logger.debug(
"authenticationEntryPoint is null, so allowing original HttpServletRequest to handle authenticate");
return super.authenticate(response); return super.authenticate(response);
} }
if (isAuthenticated()) { if (isAuthenticated()) {
@ -210,22 +217,23 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory {
return false; return false;
} }
@Override
public void login(String username, String password) throws ServletException { public void login(String username, String password) throws ServletException {
if (isAuthenticated()) { if (isAuthenticated()) {
throw new ServletException("Cannot perform login for '" + username throw new ServletException("Cannot perform login for '" + username
+ "' already authenticated as '" + getRemoteUser() + "'"); + "' already authenticated as '" + getRemoteUser() + "'");
} }
AuthenticationManager authManager = authenticationManager; AuthenticationManager authManager = HttpServlet3RequestFactory.this.authenticationManager;
if (authManager == null) { if (authManager == null) {
logger.debug("authenticationManager is null, so allowing original HttpServletRequest to handle login"); HttpServlet3RequestFactory.this.logger.debug(
"authenticationManager is null, so allowing original HttpServletRequest to handle login");
super.login(username, password); super.login(username, password);
return; return;
} }
Authentication authentication; Authentication authentication;
try { try {
authentication = authManager authentication = authManager.authenticate(
.authenticate(new UsernamePasswordAuthenticationToken(username, new UsernamePasswordAuthenticationToken(username, password));
password));
} }
catch (AuthenticationException loginFailed) { catch (AuthenticationException loginFailed) {
SecurityContextHolder.clearContext(); SecurityContextHolder.clearContext();
@ -234,17 +242,19 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory {
SecurityContextHolder.getContext().setAuthentication(authentication); SecurityContextHolder.getContext().setAuthentication(authentication);
} }
@Override
public void logout() throws ServletException { public void logout() throws ServletException {
List<LogoutHandler> handlers = logoutHandlers; List<LogoutHandler> handlers = HttpServlet3RequestFactory.this.logoutHandlers;
if (handlers == null) { if (handlers == null) {
logger.debug("logoutHandlers is null, so allowing original HttpServletRequest to handle logout"); HttpServlet3RequestFactory.this.logger.debug(
"logoutHandlers is null, so allowing original HttpServletRequest to handle logout");
super.logout(); super.logout();
return; return;
} }
Authentication authentication = SecurityContextHolder.getContext() Authentication authentication = SecurityContextHolder.getContext()
.getAuthentication(); .getAuthentication();
for (LogoutHandler logoutHandler : handlers) { for (LogoutHandler logoutHandler : handlers) {
logoutHandler.logout(this, response, authentication); logoutHandler.logout(this, this.response, authentication);
} }
} }
@ -261,58 +271,71 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory {
this.asyncContext = asyncContext; this.asyncContext = asyncContext;
} }
@Override
public ServletRequest getRequest() { public ServletRequest getRequest() {
return asyncContext.getRequest(); return this.asyncContext.getRequest();
} }
@Override
public ServletResponse getResponse() { public ServletResponse getResponse() {
return asyncContext.getResponse(); return this.asyncContext.getResponse();
} }
@Override
public boolean hasOriginalRequestAndResponse() { public boolean hasOriginalRequestAndResponse() {
return asyncContext.hasOriginalRequestAndResponse(); return this.asyncContext.hasOriginalRequestAndResponse();
} }
@Override
public void dispatch() { public void dispatch() {
asyncContext.dispatch(); this.asyncContext.dispatch();
} }
@Override
public void dispatch(String path) { public void dispatch(String path) {
asyncContext.dispatch(path); this.asyncContext.dispatch(path);
} }
@Override
public void dispatch(ServletContext context, String path) { public void dispatch(ServletContext context, String path) {
asyncContext.dispatch(context, path); this.asyncContext.dispatch(context, path);
} }
@Override
public void complete() { public void complete() {
asyncContext.complete(); this.asyncContext.complete();
} }
@Override
public void start(Runnable run) { public void start(Runnable run) {
asyncContext.start(new DelegatingSecurityContextRunnable(run)); this.asyncContext.start(new DelegatingSecurityContextRunnable(run));
} }
@Override
public void addListener(AsyncListener listener) { public void addListener(AsyncListener listener) {
asyncContext.addListener(listener); this.asyncContext.addListener(listener);
} }
@Override
public void addListener(AsyncListener listener, ServletRequest request, public void addListener(AsyncListener listener, ServletRequest request,
ServletResponse response) { ServletResponse response) {
asyncContext.addListener(listener, request, response); this.asyncContext.addListener(listener, request, response);
} }
@Override
public <T extends AsyncListener> T createListener(Class<T> clazz) public <T extends AsyncListener> T createListener(Class<T> clazz)
throws ServletException { throws ServletException {
return asyncContext.createListener(clazz); return this.asyncContext.createListener(clazz);
} }
@Override
public long getTimeout() { public long getTimeout() {
return asyncContext.getTimeout(); return this.asyncContext.getTimeout();
} }
@Override
public void setTimeout(long timeout) { public void setTimeout(long timeout) {
asyncContext.setTimeout(timeout); this.asyncContext.setTimeout(timeout);
} }
} }
} }

3
web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java
View File

@ -318,6 +318,7 @@ public class SecurityContextHolderAwareRequestFilterTests {
when(this.request.getAsyncContext()).thenReturn(asyncContext); when(this.request.getAsyncContext()).thenReturn(asyncContext);
Runnable runnable = new Runnable() { Runnable runnable = new Runnable() {
@Override
public void run() { public void run() {
} }
}; };
@ -347,6 +348,7 @@ public class SecurityContextHolderAwareRequestFilterTests {
when(this.request.startAsync()).thenReturn(asyncContext); when(this.request.startAsync()).thenReturn(asyncContext);
Runnable runnable = new Runnable() { Runnable runnable = new Runnable() {
@Override
public void run() { public void run() {
} }
}; };
@ -377,6 +379,7 @@ public class SecurityContextHolderAwareRequestFilterTests {
.thenReturn(asyncContext); .thenReturn(asyncContext);
Runnable runnable = new Runnable() { Runnable runnable = new Runnable() {
@Override
public void run() { public void run() {
} }
}; };