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

MXS-1302: masking filter value replacement is done by new ReplaceRule, derived form base class Rule

Browse Source 
The value replacement is now done by new ReplaceRule, derived form base
class Rule
This commit is contained in:
MassimilianoPinto 2017-07-07 15:02:59 +02:00
parent 54c6e0eb52
commit b26e2d8189
2 changed files with 103 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
server/modules/filter/masking/maskingrules.cc
View File

@ -330,13 +330,13 @@ bool get_accounts(const char* zName,
*
* @return A Rule instance or NULL in case of error.
*/
auto_ptr<MaskingRules::Rule> create_rule_from_elements(json_t* pColumn,
json_t* pTable,
json_t* pDatabase,
json_t* pValue,
json_t* pFill,
json_t* pApplies_to,
json_t* pExempted)
auto_ptr<MaskingRules::ReplaceRule> create_rule_from_elements(json_t* pColumn,
json_t* pTable,
json_t* pDatabase,
json_t* pValue,
json_t* pFill,
json_t* pApplies_to,
json_t* pExempted)
{
ss_dassert(pColumn && json_is_string(pColumn));
ss_dassert(!pTable || json_is_string(pTable));
@ -347,7 +347,7 @@ auto_ptr<MaskingRules::Rule> create_rule_from_elements(json_t* pColumn,
ss_dassert(!pApplies_to || json_is_array(pApplies_to));
ss_dassert(!pExempted || json_is_array(pExempted));
auto_ptr<MaskingRules::Rule> sRule;
auto_ptr<MaskingRules::ReplaceRule> sRule;
string column(json_string_value(pColumn));
string table(pTable ? json_string_value(pTable) : "");
@ -371,9 +371,9 @@ auto_ptr<MaskingRules::Rule> create_rule_from_elements(json_t* pColumn,
if (ok)
{
sRule = auto_ptr<MaskingRules::Rule>(new MaskingRules::Rule(column, table, database,
value, fill,
applies_to, exempted));
sRule = auto_ptr<MaskingRules::ReplaceRule>(new MaskingRules::ReplaceRule(column, table, database,
applies_to, exempted,
value, fill));
}
return sRule;
@ -389,17 +389,17 @@ auto_ptr<MaskingRules::Rule> create_rule_from_elements(json_t* pColumn,
*
* @return A Rule instance or NULL in case of error.
*/
auto_ptr<MaskingRules::Rule> create_rule_from_elements(json_t* pReplace,
json_t* pWith,
json_t* pApplies_to,
json_t* pExempted)
auto_ptr<MaskingRules::ReplaceRule> create_rule_from_elements(json_t* pReplace,
json_t* pWith,
json_t* pApplies_to,
json_t* pExempted)
{
ss_dassert(pReplace && json_is_object(pReplace));
ss_dassert(pWith && json_is_object(pWith));
ss_dassert(!pApplies_to || json_is_array(pApplies_to));
ss_dassert(!pExempted || json_is_array(pExempted));
auto_ptr<MaskingRules::Rule> sRule;
auto_ptr<MaskingRules::ReplaceRule> sRule;
json_t* pDatabase = json_object_get(pReplace, KEY_DATABASE);
json_t* pTable = json_object_get(pReplace, KEY_TABLE);
@ -478,7 +478,7 @@ bool create_rules_from_array(json_t* pRules, vector<shared_ptr<MaskingRules::Rul
if (json_is_object(pRule))
{
auto_ptr<MaskingRules::Rule> sRule = MaskingRules::Rule::create_from(pRule);
auto_ptr<MaskingRules::Rule> sRule = MaskingRules::ReplaceRule::create_from(pRule);
if (sRule.get())
{
@ -550,26 +550,39 @@ MaskingRules::Rule::Account::~Account()
MaskingRules::Rule::Rule(const std::string& column,
const std::string& table,
const std::string& database,
const std::string& value,
const std::string& fill,
const std::vector<SAccount>& applies_to,
const std::vector<SAccount>& exempted)
: m_column(column)
, m_table(table)
, m_database(database)
, m_value(value)
, m_fill(fill)
, m_applies_to(applies_to)
, m_exempted(exempted)
{
}
MaskingRules::ReplaceRule::ReplaceRule(const std::string& column,
const std::string& table,
const std::string& database,
const std::vector<SAccount>& applies_to,
const std::vector<SAccount>& exempted,
const std::string& value,
const std::string& fill)
: MaskingRules::Rule::Rule(column, table, database, applies_to, exempted)
, m_value(value)
, m_fill(fill)
{
}
MaskingRules::Rule::~Rule()
{
}
MaskingRules::ReplaceRule::~ReplaceRule()
{
}
//static
auto_ptr<MaskingRules::Rule> MaskingRules::Rule::create_from(json_t* pRule)
auto_ptr<MaskingRules::Rule> MaskingRules::ReplaceRule::create_from(json_t* pRule)
{
ss_dassert(json_is_object(pRule));
@ -704,7 +717,7 @@ bool MaskingRules::Rule::matches(const ComQueryResponse::ColumnDef& column_def,
return match;
}
void MaskingRules::Rule::rewrite(LEncString& s) const
void MaskingRules::ReplaceRule::rewrite(LEncString& s) const
{
bool rewritten = false;

93
server/modules/filter/masking/maskingrules.hh
View File

@ -67,13 +67,11 @@ public:
typedef std::tr1::shared_ptr<Account> SAccount;
/**
* Constructor
* Constructor of base Rule class
*
* @param column The column value from the json file.
* @param table The table value from the json file.
* @param database The database value from the json file.
* @param value The value value from the json file.
* @param fill The file value from the json file.
* @param applies_to Account instances corresponding to the
* accounts listed in 'applies_to' in the json file.
* @param exempted Account instances corresponding to the
@ -82,8 +80,6 @@ public:
Rule(const std::string& column,
const std::string& table,
const std::string& database,
const std::string& value,
const std::string& fill,
const std::vector<SAccount>& applies_to,
const std::vector<SAccount>& exempted);
~Rule();
@ -102,14 +98,6 @@ public:
{
return m_database;
}
const std::string& value() const
{
return m_value;
}
const std::string& fill() const
{
return m_fill;
}
const std::vector<SAccount>& applies_to() const
{
return m_applies_to;
@ -119,16 +107,6 @@ public:
return m_exempted;
}
/**
* Create a Rule instance
*
* @param pRule A json object corresponding to a single
* rule in the rules json file.
*
* @return A Rule instance or NULL.
*/
static std::auto_ptr<Rule> create_from(json_t* pRule);
/**
* Establish whether a rule matches a column definition and user/host.
*
@ -142,7 +120,12 @@ public:
const char* zUser,
const char* zHost) const;
void rewrite(LEncString& s) const;
/**
* Mask the column content with value or fill.
*
* @param s The current value to be rewritten.
*/
virtual void rewrite(LEncString& s) const = 0;
private:
Rule(const Rule&);
@ -152,12 +135,70 @@ public:
std::string m_column;
std::string m_table;
std::string m_database;
std::string m_value;
std::string m_fill;
std::vector<SAccount> m_applies_to;
std::vector<SAccount> m_exempted;
};
class ReplaceRule : public Rule
{
public:
/**
* Constructor of ReplaceRule
*
* @param column The column value from the json file.
* @param table The table value from the json file.
* @param database The database value from the json file.
* @param applies_to Account instances corresponding to the
* accounts listed in 'applies_to' in the json file.
* @param exempted Account instances corresponding to the
* accounts listed in 'exempted' in the json file.
* @param value The replace value from the json file.
* @param fill The fill value from the json file.
*/
ReplaceRule(const std::string& column,
const std::string& table,
const std::string& database,
const std::vector<SAccount>& applies_to,
const std::vector<SAccount>& exempted,
const std::string& value,
const std::string& fill);
~ReplaceRule();
const std::string& value() const
{
return m_value;
}
const std::string& fill() const
{
return m_fill;
}
/**
* Create a ReplaceRule instance
*
* @param pRule A json object corresponding to a single
* rule in the rules json file.
*
* @return A Rule instance or NULL.
*/
static std::auto_ptr<Rule> create_from(json_t* pRule);
/**
* Rewrite the column value based on rules
*
* @param s The column value to rewrite.
*/
void rewrite(LEncString& s) const;
private:
std::string m_value;
std::string m_fill;
private:
ReplaceRule(const ReplaceRule&);
ReplaceRule& operator = (const ReplaceRule&);
};
~MaskingRules();
/**