Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed problem with deferred security and form auth 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@642 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2009-08-05 16:26:35 +00:00
parent 4628a6869c
commit 9ec5d83f5c
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java
View File

@ -51,6 +51,7 @@ public interface IdentityService
/* ------------------------------------------------------------ */
/**
* Associate a runas Token with the current user and thread.
* @param user The UserIdentity
* @param token The runAsToken to associate.
* @return The previous runAsToken or null.
*/

10
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
View File

@ -234,6 +234,10 @@ public class FormAuthenticator extends LoginAuthenticator
return authentication;
}
// if we can't send challenge
if (_deferred.isDeferred(response))
return Authentication.UNAUTHENTICATED;
// remember the current URI
synchronized (session)
{
@ -246,11 +250,7 @@ public class FormAuthenticator extends LoginAuthenticator
session.setAttribute(__J_URI, buf.toString());
}
}
// if we can't send challenge
if (_deferred.isDeferred(response))
return Authentication.UNAUTHENTICATED;
// send the the challenge
if (_dispatch)
{

16
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -1168,7 +1168,8 @@ public class Request implements HttpServletRequest
{
return _uri;
}
/* ------------------------------------------------------------ */
public UserIdentity getUserIdentity()
{
if (_authentication instanceof Authentication.Deferred)
@ -1178,6 +1179,19 @@ public class Request implements HttpServletRequest
return ((Authentication.User)_authentication).getUserIdentity();
return null;
}
/* ------------------------------------------------------------ */
/**
* @return The resolved user Identity, which may be null if the
* {@link Authentication} is not {@link Authentication.User}
* (eg. {@link Authentication.Deferred}).
*/
public UserIdentity getResolvedUserIdentity()
{
if (_authentication instanceof Authentication.User)
return ((Authentication.User)_authentication).getUserIdentity();
return null;
}
/* ------------------------------------------------------------ */
public UserIdentity.Scope getUserIdentityScope()

2
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -513,7 +513,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope, Compara
// Handle run as
if (_identityService!=null)
old_run_as=_identityService.setRunAs(baseRequest.getUserIdentity(),_runAsToken);
old_run_as=_identityService.setRunAs(baseRequest.getResolvedUserIdentity(),_runAsToken);
if (!isAsyncSupported())
baseRequest.setAsyncSupported(false);