Repository: incubator-ranger Updated Branches: refs/heads/master de07826d3 -> ac3754131
RANGER-278: Partial rollback of policy validation since search for policy by name isn't working yet. Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/ac375413 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/ac375413 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/ac375413 Branch: refs/heads/master Commit: ac37541310327ca3b1c506818e0f9e09b15a00b1 Parents: de07826 Author: Alok Lal <[email protected]> Authored: Wed Mar 11 10:45:09 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Wed Mar 11 11:10:55 2015 -0700 ---------------------------------------------------------------------- .../org/apache/ranger/rest/ServiceREST.java | 8 +- .../rest/TestServiceRESTForValidation.java | 100 +++++++++---------- 2 files changed, 54 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/ac375413/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java index e127b35..be52892 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java @@ -793,8 +793,8 @@ public class ServiceREST { RangerPolicy ret = null; try { - RangerPolicyValidator validator = validatorFactory.getPolicyValidator(svcStore); - validator.validate(policy, Action.CREATE); +// RangerPolicyValidator validator = validatorFactory.getPolicyValidator(svcStore); +// validator.validate(policy, Action.CREATE); ret = svcStore.createPolicy(policy); } catch(Exception excp) { LOG.error("createPolicy(" + policy + ") failed", excp); @@ -820,8 +820,8 @@ public class ServiceREST { RangerPolicy ret = null; try { - RangerPolicyValidator validator = validatorFactory.getPolicyValidator(svcStore); - validator.validate(policy, Action.UPDATE); +// RangerPolicyValidator validator = validatorFactory.getPolicyValidator(svcStore); +// validator.validate(policy, Action.UPDATE); ret = svcStore.updatePolicy(policy); } catch(Exception excp) { LOG.error("updatePolicy(" + policy + ") failed", excp); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/ac375413/security-admin/src/test/java/org/apache/ranger/rest/TestServiceRESTForValidation.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceRESTForValidation.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceRESTForValidation.java index f2cbec2..da15ffa 100644 --- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceRESTForValidation.java +++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceRESTForValidation.java @@ -191,14 +191,14 @@ public class TestServiceRESTForValidation { @Test public void testPolicy_happyPath() { try { - _serviceRest.updatePolicy(_policy); - verify(_policyValidator).validate(_policy, Action.UPDATE); +// _serviceRest.updatePolicy(_policy); +// verify(_policyValidator).validate(_policy, Action.UPDATE); _serviceRest.deletePolicy(3L); verify(_policyValidator).validate(3L, Action.DELETE); - _serviceRest.createPolicy(_policy); - verify(_policyValidator).validate(_policy, Action.CREATE); +// _serviceRest.createPolicy(_policy); +// verify(_policyValidator).validate(_policy, Action.CREATE); } catch (Exception e) { LOG.debug(e); fail("unexpected exception"); @@ -208,29 +208,29 @@ public class TestServiceRESTForValidation { @Test public void testPolicy_validatorFailure() throws Exception { - doThrow(_exception).when(_policyValidator).validate(_policy, Action.CREATE); - try { - _serviceRest.createPolicy(_policy); - fail("Should have thrown exception!"); - } catch (WebApplicationException t) { - verify(_policyValidator).validate(_policy, Action.CREATE); - verify(_store, never()).createPolicy(_policy); - } catch (Throwable t) { - LOG.debug(t); - fail("Unexpected exception!"); - } - - doThrow(_exception).when(_policyValidator).validate(_policy, Action.UPDATE); - try { - _serviceRest.updatePolicy(_policy); - fail("Should have thrown exception!"); - } catch (WebApplicationException t) { - verify(_policyValidator).validate(_policy, Action.UPDATE); - verify(_store, never()).updatePolicy(_policy); - } catch (Throwable t) { - LOG.debug(t); - fail("Unexpected exception!"); - } +// doThrow(_exception).when(_policyValidator).validate(_policy, Action.CREATE); +// try { +// _serviceRest.createPolicy(_policy); +// fail("Should have thrown exception!"); +// } catch (WebApplicationException t) { +// verify(_policyValidator).validate(_policy, Action.CREATE); +// verify(_store, never()).createPolicy(_policy); +// } catch (Throwable t) { +// LOG.debug(t); +// fail("Unexpected exception!"); +// } +// +// doThrow(_exception).when(_policyValidator).validate(_policy, Action.UPDATE); +// try { +// _serviceRest.updatePolicy(_policy); +// fail("Should have thrown exception!"); +// } catch (WebApplicationException t) { +// verify(_policyValidator).validate(_policy, Action.UPDATE); +// verify(_store, never()).updatePolicy(_policy); +// } catch (Throwable t) { +// LOG.debug(t); +// fail("Unexpected exception!"); +// } doThrow(_exception).when(_policyValidator).validate(4L, Action.DELETE); try { @@ -247,29 +247,29 @@ public class TestServiceRESTForValidation { @Test public void testPolicy_storeFailure() throws Exception { - doThrow(_exception).when(_store).createPolicy(_policy); - try { - _serviceRest.createPolicy(_policy); - fail("Should have thrown exception!"); - } catch (WebApplicationException e) { - verify(_policyValidator).validate(_policy, Action.CREATE); - verify(_store).createPolicy(_policy); - } catch (Throwable t) { - LOG.debug(t); - fail("Unexpected exception!"); - } - - doThrow(_exception).when(_store).updatePolicy(_policy); - try { - _serviceRest.updatePolicy(_policy); - fail("Should have thrown exception!"); - } catch (WebApplicationException e) { - verify(_policyValidator).validate(_policy, Action.UPDATE); - verify(_store).updatePolicy(_policy); - } catch (Throwable t) { - LOG.debug(t); - fail("Unexpected exception!"); - } +// doThrow(_exception).when(_store).createPolicy(_policy); +// try { +// _serviceRest.createPolicy(_policy); +// fail("Should have thrown exception!"); +// } catch (WebApplicationException e) { +// verify(_policyValidator).validate(_policy, Action.CREATE); +// verify(_store).createPolicy(_policy); +// } catch (Throwable t) { +// LOG.debug(t); +// fail("Unexpected exception!"); +// } +// +// doThrow(_exception).when(_store).updatePolicy(_policy); +// try { +// _serviceRest.updatePolicy(_policy); +// fail("Should have thrown exception!"); +// } catch (WebApplicationException e) { +// verify(_policyValidator).validate(_policy, Action.UPDATE); +// verify(_store).updatePolicy(_policy); +// } catch (Throwable t) { +// LOG.debug(t); +// fail("Unexpected exception!"); +// } doThrow(_exception).when(_store).deletePolicy(5L); try {
