python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 19:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Preliminary SSL support. Adds a ssl parameter to connect().

Browse Source 
ssl should be a mapping. These are the recognized keys:

ca*, cert*, capath, key*, cipher

Items marked with * are required. All values must be strings.
They are described here:

http://www.mysql.com/doc/en/SSL_options.html

You're probably better off putting these variables into an
option file and using read_option_file instead.

SSL is supported in MySQL-4.0 and newer. Even if you don't
specify all the required parameters, the connection will probably
succeed, although without SSL.

This is not yet tested in any significant way.
This commit is contained in:
adustman
2003-11-27 20:56:40 +00:00
parent ff06467924
commit d0b77eed7d
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
MySQLdb/_mysql.c
View File

@ -401,6 +401,10 @@ _mysql_ConnectionObject_Initialize(
{
MYSQL *conn=NULL;
PyObject *conv = NULL;
PyObject *ssl = NULL;
PyObject *value = NULL;;
char *key = NULL, *cert = NULL, *ca = NULL,
*capath = NULL, *cipher = NULL;
char *host = NULL, *user = NULL, *passwd = NULL,
*db = NULL, *unix_socket = NULL;
uint port = MYSQL_PORT;
@ -410,7 +414,7 @@ _mysql_ConnectionObject_Initialize(
"connect_timeout", "compress",
"named_pipe", "init_command",
"read_default_file", "read_default_group",
"client_flag",
"client_flag", "ssl",
NULL } ;
int connect_timeout = 0;
int compress = -1, named_pipe = -1;
@ -421,7 +425,7 @@ _mysql_ConnectionObject_Initialize(
self->converter = NULL;
self->open = 0;
check_server_init(-1);
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ssssisOiiisssi:connect",
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ssssisOiiisssiO:connect",
kwlist,
&host, &user, &passwd, &db,
&port, &unix_socket, &conv,
@ -429,7 +433,7 @@ _mysql_ConnectionObject_Initialize(
&compress, &named_pipe,
&init_command, &read_default_file,
&read_default_group,
&client_flag))
&client_flag, &ssl))
return -1;
if (!conv)
@ -442,6 +446,18 @@ _mysql_ConnectionObject_Initialize(
return -1;
self->converter = conv;
#define _stringsuck(d,t,s) {t=PyMapping_GetItemString(s,#d);\
if(t){d=PyString_AsString(t);Py_DECREF(t);}\
PyErr_Clear();}
if (ssl) {
_stringsuck(ca, value, ssl);
_stringsuck(capath, value, ssl);
_stringsuck(cert, value, ssl);
_stringsuck(key, value, ssl);
_stringsuck(cipher, value, ssl);
}
Py_BEGIN_ALLOW_THREADS ;
conn = mysql_init(&(self->connection));
if (connect_timeout) {
@ -461,6 +477,11 @@ _mysql_ConnectionObject_Initialize(
mysql_options(&(self->connection), MYSQL_READ_DEFAULT_FILE, read_default_file);
if (read_default_group != NULL)
mysql_options(&(self->connection), MYSQL_READ_DEFAULT_GROUP, read_default_group);
#if MYSQL_VERSION_ID >= 40000
if (ssl)
mysql_ssl_set(&(self->connection),
key, cert, ca, capath, cipher);
#endif
conn = mysql_real_connect(&(self->connection), host, user, passwd, db,
port, unix_socket, client_flag);
Py_END_ALLOW_THREADS ;