From de5f7ededeb7fdf87c7218196e611b6a9df225df Mon Sep 17 00:00:00 2001 From: myuzhobcplidtkieno <62526817+myuzhobcplidtkieno@users.noreply.github.com> Date: Wed, 8 Apr 2020 08:08:28 +1200 Subject: Added the ability to use TLS when connecting to a database. (#24348) * Added the ability to use TLS when connecting to a database. * Trying to kickstart CI checks * Revert the kickstart change Co-authored-by: myuzhobcplidtkieno Co-authored-by: Giacomo Pozzoni (cherry picked from commit ae553f89664a4baade80020856c9ff66323de963) --- src/server/database/Database/MySQLConnection.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/server/database/Database/MySQLConnection.cpp') diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index c197850ba11..acb96fa5d71 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -34,7 +34,7 @@ MySQLConnectionInfo::MySQLConnectionInfo(std::string const& infoString) { Tokenizer tokens(infoString, ';'); - if (tokens.size() != 5) + if (tokens.size() != 5 && tokens.size() != 6) return; uint8 i = 0; @@ -44,6 +44,9 @@ MySQLConnectionInfo::MySQLConnectionInfo(std::string const& infoString) user.assign(tokens[i++]); password.assign(tokens[i++]); database.assign(tokens[i++]); + + if (tokens.size() == 6) + ssl.assign(tokens[i++]); } MySQLConnection::MySQLConnection(MySQLConnectionInfo& connInfo) : @@ -129,6 +132,16 @@ uint32 MySQLConnection::Open() } #endif + if (m_connectionInfo.ssl != "") + { + my_bool opt_use_ssl = false; + if (m_connectionInfo.ssl == "ssl") + { + opt_use_ssl = true; + } + mysql_options(mysqlInit, MYSQL_OPT_SSL_ENFORCE, (char const*)&opt_use_ssl); + } + m_Mysql = reinterpret_cast(mysql_real_connect(mysqlInit, m_connectionInfo.host.c_str(), m_connectionInfo.user.c_str(), m_connectionInfo.password.c_str(), m_connectionInfo.database.c_str(), port, unix_socket, 0)); -- cgit v1.2.3