Merge pull request apache#1087 from datastax/python-1241

PYTHON-1241: Fix PlainTextAuthProvider fails with unicode chars and Python3

Author: aboudreault

CHANGELOG.rst

@@ -11,6 +11,7 @@ Features
 Bug Fixes
 ---------
 * Unable to connect to a cloud cluster using Ubuntu 20.04 (PYTHON-1238)
+* PlainTextAuthProvider fails with unicode chars and Python3 (PYTHON-1241)
 * [GRAPH] Can't write data in a Boolean field using the Fluent API (PYTHON-1239)
 * [GRAPH] Fix elementMap() result deserialization (PYTHON-1233)
 

cassandra/auth.py

@@ -277,7 +277,8 @@ def get_initial_challenge(self):
 
     def evaluate_challenge(self, challenge):
         if challenge == six.b('PLAIN-START'):
-            return six.b("\x00%s\x00%s" % (self.username, self.password))
+            data = "\x00%s\x00%s" % (self.username, self.password)
+            return data if six.PY2 else data.encode()
         raise Exception('Did not receive a valid challenge response from server')
 
 

tests/unit/test_auth.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# # Copyright DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import six
+from cassandra.auth import PlainTextAuthenticator
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest  # noqa
+
+
+class TestPlainTextAuthenticator(unittest.TestCase):
+
+    def test_evaluate_challenge_with_unicode_data(self):
+        authenticator = PlainTextAuthenticator("johnӁ", "doeӁ")
+        self.assertEqual(
+            authenticator.evaluate_challenge(six.ensure_binary('PLAIN-START')),
+            six.ensure_binary("\x00johnӁ\x00doeӁ")
+        )