database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

MCOL-497 securing mysql connection with TLS in crossengine and querystats code.

Browse Source
This commit is contained in:
Roman Nozdrin
2017-12-19 08:21:55 +03:00
parent b795e6b781
commit fbd081dbf1
11 changed files with 302 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
dbcon/joblist/crossenginestep.cpp
View File

@@ -57,85 +57,11 @@ using namespace querytele;
#include "jobstep.h"
#include "jlf_common.h"
#include "libmysql_client.h"
namespace joblist
{
LibMySQL::LibMySQL() : fCon(NULL), fRes(NULL)
{
}
LibMySQL::~LibMySQL()
{
if (fRes)
{
mysql_free_result(fRes);
}
fRes = NULL;
if (fCon)
{
mysql_close(fCon);
}
fCon = NULL;
}
int LibMySQL::init(const char* h, unsigned int p, const char* u, const char* w, const char* d)
{
int ret = 0;
fCon = mysql_init(NULL);
if (fCon != NULL)
{
unsigned int tcp_option = MYSQL_PROTOCOL_TCP;
mysql_options(fCon, MYSQL_OPT_PROTOCOL, &tcp_option);
if (mysql_real_connect(fCon, h, u, w, d, p, NULL, 0) == NULL)
{
fErrStr = "fatal error in mysql_real_connect()";
ret = mysql_errno(fCon);
}
else
{
mysql_set_character_set(fCon, "utf8");
}
}
else
{
fErrStr = "fatal error in mysql_init()";
ret = -1;
}
return ret;
}
int LibMySQL::run(const char* query)
{
int ret = 0;
if (mysql_real_query(fCon, query, strlen(query)) != 0)
{
fErrStr = "fatal error reading result from crossengine client lib";
ret = -1;
}
fRes = mysql_use_result(fCon);
if (fRes == NULL)
{
fErrStr = "fatal error reading result from crossengine client lib";
ret = -1;
}
return ret;
}
CrossEngineStep::CrossEngineStep(
const string& schema,
const string& table,
@@ -158,7 +84,7 @@ CrossEngineStep::CrossEngineStep(
fExtendedInfo = "CES: ";
getMysqldInfo(jobInfo);
fQtc.stepParms().stepType = StepTeleStats::T_CES;
mysql = new LibMySQL();
mysql = new utils::LibMySQL();
}
@@ -503,7 +429,7 @@ void CrossEngineStep::execute()
ret = mysql->init(fHost.c_str(), fPort, fUser.c_str(), fPasswd.c_str(), fSchema.c_str());
if (ret != 0)
handleMySqlError(mysql->getError().c_str(), ret);
mysql->handleMySqlError(mysql->getError().c_str(), ret);
string query(makeQuery());
fLogger->logMessage(logging::LOG_TYPE_INFO, "QUERY to foreign engine: " + query);
@@ -514,7 +440,7 @@ void CrossEngineStep::execute()
ret = mysql->run(query.c_str());
if (ret != 0)
handleMySqlError(mysql->getError().c_str(), ret);
mysql->handleMySqlError(mysql->getError().c_str(), ret);
int num_fields = mysql->getFieldCount();
@@ -818,22 +744,6 @@ string CrossEngineStep::makeQuery()
return oss.str();
}
void CrossEngineStep::handleMySqlError(const char* errStr, unsigned int errCode)
{
ostringstream oss;
oss << errStr << "(" << errCode << ")";
if (errCode == (unsigned int) - 1)
oss << "(null pointer)";
else
oss << "(" << errCode << ")";
throw IDBExcept(oss.str(), ERR_CROSS_ENGINE_CONNECT);
return;
}
const RowGroup& CrossEngineStep::getOutputRowGroup() const
{
return fRowGroupOut;
@@ -979,5 +889,3 @@ void CrossEngineStep::formatMiniStats()
}
// vim:ts=4 sw=4:

57
dbcon/joblist/crossenginestep.h
View File

@@ -32,6 +32,11 @@
using namespace std;
// forward reference
namespace utils
{
class LibMySQL;
}
namespace execplan
{
class ParseTree;
@@ -45,55 +50,6 @@ class FuncExp;
namespace joblist
{
class LibMySQL
{
public:
LibMySQL();
~LibMySQL();
// init: host port username passwd db
int init(const char*, unsigned int, const char*, const char*, const char*);
// run the query
int run(const char* q);
int getFieldCount()
{
return mysql_num_fields(fRes);
}
int getRowCount()
{
return mysql_num_rows(fRes);
}
char** nextRow()
{
char** row = mysql_fetch_row(fRes);
fieldLengths = mysql_fetch_lengths(fRes);
fFields = mysql_fetch_fields(fRes);
return row;
}
long getFieldLength(int field)
{
return fieldLengths[field];
}
MYSQL_FIELD* getField(int field)
{
return &fFields[field];
}
const std::string& getError()
{
return fErrStr;
}
private:
MYSQL* fCon;
MYSQL_RES* fRes;
MYSQL_FIELD* fFields;
std::string fErrStr;
unsigned long* fieldLengths;
};
/** @brief class CrossEngineStep
*
*/
@@ -215,7 +171,6 @@ protected:
const char*, const execplan::CalpontSystemCatalog::ColType&, int64_t);
virtual void formatMiniStats();
virtual void printCalTrace();
virtual void handleMySqlError(const char*, unsigned int);
uint64_t fRowsRetrieved;
uint64_t fRowsReturned;
@@ -274,7 +229,7 @@ protected:
rowgroup::RowGroup fRowGroupFe3;
funcexp::FuncExp* fFeInstance;
LibMySQL* mysql;
utils::LibMySQL* mysql;
};