Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2012-01-10 00:08:59 -0500
committerJan Bartel2012-01-10 00:08:59 -0500
commit1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a (patch)
treeb3d5e8c42d12751b6372d31ad5c18416c8551b48 /jetty-security/src
parent6e3c8094f197bea369fc07d92e7be4ddd80cd326 (diff)
parent083c793b1c7f251fc67d464e9a2449530782e9d9 (diff)
downloadorg.eclipse.jetty.project-1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a.tar.gz
org.eclipse.jetty.project-1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a.tar.xz
org.eclipse.jetty.project-1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a.zip
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java6
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java4
2 files changed, 6 insertions, 4 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
index 5878381ec2..6a4b837783 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
@@ -318,11 +318,13 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
if (!_loginServiceShared && _loginService instanceof LifeCycle)
((LifeCycle)_loginService).start();
+ System.err.println("authenticator="+_authenticator+" authenticatorFactory="+_authenticatorFactory+" identityService="+_identityService);
if (_authenticator==null && _authenticatorFactory!=null && _identityService!=null)
{
_authenticator=_authenticatorFactory.getAuthenticator(getServer(),ContextHandler.getCurrentContext(),this, _identityService, _loginService);
if (_authenticator!=null)
_authMethod=_authenticator.getAuthMethod();
+ System.err.println("Called auth factory, authenticator="+_authenticator);
}
if (_authenticator==null)
@@ -477,7 +479,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
deferred.setIdentityService(_identityService);
deferred.setLoginService(_loginService);
baseRequest.setAuthentication(authentication);
-
+System.err.println("uri="+baseRequest.getUri()+" Auth is deferred");
try
{
handler.handle(pathInContext, baseRequest, request, response);
@@ -487,7 +489,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
previousIdentity = deferred.getPreviousAssociation();
deferred.setIdentityService(null);
}
-
+ System.err.println("Securityhandler calling secureResponse, for Authentication.User");
Authentication auth=baseRequest.getAuthentication();
if (auth instanceof Authentication.User)
{
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
index 2ec515ca6a..bab7e9b0ba 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
@@ -169,7 +169,7 @@ public class DeferredAuthentication implements Authentication.Deferred
* @param response
* @return true if this response is from a deferred call to {@link #authenticate(ServletRequest)}
*/
- public boolean isDeferred(HttpServletResponse response)
+ public static boolean isDeferred(HttpServletResponse response)
{
return response==__deferredResponse;
}
@@ -177,7 +177,7 @@ public class DeferredAuthentication implements Authentication.Deferred
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */
- static HttpServletResponse __deferredResponse = new HttpServletResponse()
+ final static HttpServletResponse __deferredResponse = new HttpServletResponse()
{
public void addCookie(Cookie cookie)
{

Back to the top