cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject git commit: Fix cqlsh authentication with 2.1 python driver
Date Thu, 17 Jul 2014 19:44:55 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 2a661195f -> e4b40c75c


Fix cqlsh authentication with 2.1 python driver

Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-7564


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

Branch: refs/heads/cassandra-2.1.0
Commit: e4b40c75c050914a5f2bdc88271e1ab518f8aaac
Parents: 2a66119
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Thu Jul 17 14:43:47 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Thu Jul 17 14:43:47 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 bin/cqlsh   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4b40c75/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8864cb1..81a35cd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
  * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
  * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
  * Handle queries on multiple secondary index types (CASSANDRA-7525)
+ * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 Merged from 2.0:
  * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
  * Fix range merging when DES scores are zero (CASSANDRA-7535)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4b40c75/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 76ff590..1798d3f 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -110,6 +110,7 @@ from cassandra.cluster import Cluster
 from cassandra.query import SimpleStatement
 from cassandra.policies import WhiteListRoundRobinPolicy
 from cassandra.metadata import protect_name, protect_names, protect_value
+from cassandra.auth import PlainTextAuthProvider
 
 # cqlsh should run correctly when run out of a Cassandra source tree,
 # out of an unpacked Cassandra tarball, and after a proper package install.
@@ -499,7 +500,7 @@ class Shell(cmd.Cmd):
         if username:
             if not password:
                 password = getpass.getpass()
-            self.auth_provider = lambda host: dict(username=username, password=password)
+            self.auth_provider = PlainTextAuthProvider(username=username, password=password)
         self.keyspace = keyspace
         self.tracing_enabled = tracing_enabled
         self.expand_enabled = expand_enabled


Mime
View raw message