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

Use module parameters in regexfilter and tee

Browse Source 
The regexfilter and tee now use the module parameters.
This commit is contained in:
Markus Mäkelä
2017-01-09 08:41:09 +02:00
parent 92386922a9
commit e6b7035766
2 changed files with 63 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
server/modules/filter/regexfilter/regexfilter.c
View File

@ -82,6 +82,13 @@ typedef struct
void log_match(REGEX_INSTANCE* inst, char* re, char* old, char* new); void log_match(REGEX_INSTANCE* inst, char* re, char* old, char* new);
void log_nomatch(REGEX_INSTANCE* inst, char* re, char* old); void log_nomatch(REGEX_INSTANCE* inst, char* re, char* old);
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", PCRE2_CASELESS},
{"case", 0},
{NULL}
};
/** /**
* The module entry point routine. It is this routine that * The module entry point routine. It is this routine that
* must populate the structure that is referred to as the * must populate the structure that is referred to as the
@ -120,6 +127,13 @@ MXS_MODULE* MXS_CREATE_MODULE()
NULL, /* Thread init. */ NULL, /* Thread init. */
NULL, /* Thread finish. */ NULL, /* Thread finish. */
{ {
{"match", MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{"replace", MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{"source", MXS_MODULE_PARAM_STRING},
{"user", MXS_MODULE_PARAM_STRING},
{"log_trace", MXS_MODULE_PARAM_BOOL, "false"},
{"log_file", MXS_MODULE_PARAM_STRING},
{"option", MXS_MODULE_PARAM_ENUM, "ignorecase", MXS_MODULE_OPT_NONE, option_values},
{MXS_END_MODULE_PARAMS} {MXS_END_MODULE_PARAMS}
} }
}; };
@ -166,93 +180,34 @@ void free_instance(REGEX_INSTANCE *instance)
static FILTER * static FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params) createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
{ {
REGEX_INSTANCE *my_instance; REGEX_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(REGEX_INSTANCE));
int i, errnumber, cflags = PCRE2_CASELESS;
PCRE2_SIZE erroffset;
char *logfile = NULL;
const char *errmsg;
if ((my_instance = MXS_CALLOC(1, sizeof(REGEX_INSTANCE))) != NULL) if (my_instance)
{ {
my_instance->match = NULL; my_instance->match = MXS_STRDUP_A(config_get_string(params, "match"));
my_instance->replace = NULL; my_instance->replace = MXS_STRDUP_A(config_get_string(params, "replace"));
my_instance->source = config_copy_string(params, "source");
my_instance->user = config_copy_string(params, "user");
my_instance->log_trace = config_get_bool(params, "log_trace");
for (const CONFIG_PARAMETER *p = params; p; p = p->next) const char *logfile = config_get_string(params, "log_file");
{
if (!strcmp(p->name, "match"))
{
my_instance->match = MXS_STRDUP_A(p->value);
}
else if (!strcmp(p->name, "replace"))
{
my_instance->replace = MXS_STRDUP_A(p->value);
}
else if (!strcmp(p->name, "source"))
{
my_instance->source = MXS_STRDUP_A(p->value);
}
else if (!strcmp(p->name, "user"))
{
my_instance->user = MXS_STRDUP_A(p->value);
}
else if (!strcmp(p->name, "log_trace"))
{
my_instance->log_trace = config_truth_value(p->value);
}
else if (!strcmp(p->name, "log_file"))
{
if (logfile)
{
MXS_FREE(logfile);
}
logfile = MXS_STRDUP_A(p->value);
}
else if (!filter_standard_parameter(p->name))
{
MXS_ERROR("regexfilter: Unexpected parameter '%s'.", p->name);
}
}
if (options) if (*logfile)
{
for (i = 0; options[i]; i++)
{
if (!strcasecmp(options[i], "ignorecase"))
{
cflags |= PCRE2_CASELESS;
}
else if (!strcasecmp(options[i], "case"))
{
cflags &= ~PCRE2_CASELESS;
}
else
{
MXS_ERROR("regexfilter: unsupported option '%s'.",
options[i]);
}
}
}
if (logfile != NULL)
{ {
if ((my_instance->logfile = fopen(logfile, "a")) == NULL) if ((my_instance->logfile = fopen(logfile, "a")) == NULL)
{ {
MXS_ERROR("regexfilter: Failed to open file '%s'.", logfile); MXS_ERROR("regexfilter: Failed to open file '%s'.", logfile);
free_instance(my_instance); free_instance(my_instance);
MXS_FREE(logfile);
return NULL; return NULL;
} }
fprintf(my_instance->logfile, "\nOpened regex filter log\n"); fprintf(my_instance->logfile, "\nOpened regex filter log\n");
fflush(my_instance->logfile); fflush(my_instance->logfile);
} }
MXS_FREE(logfile);
if (my_instance->match == NULL || my_instance->replace == NULL) int errnumber;
{ PCRE2_SIZE erroffset;
free_instance(my_instance); int cflags = config_get_enum(params, "options", option_values);
return NULL;
}
if ((my_instance->re = pcre2_compile((PCRE2_SPTR) my_instance->match, if ((my_instance->re = pcre2_compile((PCRE2_SPTR) my_instance->match,
PCRE2_ZERO_TERMINATED, PCRE2_ZERO_TERMINATED,
@ -278,6 +233,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
return NULL; return NULL;
} }
} }
return (FILTER *) my_instance; return (FILTER *) my_instance;
} }

124
server/modules/filter/tee/tee.c
View File

@ -281,6 +281,14 @@ orphan_free(void* data)
#endif #endif
} }
static const MXS_ENUM_VALUE option_values[] =
{
{"ignorecase", REG_ICASE},
{"case", 0},
{"extended", REG_EXTENDED},
{NULL}
};
/** /**
* The module entry point routine. It is this routine that * The module entry point routine. It is this routine that
* must populate the structure that is referred to as the * must populate the structure that is referred to as the
@ -324,6 +332,18 @@ MXS_MODULE* MXS_CREATE_MODULE()
NULL, /* Thread init. */ NULL, /* Thread init. */
NULL, /* Thread finish. */ NULL, /* Thread finish. */
{ {
{"service", MXS_MODULE_PARAM_SERVICE, NULL, MXS_MODULE_OPT_REQUIRED},
{"match", MXS_MODULE_PARAM_STRING},
{"exclude", MXS_MODULE_PARAM_STRING},
{"source", MXS_MODULE_PARAM_STRING},
{"user", MXS_MODULE_PARAM_STRING},
{
"options",
MXS_MODULE_PARAM_ENUM,
"ignorecase",
MXS_MODULE_OPT_NONE,
option_values
},
{MXS_END_MODULE_PARAMS} {MXS_END_MODULE_PARAMS}
} }
}; };
@ -344,107 +364,33 @@ MXS_MODULE* MXS_CREATE_MODULE()
static FILTER * static FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params) createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
{ {
TEE_INSTANCE *my_instance; TEE_INSTANCE *my_instance = MXS_CALLOC(1, sizeof(TEE_INSTANCE));
int i;
if ((my_instance = MXS_CALLOC(1, sizeof(TEE_INSTANCE))) != NULL) if (my_instance)
{ {
if (options) my_instance->service = config_get_service(params, "service");
{ my_instance->source = config_copy_string(params, "source");
MXS_ERROR("tee: The tee filter has been passed an option, " my_instance->userName = config_copy_string(params, "user");
"this filter does not support any options."); my_instance->match = config_copy_string(params, "match");
} my_instance->nomatch = config_copy_string(params, "exclude");
my_instance->service = NULL;
my_instance->source = NULL;
my_instance->userName = NULL;
my_instance->match = NULL;
my_instance->nomatch = NULL;
if (params)
{
for (const CONFIG_PARAMETER *p = params; p; p = p->next)
{
if (!strcmp(p->name, "service"))
{
if ((my_instance->service = service_find(p->value)) == NULL)
{
MXS_ERROR("tee: service '%s' not found.\n",
p->value);
}
}
else if (!strcmp(p->name, "match"))
{
my_instance->match = MXS_STRDUP_A(p->value);
}
else if (!strcmp(p->name, "exclude"))
{
my_instance->nomatch = MXS_STRDUP_A(p->value);
}
else if (!strcmp(p->name, "source"))
{
my_instance->source = MXS_STRDUP_A(p->value);
}
else if (!strcmp(p->name, "user"))
{
my_instance->userName = MXS_STRDUP_A(p->value);
}
else if (!filter_standard_parameter(p->name))
{
MXS_ERROR("tee: Unexpected parameter '%s'.", p->name);
}
}
}
int cflags = REG_ICASE; int cflags = config_get_enum(params, "options", option_values);
if (options) if (my_instance->match && regcomp(&my_instance->re, my_instance->match, cflags))
{ {
for (i = 0; options[i]; i++) MXS_ERROR("tee: Invalid regular expression '%s' for the match parameter.",
{
if (!strcasecmp(options[i], "ignorecase"))
{
cflags |= REG_ICASE;
}
else if (!strcasecmp(options[i], "case"))
{
cflags &= ~REG_ICASE;
}
else if (!strcasecmp(options[i], "extended"))
{
cflags |= REG_EXTENDED;
}
else
{
MXS_ERROR("tee: unsupported option '%s'.",
options[i]);
}
}
}
if (my_instance->service == NULL)
{
MXS_FREE(my_instance->match);
MXS_FREE(my_instance->source);
MXS_FREE(my_instance);
return NULL;
}
if (my_instance->match &&
regcomp(&my_instance->re, my_instance->match, cflags))
{
MXS_ERROR("tee: Invalid regular expression '%s'"
" for the match parameter.",
my_instance->match); my_instance->match);
MXS_FREE(my_instance->match); MXS_FREE(my_instance->match);
MXS_FREE(my_instance->nomatch); MXS_FREE(my_instance->nomatch);
MXS_FREE(my_instance->source); MXS_FREE(my_instance->source);
MXS_FREE(my_instance->userName);
MXS_FREE(my_instance); MXS_FREE(my_instance);
return NULL; return NULL;
} }
if (my_instance->nomatch &&
regcomp(&my_instance->nore, my_instance->nomatch, cflags)) if (my_instance->nomatch && regcomp(&my_instance->nore, my_instance->nomatch, cflags))
{ {
MXS_ERROR("tee: Invalid regular expression '%s'" MXS_ERROR("tee: Invalid regular expression '%s' for the nomatch paramter.",
" for the nomatch paramter.\n",
my_instance->nomatch); my_instance->nomatch);
if (my_instance->match) if (my_instance->match)
{ {
@ -453,10 +399,12 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
} }
MXS_FREE(my_instance->nomatch); MXS_FREE(my_instance->nomatch);
MXS_FREE(my_instance->source); MXS_FREE(my_instance->source);
MXS_FREE(my_instance->userName);
MXS_FREE(my_instance); MXS_FREE(my_instance);
return NULL; return NULL;
} }
} }
return (FILTER *) my_instance; return (FILTER *) my_instance;
} }