You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/01/02 14:16:46 UTC
git commit: Validate CF existence on execution for prepared statement
Updated Branches:
refs/heads/cassandra-1.2 2f63bbadf -> 7171b7a2c
Validate CF existence on execution for prepared statement
patch by aholmber; reviewed by slebresne for CASSANDRA-6535
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7171b7a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7171b7a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7171b7a2
Branch: refs/heads/cassandra-1.2
Commit: 7171b7a2c621c2a0b4f876bef23e4f1ebc5332b0
Parents: 2f63bba
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jan 2 14:15:06 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jan 2 14:15:06 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/ClientState.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7171b7a2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6c63f9d..64146c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@
* Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
* Validate SliceRange start and finish lengths (CASSANDRA-6521)
* fsync compression metadata (CASSANDRA-6531)
+ * Validate CF existence on execution for prepared statement (CASSANDRA-6535)
1.2.13
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7171b7a2/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index e6b0f97..87ccfda 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.AuthenticationException;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.exceptions.UnauthorizedException;
+import org.apache.cassandra.thrift.ThriftValidation;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.SemanticVersion;
@@ -144,6 +145,7 @@ public class ClientState
public void hasColumnFamilyAccess(String keyspace, String columnFamily, Permission perm)
throws UnauthorizedException, InvalidRequestException
{
+ ThriftValidation.validateColumnFamily(keyspace, columnFamily);
hasAccess(keyspace, perm, DataResource.columnFamily(keyspace, columnFamily));
}