Ensure constraints matching particular http method are selected
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@149 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
a297aab93c
commit
5e4c38341f
|
@ -240,14 +240,10 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr
|
|||
String httpMethod = request.getMethod();
|
||||
RoleInfo roleInfo = mappings.get(httpMethod);
|
||||
if (roleInfo == null)
|
||||
{
|
||||
roleInfo = mappings.get(null);
|
||||
if (roleInfo != null)
|
||||
{
|
||||
return roleInfo;
|
||||
}
|
||||
}
|
||||
return roleInfo;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -94,10 +94,12 @@ public class ConstraintTest extends TestCase
|
|||
Constraint constraint2 = new Constraint();
|
||||
constraint2.setAuthenticate(true);
|
||||
constraint2.setName("admin");
|
||||
|
||||
constraint2.setRoles(new String[]{"administrator"});
|
||||
ConstraintMapping mapping2 = new ConstraintMapping();
|
||||
mapping2.setPathSpec("/admin/*");
|
||||
mapping2.setConstraint(constraint2);
|
||||
mapping2.setMethod("GET");
|
||||
|
||||
Constraint constraint3 = new Constraint();
|
||||
constraint3.setAuthenticate(false);
|
||||
|
|
Loading…
Reference in New Issue