You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2014/04/25 22:00:30 UTC
svn commit: r1590126 - in /hbase/branches/0.96:
hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/
src/main/docbkx/
Author: jdcryans
Date: Fri Apr 25 20:00:29 2014
New Revision: 1590126
URL: http://svn.apache.org/r1590126
Log:
HBASE-11008 Align bulk load, flush, and compact to require Action.CREATE
Modified:
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
hbase/branches/0.96/src/main/docbkx/security.xml
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java?rev=1590126&r1=1590125&r2=1590126&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java Fri Apr 25 20:00:29 2014
@@ -937,7 +937,8 @@ public class AccessController extends Ba
@Override
public void preFlush(ObserverContext<RegionCoprocessorEnvironment> e) throws IOException {
- requirePermission("flush", getTableName(e.getEnvironment()), null, null, Action.ADMIN);
+ requirePermission("flush", getTableName(e.getEnvironment()), null, null, Action.ADMIN,
+ Action.CREATE);
}
@Override
@@ -955,7 +956,8 @@ public class AccessController extends Ba
public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment> e,
final Store store, final InternalScanner scanner, final ScanType scanType)
throws IOException {
- requirePermission("compact", getTableName(e.getEnvironment()), null, null, Action.ADMIN);
+ requirePermission("compact", getTableName(e.getEnvironment()), null, null, Action.ADMIN,
+ Action.CREATE);
return scanner;
}
@@ -1218,7 +1220,7 @@ public class AccessController extends Ba
ctx.getEnvironment().getRegion().getTableDesc().getTableName(),
el.getFirst(),
null,
- Permission.Action.WRITE);
+ Action.CREATE);
}
}
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java?rev=1590126&r1=1590125&r2=1590126&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java Fri Apr 25 20:00:29 2014
@@ -622,7 +622,7 @@ public class TestAccessController extend
};
verifyAllowed(action, SUPERUSER, USER_ADMIN, USER_OWNER);
- verifyDenied(action, USER_CREATE, USER_RW, USER_RO, USER_NONE);
+ verifyDenied(action, USER_RW, USER_RO, USER_NONE);
}
@Test
@@ -652,8 +652,8 @@ public class TestAccessController extend
}
};
- verifyAllowed(action, SUPERUSER, USER_ADMIN, USER_OWNER);
- verifyDenied(action, USER_CREATE, USER_RW, USER_RO, USER_NONE);
+ verifyAllowed(action, SUPERUSER, USER_ADMIN, USER_OWNER, USER_CREATE);
+ verifyDenied(action, USER_RW, USER_RO, USER_NONE);
}
@Test
@@ -667,8 +667,8 @@ public class TestAccessController extend
}
};
- verifyAllowed(action, SUPERUSER, USER_ADMIN, USER_OWNER);
- verifyDenied(action, USER_CREATE, USER_RW, USER_RO, USER_NONE);
+ verifyAllowed(action, SUPERUSER, USER_ADMIN, USER_OWNER, USER_CREATE);
+ verifyDenied(action, USER_RW, USER_RO, USER_NONE);
}
@Test
Modified: hbase/branches/0.96/src/main/docbkx/security.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/src/main/docbkx/security.xml?rev=1590126&r1=1590125&r2=1590126&view=diff
==============================================================================
Binary files - no diff available.