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

improved deferred authentication handling and fixed test harnesses 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@622 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2009-08-03 03:17:43 +00:00
parent 964d9da7cd
commit ff0450e1b8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
View File

@ -51,14 +51,16 @@ public class LikeJettyXml
mbContainer.addBean(Log.getLog());
// Setup Connectors
// Setup Threadpool
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setMaxThreads(100);
server.setThreadPool(threadPool);
Connector connector = new SelectChannelConnector();
// Setup Connectors
SelectChannelConnector connector = new SelectChannelConnector();
connector.setPort(8080);
connector.setMaxIdleTime(30000);
connector.setConfidentialPort(8443);
server.setConnectors(new Connector[]
{ connector });

8
jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
View File

@ -409,8 +409,10 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
if (handler==null)
return;
final Authenticator authenticator = _authenticator;
if (_authenticator!=null && checkSecurity(baseRequest))
if (authenticator!=null && checkSecurity(baseRequest))
{
Object constraintInfo = prepareConstraintInfo(pathInContext, baseRequest);
@ -419,14 +421,12 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
{
if (!baseRequest.isHandled())
{
response.sendError(Response.SC_FORBIDDEN);
response.sendError(Response.SC_FORBIDDEN,"!data constraint");
baseRequest.setHandled(true);
}
return;
}
final Authenticator authenticator = _authenticator;
// is Auth mandatory?
boolean isAuthMandatory =
isAuthMandatory(baseRequest, base_response, constraintInfo) ||

2
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthenticator.java
View File

@ -60,7 +60,7 @@ public class DeferredAuthenticator extends DelegateAuthenticator
*/
public Authentication validateRequest(ServletRequest request, ServletResponse response, boolean mandatory) throws ServerAuthException
{
if (!(mandatory || _delegate.isMandatory(request)))
if (!mandatory)
return _deferred;
return _delegate.validateRequest(request,response,mandatory);

2
test-jetty-webapp/src/main/webapp/auth.html
View File

@ -16,7 +16,7 @@ This page contains several links to test the authentication constraints:
<li><a href="dump/auth/relax/info">dump/auth/relax/*</a> - Allowed</li>
<li><a href="dump/auth/info">dump/auth/*</a> - Authenticated any user</li>
<li><a href="dump/auth/admin/info">dump/auth/admin/*</a> - Authenticated admin role (<a href="session/?Action=Invalidate">click</a> to invalidate session)</li>
<li><a href="dump/ssl/info">dump/ssl/*</a> - Confidential</li>
<li><a href="dump/auth/ssl/info">dump/auth/ssl/*</a> - Confidential</li>
</ul>
<p/>
<p>