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

Use module parameters in maskingfilter

Browse Source 
The maskingfilter still does some processing due to the fact that it
accepts relative pathnames. This should ideally done by the core in a
controlled manner and for all path parameters.
This commit is contained in:
Markus Mäkelä
2017-01-11 09:38:56 +02:00
committed by Johan Wikman
parent 8612561bbd
commit 7ef5e4bfd9
2 changed files with 16 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/modules/filter/masking/maskingfilter.cc
View File

@ -90,6 +90,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
NULL, /* Thread init. */ NULL, /* Thread init. */
NULL, /* Thread finish. */ NULL, /* Thread finish. */
{ {
{"rules_file", MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{MXS_END_MODULE_PARAMS} {MXS_END_MODULE_PARAMS}
} }
}; };
@ -118,15 +119,13 @@ MaskingFilter* MaskingFilter::create(const char* zName, char** pzOptions, CONFIG
MaskingFilter* pFilter = NULL; MaskingFilter* pFilter = NULL;
MaskingFilter::Config config(zName); MaskingFilter::Config config(zName);
if (process_params(pzOptions, ppParams, config)) process_params(pzOptions, ppParams, config);
{
auto_ptr<MaskingRules> sRules = MaskingRules::load(config.rules_file().c_str()); auto_ptr<MaskingRules> sRules = MaskingRules::load(config.rules_file().c_str());
if (sRules.get()) if (sRules.get())
{ {
pFilter = new MaskingFilter(config, sRules); pFilter = new MaskingFilter(config, sRules);
} }
}
return pFilter; return pFilter;
} }
@ -172,45 +171,18 @@ void MaskingFilter::reload(DCB* pOut)
} }
// static // static
bool MaskingFilter::process_params(char **pzOptions, CONFIG_PARAMETER *pParams, Config& config) void MaskingFilter::process_params(char **pzOptions, CONFIG_PARAMETER *pParams, Config& config)
{ {
bool error = false; const char *value = config_get_string(pParams, "rules_file");
for (const CONFIG_PARAMETER* pParam = pParams; pParam; pParam = pParam->next)
{
if (strcmp(pParam->name, "rules_file") == 0)
{
string rules_file; string rules_file;
if (*pParam->value != '/') if (*value != '/')
{ {
// A relative path is interpreted relative to the data directory. // A relative path is interpreted relative to the data directory.
rules_file += get_datadir(); rules_file += get_datadir();
rules_file += "/"; rules_file += "/";
} }
rules_file += pParam->value; rules_file += value;
config.set_rules_file(rules_file); config.set_rules_file(rules_file);
}
else if (!filter_standard_parameter(pParam->name))
{
MXS_ERROR("Unknown configuration entry '%s'.", pParam->name);
error = true;
}
}
if (!error)
{
if (config.rules_file().empty())
{
MXS_ERROR("In order to use the masking filter, the location of the rules file "
"must be specified. Add a configuration entry 'rules_file=...' in "
"the section [%s], in the MariaDB MaxScale configuration file.",
config.name().c_str());
error = true;
}
}
return !error;
} }

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

@ -47,7 +47,7 @@ private:
MaskingFilter(const MaskingFilter&); MaskingFilter(const MaskingFilter&);
MaskingFilter& operator = (const MaskingFilter&); MaskingFilter& operator = (const MaskingFilter&);
static bool process_params(char **pzOptions, CONFIG_PARAMETER *ppParams, Config& config); static void process_params(char **pzOptions, CONFIG_PARAMETER *ppParams, Config& config);
private: private:
Config m_config; Config m_config;