Repository: cassandra Updated Branches: refs/heads/trunk e91bf8f3e -> 62e83d85d
Use LOCAL_ONE for non-superuser auth queries patch by Aleksey Yeschenko; reviewed by Jason Brown for CASSANDRA-7328 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d48a1871 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d48a1871 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d48a1871 Branch: refs/heads/trunk Commit: d48a1871d8cd79c3330b355e153567828b0bfbeb Parents: 2f497ed Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri May 30 21:12:33 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri May 30 21:12:33 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/Auth.java | 2 +- src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +- src/java/org/apache/cassandra/auth/PasswordAuthenticator.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d48a1871/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ef5f72a..e45cc72 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.17 + * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) * Set keepalive on MessagingService connections (CASSANDRA-7170) * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d48a1871/src/java/org/apache/cassandra/auth/Auth.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/Auth.java b/src/java/org/apache/cassandra/auth/Auth.java index e09514e..9cee12a 100644 --- a/src/java/org/apache/cassandra/auth/Auth.java +++ b/src/java/org/apache/cassandra/auth/Auth.java @@ -167,7 +167,7 @@ public class Auth if (username.equals(DEFAULT_SUPERUSER_NAME)) return ConsistencyLevel.QUORUM; else - return ConsistencyLevel.ONE; + return ConsistencyLevel.LOCAL_ONE; } private static void setupAuthKeyspace() http://git-wip-us.apache.org/repos/asf/cassandra/blob/d48a1871/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java index 396be71..0c94f57 100644 --- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java +++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java @@ -71,7 +71,7 @@ public class CassandraAuthorizer implements IAuthorizer UntypedResultSet result; try { - ResultMessage.Rows rows = authorizeStatement.execute(ConsistencyLevel.ONE, + ResultMessage.Rows rows = authorizeStatement.execute(ConsistencyLevel.LOCAL_ONE, new QueryState(new ClientState(true)), Lists.newArrayList(ByteBufferUtil.bytes(user.getName()), ByteBufferUtil.bytes(resource.getName()))); http://git-wip-us.apache.org/repos/asf/cassandra/blob/d48a1871/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java index 2c2e227..9adbe4e 100644 --- a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java @@ -262,6 +262,6 @@ public class PasswordAuthenticator implements IAuthenticator if (username.equals(DEFAULT_USER_NAME)) return ConsistencyLevel.QUORUM; else - return ConsistencyLevel.ONE; + return ConsistencyLevel.LOCAL_ONE; } }
