Repository: falcon Updated Branches: refs/heads/master ff9c78e3c -> 84eafdb0f
FALCON-1257 Fix feedAclUpdate and processAclUpdate. Contributed by Ruslan Ostafiychuk Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/84eafdb0 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/84eafdb0 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/84eafdb0 Branch: refs/heads/master Commit: 84eafdb0f129280154688ddbac07e0e5849a3a6d Parents: ff9c78e Author: Ruslan Ostafiychuk <[email protected]> Authored: Fri Jun 5 17:45:01 2015 +0300 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Fri Jun 5 17:52:44 2015 +0300 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../falcon/regression/security/FeedAclTest.java | 30 ++------------------ .../regression/security/ProcessAclTest.java | 29 ++----------------- 3 files changed, 6 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/84eafdb0/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 46799e8..42922a9 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -339,6 +339,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1257 Fix feedAclUpdate and processAclUpdate (Ruslan Ostafiychuk) + FALCON-1255 Fix list of expected statuses in drop down on Entity Page (Ruslan Ostafiychuk) FALCON-1246 Remove wrong parameter from update signature, delete related tests (Paul Isaychuk) http://git-wip-us.apache.org/repos/asf/falcon/blob/84eafdb0/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java index 9a7ef15..6144c69 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/FeedAclTest.java @@ -18,7 +18,6 @@ package org.apache.falcon.regression.security; -import org.apache.falcon.entity.v0.feed.ACL; import org.apache.falcon.regression.Entities.FeedMerlin; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.enumsAndConstants.MerlinConstants; @@ -207,33 +206,8 @@ public class FeedAclTest extends BaseTestClass { final FeedMerlin feedMerlin = new FeedMerlin(oldFeed); feedMerlin.setACL(newOwner, newGroup, "*"); final String newFeed = feedMerlin.toString(); - AssertUtil.assertSucceeded(feedHelper.update(oldFeed, newFeed)); - //check that current user can access the feed - for(EntityOp op : new EntityOp[]{EntityOp.status, EntityOp.dependency, EntityOp.listing, - EntityOp.definition, }) { - final boolean executeRes = - op.executeAs(MerlinConstants.CURRENT_USER_NAME, feedHelper, newFeed); - Assert.assertEquals(executeRes, newGroup.equals(MerlinConstants.CURRENT_USER_GROUP), - "Unexpected result user "+ MerlinConstants.CURRENT_USER_NAME - + " performing: " + op); - } - //check that second user can access the feed - for(EntityOp op : new EntityOp[]{EntityOp.status, EntityOp.dependency, EntityOp.listing, - EntityOp.definition, }) { - final boolean executeRes = - op.executeAs(newOwner, feedHelper, newFeed); - Assert.assertTrue(executeRes, "Unexpected result: user " + newOwner - + " was not able to perform: " + op); - } - //check modified permissions - final String retrievedFeed = feedHelper.getEntityDefinition(newFeed).getMessage(); - final ACL retrievedFeedAcl = new FeedMerlin(retrievedFeed).getACL(); - Assert.assertEquals(retrievedFeedAcl.getOwner(), newOwner, - "Expecting " + newOwner + " to be the acl owner."); - Assert.assertEquals(retrievedFeedAcl.getGroup(), newGroup, - "Expecting " + newGroup + " to be the acl group."); - //check that second user can modify feed acl - AssertUtil.assertSucceeded(feedHelper.update(newFeed, oldFeed, newOwner)); + AssertUtil.assertFailed(feedHelper.update(oldFeed, newFeed), + "AuthorizationException: Permission denied"); } @DataProvider(name = "generateAclOwnerAndGroup") http://git-wip-us.apache.org/repos/asf/falcon/blob/84eafdb0/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java index 9735567..b649915 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/security/ProcessAclTest.java @@ -18,7 +18,6 @@ package org.apache.falcon.regression.security; -import org.apache.falcon.entity.v0.process.ACL; import org.apache.falcon.regression.Entities.ProcessMerlin; import org.apache.falcon.regression.core.bundle.Bundle; import org.apache.falcon.regression.core.enumsAndConstants.MerlinConstants; @@ -217,32 +216,8 @@ public class ProcessAclTest extends BaseTestClass { final ProcessMerlin processMerlin = new ProcessMerlin(processString); processMerlin.setACL(newOwner, newGroup, "*"); final String newProcess = processMerlin.toString(); - AssertUtil.assertSucceeded(processHelper.update(processString, newProcess)); - //check that current user can access the feed - for(EntityOp op : new EntityOp[]{EntityOp.status, EntityOp.dependency, EntityOp.listing, - EntityOp.definition, }) { - final boolean executeRes = - op.executeAs(MerlinConstants.CURRENT_USER_NAME, processHelper, newProcess); - Assert.assertEquals(executeRes, newGroup.equals(MerlinConstants.CURRENT_USER_GROUP), - "Unexpected result: user " + MerlinConstants.CURRENT_USER_NAME - + " was not able to perform: " + op); - } - //check that second user can access the feed - for(EntityOp op : new EntityOp[]{EntityOp.status, EntityOp.dependency, EntityOp.listing, - EntityOp.definition, }) { - final boolean executeRes = op.executeAs(newOwner, processHelper, newProcess); - Assert.assertTrue(executeRes, "Unexpected result: user " - + newOwner + " was not able to perform: " + op); - } - //check modified permissions - final String retrievedProcess = processHelper.getEntityDefinition(newProcess).getMessage(); - final ACL retrievedProcessAcl = new ProcessMerlin(retrievedProcess).getACL(); - Assert.assertEquals(retrievedProcessAcl.getOwner(), newOwner, - "Expecting " + newOwner + " to be the acl owner."); - Assert.assertEquals(retrievedProcessAcl.getGroup(), newGroup, - "Expecting " + newGroup + " to be the acl group."); - //check that second user can modify process acl - AssertUtil.assertSucceeded(processHelper.update(newProcess, processString, newOwner)); + AssertUtil.assertFailed(processHelper.update(processString, newProcess), + "AuthorizationException: Permission denied"); } @DataProvider(name = "generateAclOwnerAndGroup")
