hbase git commit: HBASE-12647 Truncate table should work with C as well

[enis]

Repository: hbase
Updated Branches:
  refs/heads/0.98 6d24a3b67 -> 6b9f597d5


HBASE-12647 Truncate table should work with C as well

Conflicts:
        
hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6b9f597d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6b9f597d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6b9f597d

Branch: refs/heads/0.98
Commit: 6b9f597d5f9a218751a82b807619f2af4fa4a7d3
Parents: 6d24a3b
Author: Enis Soztutar <e...@apache.org>
Authored: Sun Dec 7 20:57:04 2014 -0800
Committer: Enis Soztutar <e...@apache.org>
Committed: Sun Dec 7 21:12:46 2014 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/security/access/AccessController.java       | 2 +-
 .../hadoop/hbase/security/access/TestAccessController.java   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/6b9f597d/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
index 5f53a47..506acee 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
@@ -872,7 +872,7 @@ public class AccessController extends 
BaseMasterAndRegionObserver
    @Override
   public void preTruncateTable(ObserverContext<MasterCoprocessorEnvironment> c,
       final TableName tableName) throws IOException {
-    requirePermission("truncateTable", tableName, null, null, Action.ADMIN);
+    requirePermission("truncateTable", tableName, null, null, Action.ADMIN, 
Action.CREATE);
     final Configuration conf = c.getEnvironment().getConfiguration();
     User.runAsLoginUser(new PrivilegedExceptionAction<Void>() {
       @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/6b9f597d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
index 7341f8f..8638e86 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
@@ -148,6 +148,10 @@ public class TestAccessController extends SecureTestUtil {
   // user with no permissions
   private static User USER_NONE;
 
+  // TODO: convert this test to cover the full matrix in
+  // https://hbase.apache.org/book/appendix_acl_matrix.html
+  // creating all Scope x Permission combinations
+
   private static TableName TEST_TABLE2 = TableName.valueOf("testtable2");
   private static byte[] TEST_FAMILY = Bytes.toBytes("f1");
   private static byte[] TEST_QUALIFIER = Bytes.toBytes("q1");
@@ -332,8 +336,8 @@ public class TestAccessController extends SecureTestUtil {
       }
     };
 
-    verifyAllowed(truncateTable, SUPERUSER, USER_ADMIN);
-    verifyDenied(truncateTable, USER_RW, USER_RO, USER_NONE,USER_CREATE, 
USER_OWNER);
+    verifyAllowed(truncateTable, SUPERUSER, USER_ADMIN, USER_CREATE);
+    verifyDenied(truncateTable, USER_RW, USER_RO, USER_NONE, USER_OWNER);
   }
 
   @Test