BUG19703022: Fix using passwords with integers only in option files

peeyushgupta · Geert Vanderkelen · commit cdacb3f3a9bc · 2014-12-12T18:30:04.000+01:00
Passwords consisting of only integers were raising error when used with option files. We fix this by not evaluating value for password option in option files. Unit tests are updated. (cherry picked from commit 677b310)
diff --git a/lib/mysql/connector/optionfiles.py b/lib/mysql/connector/optionfiles.py
@@ -103,10 +103,14 @@ def read_option_files(**config):
             except KeyError:
                 continue
 
+        not_evaluate = ('password', 'passwd')
         for option, value in config_options.items():
             if option not in config:
                 try:
-                    config[option] = eval(value[0])  # pylint: disable=W0123
+                    if option in not_evaluate:
+                        config[option] = value[0]
+                    else:
+                        config[option] = eval(value[0])  # pylint: disable=W0123
                 except (NameError, SyntaxError):
                     config[option] = value[0]
 
diff --git a/tests/data/option_files/my.cnf b/tests/data/option_files/my.cnf
@@ -1,5 +1,6 @@
 
 [client]
+password=12345
 port=1000
 socket=/var/run/mysqld/mysqld.sock
 ssl-ca=dummyCA
diff --git a/tests/test_optionfiles.py b/tests/test_optionfiles.py
@@ -99,6 +99,7 @@ def test_read(self,):
 
     def test_get_groups(self):
         exp = {
+            'password': '12345',
             'port': '1001',
             'socket': '/var/run/mysqld/mysqld2.sock',
             'ssl-ca': 'dummyCA',
@@ -122,6 +123,7 @@ def test_get_groups(self):
     def test_get_groups_as_dict(self):
         exp = dict([
             ('client', {'port': '1000',
+                        'password': '12345',
                         'socket': '/var/run/mysqld/mysqld.sock',
                         'ssl-ca': 'dummyCA',
                         'ssl-cert': 'dummyCert',
@@ -167,6 +169,7 @@ def test_read_option_files(self):
 
         option_file_dir = os.path.join('tests', 'data', 'option_files')
         exp = {
+            'password': '12345',
             'port': 1000,
             'unix_socket': '/var/run/mysqld/mysqld.sock',
             'ssl_ca': 'dummyCA',
@@ -177,6 +180,7 @@ def test_read_option_files(self):
             option_file_dir, 'my.cnf'))
         self.assertEqual(exp, result)
         exp = {
+            'password': '12345',
             'port': 1001,
             'unix_socket': '/var/run/mysqld/mysqld2.sock',
             'ssl_ca': 'dummyCA',
