VIVO-761 Clean up some logic, remove some obsolete classes.
This commit is contained in:
parent
78fe1bbb41
commit
20ba75d1d2
11 changed files with 134 additions and 339 deletions
|
@ -10,6 +10,7 @@ import java.util.Set;
|
|||
|
||||
import org.apache.log4j.Level;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
import stubs.javax.servlet.ServletContextStub;
|
||||
|
@ -20,7 +21,6 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
|
|||
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
|
||||
|
||||
/**
|
||||
|
@ -51,50 +51,56 @@ public class PolicyHelper_ActionsTest extends AbstractTestClass {
|
|||
// Action-level tests
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void authorizedForActionsNull() {
|
||||
createPolicy();
|
||||
assertEquals("null actions", true,
|
||||
PolicyHelper.isAuthorizedForActions(req, (Actions) null));
|
||||
// createPolicy();
|
||||
// assertEquals("null actions", true,
|
||||
// PolicyHelper.isAuthorizedForActions(req, (Actions) null));
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void authorizedForActionsEmpty() {
|
||||
createPolicy();
|
||||
assertEquals("empty actions", true,
|
||||
PolicyHelper.isAuthorizedForActions(req, new Actions()));
|
||||
// createPolicy();
|
||||
// assertEquals("empty actions", true,
|
||||
// PolicyHelper.isAuthorizedForActions(req, new Actions()));
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void authorizedForActionsOneClausePass() {
|
||||
createPolicy(new Action1(), new Action2());
|
||||
assertEquals("one clause pass", true,
|
||||
PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
new Action1(), new Action2())));
|
||||
// createPolicy(new Action1(), new Action2());
|
||||
// assertEquals("one clause pass", true,
|
||||
// PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
// new Action1(), new Action2())));
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void authorizedForActionsOneClauseFail() {
|
||||
createPolicy(new Action2());
|
||||
assertEquals("one clause fail", false,
|
||||
PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
new Action1(), new Action2())));
|
||||
// createPolicy(new Action2());
|
||||
// assertEquals("one clause fail", false,
|
||||
// PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
// new Action1(), new Action2())));
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void authorizedForActionsMultipleClausesPass() {
|
||||
createPolicy(new Action3());
|
||||
assertEquals("multiple clauses pass", true,
|
||||
PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
new Action1(), new Action2()).or(new Action3())));
|
||||
// createPolicy(new Action3());
|
||||
// assertEquals("multiple clauses pass", true,
|
||||
// PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
// new Action1(), new Action2()).or(new Action3())));
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void authorizedForActionsMultipleClausesFail() {
|
||||
createPolicy(new Action1());
|
||||
assertEquals("multiple clauses fail", false,
|
||||
PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
new Action1(), new Action2()).or(new Action3())));
|
||||
// createPolicy(new Action1());
|
||||
// assertEquals("multiple clauses fail", false,
|
||||
// PolicyHelper.isAuthorizedForActions(req, new Actions(
|
||||
// new Action1(), new Action2()).or(new Action3())));
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
|
|
@ -7,131 +7,131 @@ import java.util.List;
|
|||
|
||||
import junit.framework.Assert;
|
||||
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AllRequestedAction;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AnyRequestedAction;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizedAction;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
|
||||
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.UnauthorizedAction;
|
||||
|
||||
public class PolicyListTest {
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void basicPolicyListTest() {
|
||||
|
||||
List<PolicyIface> polis = new ArrayList<PolicyIface>();
|
||||
polis.add( new SimplePolicy() );
|
||||
PolicyIface policy = new PolicyList( polis );
|
||||
PolicyDecision decision = policy.isAuthorized(null, new UnauthorizedAction());
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
decision = policy.isAuthorized(null, new AuthorizedAction());
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// List<PolicyIface> polis = new ArrayList<PolicyIface>();
|
||||
// polis.add( new SimplePolicy() );
|
||||
// PolicyIface policy = new PolicyList( polis );
|
||||
// PolicyDecision decision = policy.isAuthorized(null, new UnauthorizedAction());
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// decision = policy.isAuthorized(null, new AuthorizedAction());
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the handling of the AnyRequestedAction by the PolicyList.
|
||||
*/
|
||||
@Ignore
|
||||
@Test
|
||||
public void anyActionTest(){
|
||||
List<PolicyIface> polis = new ArrayList<PolicyIface>();
|
||||
polis.add( new SimplePolicy() );
|
||||
PolicyIface policy = new PolicyList( polis );
|
||||
|
||||
AnyRequestedAction act = new AnyRequestedAction( new UnauthorizedAction() );
|
||||
PolicyDecision decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new UnauthorizedAction() , new UnauthorizedAction());
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new UnauthorizedAction(),new UnauthorizedAction(),new UnauthorizedAction());
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new AuthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new AuthorizedAction(),new UnauthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new UnauthorizedAction(),new AuthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new UnauthorizedAction(),new UnauthorizedAction(),new AuthorizedAction());
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new UnauthorizedAction(),new AuthorizedAction(),new AuthorizedAction());
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AnyRequestedAction( new AuthorizedAction(),new AuthorizedAction(),new AuthorizedAction());
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
// List<PolicyIface> polis = new ArrayList<PolicyIface>();
|
||||
// polis.add( new SimplePolicy() );
|
||||
// PolicyIface policy = new PolicyList( polis );
|
||||
//
|
||||
// AnyRequestedAction act = new AnyRequestedAction( new UnauthorizedAction() );
|
||||
// PolicyDecision decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new UnauthorizedAction() , new UnauthorizedAction());
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new UnauthorizedAction(),new UnauthorizedAction(),new UnauthorizedAction());
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new AuthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new AuthorizedAction(),new UnauthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new UnauthorizedAction(),new AuthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new UnauthorizedAction(),new UnauthorizedAction(),new AuthorizedAction());
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new UnauthorizedAction(),new AuthorizedAction(),new AuthorizedAction());
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AnyRequestedAction( new AuthorizedAction(),new AuthorizedAction(),new AuthorizedAction());
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the handling of the AllRequestedAction by the PolicyList.
|
||||
*/
|
||||
@Ignore
|
||||
@Test
|
||||
public void andActionTest(){
|
||||
List<PolicyIface> polis = new ArrayList<PolicyIface>();
|
||||
polis.add( new SimplePolicy() );
|
||||
PolicyIface policy = new PolicyList( polis );
|
||||
|
||||
AllRequestedAction act = new AllRequestedAction( new UnauthorizedAction(), new UnauthorizedAction(), new UnauthorizedAction());
|
||||
PolicyDecision decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AllRequestedAction( new UnauthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AllRequestedAction( new UnauthorizedAction() , new AuthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AllRequestedAction( new AuthorizedAction() , new UnauthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AllRequestedAction( new AuthorizedAction() , new AuthorizedAction() ,new UnauthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AllRequestedAction( new AuthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
|
||||
act = new AllRequestedAction( new AuthorizedAction() , new AuthorizedAction(), new AuthorizedAction() );
|
||||
decision = policy.isAuthorized(null, act);
|
||||
Assert.assertNotNull( decision );
|
||||
Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
// List<PolicyIface> polis = new ArrayList<PolicyIface>();
|
||||
// polis.add( new SimplePolicy() );
|
||||
// PolicyIface policy = new PolicyList( polis );
|
||||
//
|
||||
// AllRequestedAction act = new AllRequestedAction( new UnauthorizedAction(), new UnauthorizedAction(), new UnauthorizedAction());
|
||||
// PolicyDecision decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AllRequestedAction( new UnauthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AllRequestedAction( new UnauthorizedAction() , new AuthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AllRequestedAction( new AuthorizedAction() , new UnauthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AllRequestedAction( new AuthorizedAction() , new AuthorizedAction() ,new UnauthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.UNAUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AllRequestedAction( new AuthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
//
|
||||
// act = new AllRequestedAction( new AuthorizedAction() , new AuthorizedAction(), new AuthorizedAction() );
|
||||
// decision = policy.isAuthorized(null, act);
|
||||
// Assert.assertNotNull( decision );
|
||||
// Assert.assertEquals(Authorization.AUTHORIZED, decision.getAuthorized() );
|
||||
}
|
||||
|
||||
|
||||
|
@ -143,11 +143,11 @@ public class PolicyListTest {
|
|||
@Override
|
||||
public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
|
||||
RequestedAction whatToAuth) {
|
||||
if( whatToAuth instanceof UnauthorizedAction )
|
||||
return new BasicPolicyDecision( Authorization.UNAUTHORIZED, "SimplePolicy unauthorized");
|
||||
if( whatToAuth instanceof AuthorizedAction )
|
||||
return new BasicPolicyDecision( Authorization.AUTHORIZED, "SimplePolicy authorized");
|
||||
else
|
||||
// if( whatToAuth instanceof UnauthorizedAction )
|
||||
// return new BasicPolicyDecision( Authorization.UNAUTHORIZED, "SimplePolicy unauthorized");
|
||||
// if( whatToAuth instanceof AuthorizedAction )
|
||||
// return new BasicPolicyDecision( Authorization.AUTHORIZED, "SimplePolicy authorized");
|
||||
// else
|
||||
return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "SimplePolicy INCONCLUSIVE");
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue