hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2396 Cleanup conceptually

Browse Source
This commit is contained in:
Johan Wikman
2019-03-20 11:08:09 +02:00
parent 7bb3cc6535
commit eb0f3ebe81
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/modules/filter/masking/maskingfiltersession.cc
View File

@ -71,9 +71,22 @@ bool MaskingFilterSession::check_query(GWBUF* pPacket)
{ {
bool rv = true; bool rv = true;
const char* zUser = session_get_user(m_pSession);
const char* zHost = session_get_remote(m_pSession);
if (!zUser)
{
zUser = "";
}
if (!zHost)
{
zHost = "";
}
if (m_filter.config().prevent_function_usage()) if (m_filter.config().prevent_function_usage())
{ {
if (reject_if_function_used(pPacket)) if (is_function_used(pPacket, zUser, zHost))
{ {
rv = false; rv = false;
} }
@ -483,25 +496,12 @@ void MaskingFilterSession::mask_values(ComPacket& response)
} }
} }
bool MaskingFilterSession::reject_if_function_used(GWBUF* pPacket) bool MaskingFilterSession::is_function_used(GWBUF* pPacket, const char* zUser, const char* zHost)
{ {
bool rejected = false; bool is_used = false;
SMaskingRules sRules = m_filter.rules(); SMaskingRules sRules = m_filter.rules();
const char* zUser = session_get_user(m_pSession);
const char* zHost = session_get_remote(m_pSession);
if (!zUser)
{
zUser = "";
}
if (!zHost)
{
zHost = "";
}
auto pred1 = [&sRules, zUser, zHost](const QC_FIELD_INFO& field_info) { auto pred1 = [&sRules, zUser, zHost](const QC_FIELD_INFO& field_info) {
const MaskingRules::Rule* pRule = sRules->get_rule_for(field_info, zUser, zHost); const MaskingRules::Rule* pRule = sRules->get_rule_for(field_info, zUser, zHost);
@ -535,8 +535,8 @@ bool MaskingFilterSession::reject_if_function_used(GWBUF* pPacket)
set_response(create_error_response(ss.str().c_str())); set_response(create_error_response(ss.str().c_str()));
rejected = true; is_used = true;
} }
return rejected; return is_used;
} }

2
server/modules/filter/masking/maskingfiltersession.hh
View File

@ -65,7 +65,7 @@ private:
void mask_values(ComPacket& response); void mask_values(ComPacket& response);
bool reject_if_function_used(GWBUF* pPacket); bool is_function_used(GWBUF* pPacket, const char* zUser, const char* zHost);
private: private:
typedef std::shared_ptr<MaskingRules> SMaskingRules; typedef std::shared_ptr<MaskingRules> SMaskingRules;