Author: eevans
Date: Tue Sep 28 23:01:09 2010
New Revision: 1002403
URL: http://svn.apache.org/viewvc?rev=1002403&view=rev
Log:
eliminate {READ,WRITE}_VALUE perms
Patch by eevans for CASSANDRA-1271
Modified:
cassandra/trunk/src/java/org/apache/cassandra/auth/Permission.java
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/auth/Permission.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/auth/Permission.java?rev=1002403&r1=1002402&r2=1002403&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/auth/Permission.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/auth/Permission.java Tue Sep
28 23:01:09 2010
@@ -30,14 +30,8 @@ import java.util.EnumSet;
*/
public enum Permission
{
- // view the direct children of this resource
READ,
- // modify the direct children of this resource
- WRITE,
- // view data in all ancestors of this resource
- READ_VALUE,
- // modify data in all ancestors of this resource
- WRITE_VALUE;
+ WRITE;
public static final EnumSet<Permission> ALL =
EnumSet.allOf(Permission.class);
public static final EnumSet<Permission> NONE =
EnumSet.noneOf(Permission.class);
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=1002403&r1=1002402&r2=1002403&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Tue
Sep 28 23:01:09 2010
@@ -1001,7 +1001,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("multiget_count");
- checkKeyspaceAndLoginAuthorized(Permission.READ_VALUE);
+ checkKeyspaceAndLoginAuthorized(Permission.READ);
String keyspace = state().getKeyspace();
List<KeyCountMapEntry> counts = new ArrayList<KeyCountMapEntry>();
@@ -1040,7 +1040,7 @@ public class CassandraServer implements
try
{
- state().hasKeyspaceAccess(Permission.WRITE_VALUE);
+ state().hasKeyspaceAccess(Permission.WRITE);
schedule();
StorageProxy.truncateBlocking(state().getKeyspace(),
columnFamily.toString());
}
@@ -1073,7 +1073,7 @@ public class CassandraServer implements
String keyspace = state().getKeyspace();
try
{
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
}
catch (org.apache.cassandra.thrift.InvalidRequestException thriftE)
{
@@ -1139,7 +1139,7 @@ public class CassandraServer implements
try
{
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
}
catch (org.apache.cassandra.thrift.InvalidRequestException thriftE)
{
Modified:
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1002403&r1=1002402&r2=1002403&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Tue Sep 28 23:01:09 2010
@@ -264,7 +264,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("get_slice");
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
return multigetSliceInternal(state().getKeyspace(),
Collections.singletonList(key), column_parent, predicate,
consistency_level).get(key);
}
@@ -274,7 +274,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("multiget_slice");
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
return multigetSliceInternal(state().getKeyspace(), keys,
column_parent, predicate, consistency_level);
}
@@ -313,7 +313,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("get");
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
String keyspace = state().getKeyspace();
ThriftValidation.validateColumnPath(keyspace, column_path);
@@ -341,7 +341,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("get_count");
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
return get_slice(key, column_parent, predicate,
consistency_level).size();
}
@@ -352,7 +352,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("multiget_count");
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
String keyspace = state().getKeyspace();
Map<byte[], Integer> counts = new HashMap<byte[], Integer>();
@@ -370,7 +370,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("insert");
- state().hasKeyspaceAccess(Permission.WRITE_VALUE);
+ state().hasKeyspaceAccess(Permission.WRITE);
ThriftValidation.validateKey(key);
ThriftValidation.validateColumnParent(state().getKeyspace(),
column_parent);
@@ -394,7 +394,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("batch_mutate");
- state().hasKeyspaceAccess(Permission.WRITE_VALUE);
+ state().hasKeyspaceAccess(Permission.WRITE);
List<RowMutation> rowMutations = new ArrayList<RowMutation>();
for (Map.Entry<byte[], Map<String, List<Mutation>>> mutationEntry:
mutation_map.entrySet())
@@ -424,7 +424,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("remove");
- state().hasKeyspaceAccess(Permission.WRITE_VALUE);
+ state().hasKeyspaceAccess(Permission.WRITE);
ThriftValidation.validateKey(key);
ThriftValidation.validateColumnPathOrParent(state().getKeyspace(),
column_path);
@@ -477,7 +477,7 @@ public class CassandraServer implements
logger.debug("range_slice");
String keyspace = state().getKeyspace();
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
ThriftValidation.validateColumnParent(keyspace, column_parent);
ThriftValidation.validatePredicate(keyspace, column_parent, predicate);
@@ -540,7 +540,7 @@ public class CassandraServer implements
if (logger.isDebugEnabled())
logger.debug("scan");
- state().hasKeyspaceAccess(Permission.READ_VALUE);
+ state().hasKeyspaceAccess(Permission.READ);
String keyspace = state().getKeyspace();
ThriftValidation.validateColumnParent(keyspace, column_parent);
ThriftValidation.validatePredicate(keyspace, column_parent,
column_predicate);
@@ -962,7 +962,7 @@ public class CassandraServer implements
public void truncate(String cfname) throws InvalidRequestException,
UnavailableException, TException
{
logger.debug("truncating {} in {}", cfname, state().getKeyspace());
- state().hasKeyspaceAccess(Permission.WRITE_VALUE);
+ state().hasKeyspaceAccess(Permission.WRITE);
try
{
schedule();
