Merge branch 'develop' into MAX-324
This commit is contained in:
Markus Makela
commit
705328012c
@ -28,6 +28,10 @@ add_library(fwfilter SHARED fwfilter.c)
|
|||||||
target_link_libraries(fwfilter log_manager utils query_classifier)
|
target_link_libraries(fwfilter log_manager utils query_classifier)
|
||||||
install(TARGETS fwfilter DESTINATION modules)
|
install(TARGETS fwfilter DESTINATION modules)
|
||||||
|
|
||||||
|
add_library(namedserverfilter SHARED namedserverfilter.c)
|
||||||
|
target_link_libraries(namedserverfilter log_manager utils)
|
||||||
|
install(TARGETS namedserverfilter DESTINATION modules)
|
||||||
|
|
||||||
|
|
||||||
add_subdirectory(hint)
|
add_subdirectory(hint)
|
||||||
|
|
||||||
|
|||||||
381
server/modules/filter/namedserverfilter.c
Normal file
381
server/modules/filter/namedserverfilter.c
Normal file
@ -0,0 +1,381 @@
|
|||||||
|
/*
|
||||||
|
* This file is distributed as part of MaxScale by MariaDB Corporation. It is free
|
||||||
|
* software: you can redistribute it and/or modify it under the terms of the
|
||||||
|
* GNU General Public License as published by the Free Software Foundation,
|
||||||
|
* version 2.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
|
* details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with
|
||||||
|
* this program; if not, write to the Free Software Foundation, Inc., 51
|
||||||
|
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Copyright MariaDB Corporation Ab 2014
|
||||||
|
*/
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <filter.h>
|
||||||
|
#include <modinfo.h>
|
||||||
|
#include <modutil.h>
|
||||||
|
#include <skygw_utils.h>
|
||||||
|
#include <log_manager.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <regex.h>
|
||||||
|
#include <hint.h>
|
||||||
|
|
||||||
|
/** Defined in log_manager.cc */
|
||||||
|
extern int lm_enabled_logfiles_bitmask;
|
||||||
|
extern size_t log_ses_count[];
|
||||||
|
extern __thread log_info_t tls_log_info;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file namedserverfilter.c - a very simple regular expression based filter
|
||||||
|
* that routes to a named server if a regular expression match is found.
|
||||||
|
* @verbatim
|
||||||
|
*
|
||||||
|
* A simple regular expression query rewrite filter.
|
||||||
|
* Two parameters should be defined in the filter configuration
|
||||||
|
* match=<regular expression>
|
||||||
|
* server=<server to route statement to>
|
||||||
|
* Two optional parameters
|
||||||
|
* source=<source address to limit filter>
|
||||||
|
* user=<username to limit filter>
|
||||||
|
*
|
||||||
|
* Date Who Description
|
||||||
|
* 22/01/2015 Mark Riddoch Written as example based on regex filter
|
||||||
|
* @endverbatim
|
||||||
|
*/
|
||||||
|
|
||||||
|
MODULE_INFO info = {
|
||||||
|
MODULE_API_FILTER,
|
||||||
|
MODULE_GA,
|
||||||
|
FILTER_VERSION,
|
||||||
|
"A routing hint filter that uses regular expressions to direct queries"
|
||||||
|
};
|
||||||
|
|
||||||
|
static char *version_str = "V1.1.0";
|
||||||
|
|
||||||
|
static FILTER *createInstance(char **options, FILTER_PARAMETER **params);
|
||||||
|
static void *newSession(FILTER *instance, SESSION *session);
|
||||||
|
static void closeSession(FILTER *instance, void *session);
|
||||||
|
static void freeSession(FILTER *instance, void *session);
|
||||||
|
static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream);
|
||||||
|
static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue);
|
||||||
|
static void diagnostic(FILTER *instance, void *fsession, DCB *dcb);
|
||||||
|
|
||||||
|
|
||||||
|
static FILTER_OBJECT MyObject = {
|
||||||
|
createInstance,
|
||||||
|
newSession,
|
||||||
|
closeSession,
|
||||||
|
freeSession,
|
||||||
|
setDownstream,
|
||||||
|
NULL, // No Upstream requirement
|
||||||
|
routeQuery,
|
||||||
|
NULL,
|
||||||
|
diagnostic,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instance structure
|
||||||
|
*/
|
||||||
|
typedef struct {
|
||||||
|
char *source; /* Source address to restrict matches */
|
||||||
|
char *user; /* User name to restrict matches */
|
||||||
|
char *match; /* Regular expression to match */
|
||||||
|
char *server; /* Server to route to */
|
||||||
|
int cflags; /* Regexec compile flags */
|
||||||
|
regex_t re; /* Compiled regex text */
|
||||||
|
} REGEXHINT_INSTANCE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The session structuee for this regex filter
|
||||||
|
*/
|
||||||
|
typedef struct {
|
||||||
|
DOWNSTREAM down; /* The downstream filter */
|
||||||
|
int n_diverted; /* No. of statements diverted */
|
||||||
|
int n_undiverted; /* No. of statements not diverted */
|
||||||
|
int active; /* Is filter active */
|
||||||
|
} REGEXHINT_SESSION;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of the mandatory version entry point
|
||||||
|
*
|
||||||
|
* @return version string of the module
|
||||||
|
*/
|
||||||
|
char *
|
||||||
|
version()
|
||||||
|
{
|
||||||
|
return version_str;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The module initialisation routine, called when the module
|
||||||
|
* is first loaded.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
ModuleInit()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The module entry point routine. It is this routine that
|
||||||
|
* must populate the structure that is referred to as the
|
||||||
|
* "module object", this is a structure with the set of
|
||||||
|
* external entry points for this module.
|
||||||
|
*
|
||||||
|
* @return The module object
|
||||||
|
*/
|
||||||
|
FILTER_OBJECT *
|
||||||
|
GetModuleObject()
|
||||||
|
{
|
||||||
|
return &MyObject;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create an instance of the filter for a particular service
|
||||||
|
* within MaxScale.
|
||||||
|
*
|
||||||
|
* @param options The options for this filter
|
||||||
|
* @param params The array of name/value pair parameters for the filter
|
||||||
|
*
|
||||||
|
* @return The instance data for this new instance
|
||||||
|
*/
|
||||||
|
static FILTER *
|
||||||
|
createInstance(char **options, FILTER_PARAMETER **params)
|
||||||
|
{
|
||||||
|
REGEXHINT_INSTANCE *my_instance;
|
||||||
|
int i, cflags = REG_ICASE;
|
||||||
|
|
||||||
|
if ((my_instance = calloc(1, sizeof(REGEXHINT_INSTANCE))) != NULL)
|
||||||
|
{
|
||||||
|
my_instance->match = NULL;
|
||||||
|
my_instance->server = NULL;
|
||||||
|
|
||||||
|
for (i = 0; params && params[i]; i++)
|
||||||
|
{
|
||||||
|
if (!strcmp(params[i]->name, "match"))
|
||||||
|
my_instance->match = strdup(params[i]->value);
|
||||||
|
else if (!strcmp(params[i]->name, "server"))
|
||||||
|
my_instance->server = strdup(params[i]->value);
|
||||||
|
else if (!strcmp(params[i]->name, "source"))
|
||||||
|
my_instance->source = strdup(params[i]->value);
|
||||||
|
else if (!strcmp(params[i]->name, "user"))
|
||||||
|
my_instance->user = strdup(params[i]->value);
|
||||||
|
else if (!filter_standard_parameter(params[i]->name))
|
||||||
|
{
|
||||||
|
LOGIF(LE, (skygw_log_write_flush(
|
||||||
|
LOGFILE_ERROR,
|
||||||
|
"namedserverfilter: Unexpected parameter '%s'.\n",
|
||||||
|
params[i]->name)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options)
|
||||||
|
{
|
||||||
|
for (i = 0; options[i]; i++)
|
||||||
|
{
|
||||||
|
if (!strcasecmp(options[i], "ignorecase"))
|
||||||
|
{
|
||||||
|
cflags |= REG_ICASE;
|
||||||
|
}
|
||||||
|
else if (!strcasecmp(options[i], "case"))
|
||||||
|
{
|
||||||
|
cflags &= ~REG_ICASE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOGIF(LE, (skygw_log_write_flush(
|
||||||
|
LOGFILE_ERROR,
|
||||||
|
"namedserverfilter: unsupported option '%s'.\n",
|
||||||
|
options[i])));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
my_instance->cflags = cflags;
|
||||||
|
|
||||||
|
if (my_instance->match == NULL || my_instance->server == NULL)
|
||||||
|
{
|
||||||
|
LOGIF(LE, (skygw_log_write_flush(
|
||||||
|
LOGFILE_ERROR,
|
||||||
|
"namedserverfilter: Missing required configured"
|
||||||
|
" option. You must specify a match and server "
|
||||||
|
"option as a minimum.")));
|
||||||
|
free(my_instance);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (regcomp(&my_instance->re, my_instance->match,
|
||||||
|
my_instance->cflags))
|
||||||
|
{
|
||||||
|
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
|
||||||
|
"namedserverfilter: Invalid regular expression '%s'.\n",
|
||||||
|
my_instance->match)));
|
||||||
|
free(my_instance->match);
|
||||||
|
free(my_instance->server);
|
||||||
|
free(my_instance);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (FILTER *)my_instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Associate a new session with this instance of the filter.
|
||||||
|
*
|
||||||
|
* @param instance The filter instance data
|
||||||
|
* @param session The session itself
|
||||||
|
* @return Session specific data for this session
|
||||||
|
*/
|
||||||
|
static void *
|
||||||
|
newSession(FILTER *instance, SESSION *session)
|
||||||
|
{
|
||||||
|
REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE *)instance;
|
||||||
|
REGEXHINT_SESSION *my_session;
|
||||||
|
char *remote, *user;
|
||||||
|
|
||||||
|
if ((my_session = calloc(1, sizeof(REGEXHINT_SESSION))) != NULL)
|
||||||
|
{
|
||||||
|
my_session->n_diverted = 0;
|
||||||
|
my_session->n_undiverted = 0;
|
||||||
|
my_session->active = 1;
|
||||||
|
if (my_instance->source
|
||||||
|
&& (remote = session_get_remote(session)) != NULL)
|
||||||
|
{
|
||||||
|
if (strcmp(remote, my_instance->source))
|
||||||
|
my_session->active = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (my_instance->user && (user = session_getUser(session))
|
||||||
|
&& strcmp(user, my_instance->user))
|
||||||
|
{
|
||||||
|
my_session->active = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return my_session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Close a session with the filter, this is the mechanism
|
||||||
|
* by which a filter may cleanup data structure etc.
|
||||||
|
*
|
||||||
|
* @param instance The filter instance data
|
||||||
|
* @param session The session being closed
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
closeSession(FILTER *instance, void *session)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Free the memory associated with this filter session.
|
||||||
|
*
|
||||||
|
* @param instance The filter instance data
|
||||||
|
* @param session The session being closed
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
freeSession(FILTER *instance, void *session)
|
||||||
|
{
|
||||||
|
free(session);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the downstream component for this filter.
|
||||||
|
*
|
||||||
|
* @param instance The filter instance data
|
||||||
|
* @param session The session being closed
|
||||||
|
* @param downstream The downstream filter or router
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream)
|
||||||
|
{
|
||||||
|
REGEXHINT_SESSION *my_session = (REGEXHINT_SESSION *)session;
|
||||||
|
|
||||||
|
my_session->down = *downstream;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The routeQuery entry point. This is passed the query buffer
|
||||||
|
* to which the filter should be applied. Once applied the
|
||||||
|
* query should normally be passed to the downstream component
|
||||||
|
* (filter or router) in the filter chain.
|
||||||
|
*
|
||||||
|
* If the regular expressed configured in the match parameter of the
|
||||||
|
* filter definition matches the SQL text then add the hint
|
||||||
|
* "Route to named server" with the name defined in the server parameter
|
||||||
|
*
|
||||||
|
* @param instance The filter instance data
|
||||||
|
* @param session The filter session
|
||||||
|
* @param queue The query data
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
routeQuery(FILTER *instance, void *session, GWBUF *queue)
|
||||||
|
{
|
||||||
|
REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE *)instance;
|
||||||
|
REGEXHINT_SESSION *my_session = (REGEXHINT_SESSION *)session;
|
||||||
|
char *sql;
|
||||||
|
|
||||||
|
if (modutil_is_SQL(queue))
|
||||||
|
{
|
||||||
|
if (queue->next != NULL)
|
||||||
|
{
|
||||||
|
queue = gwbuf_make_contiguous(queue);
|
||||||
|
}
|
||||||
|
if ((sql = modutil_get_SQL(queue)) != NULL)
|
||||||
|
{
|
||||||
|
if (regexec(&my_instance->re,sql,0,NULL, 0) == 0)
|
||||||
|
{
|
||||||
|
queue->hint = hint_create_route(queue->hint,
|
||||||
|
HINT_ROUTE_TO_NAMED_SERVER,
|
||||||
|
my_instance->server);
|
||||||
|
my_session->n_diverted++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
my_session->n_undiverted++;
|
||||||
|
free(sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
return my_session->down.routeQuery(my_session->down.instance,
|
||||||
|
my_session->down.session, queue);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Diagnostics routine
|
||||||
|
*
|
||||||
|
* If fsession is NULL then print diagnostics on the filter
|
||||||
|
* instance as a whole, otherwise print diagnostics for the
|
||||||
|
* particular session.
|
||||||
|
*
|
||||||
|
* @param instance The filter instance
|
||||||
|
* @param fsession Filter session, may be NULL
|
||||||
|
* @param dcb The DCB for diagnostic output
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
diagnostic(FILTER *instance, void *fsession, DCB *dcb)
|
||||||
|
{
|
||||||
|
REGEXHINT_INSTANCE *my_instance = (REGEXHINT_INSTANCE *)instance;
|
||||||
|
REGEXHINT_SESSION *my_session = (REGEXHINT_SESSION *)fsession;
|
||||||
|
|
||||||
|
dcb_printf(dcb, "\t\tMatch and route: /%s/ -> %s\n",
|
||||||
|
my_instance->match, my_instance->server);
|
||||||
|
if (my_session)
|
||||||
|
{
|
||||||
|
dcb_printf(dcb, "\t\tNo. of queries diverted by filter: %d\n",
|
||||||
|
my_session->n_diverted);
|
||||||
|
dcb_printf(dcb, "\t\tNo. of queries not diverted by filter: %d\n",
|
||||||
|
my_session->n_undiverted);
|
||||||
|
}
|
||||||
|
if (my_instance->source)
|
||||||
|
dcb_printf(dcb,
|
||||||
|
"\t\tReplacement limited to connections from %s\n",
|
||||||
|
my_instance->source);
|
||||||
|
if (my_instance->user)
|
||||||
|
dcb_printf(dcb,
|
||||||
|
"\t\tReplacement limit to user %s\n",
|
||||||
|
my_instance->user);
|
||||||
|
}
|
||||||
@ -16,9 +16,6 @@
|
|||||||
* Copyright MariaDB Corporation Ab 2014
|
* Copyright MariaDB Corporation Ab 2014
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "spinlock.h"
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file tee.c A filter that splits the processing pipeline in two
|
* @file tee.c A filter that splits the processing pipeline in two
|
||||||
* @verbatim
|
* @verbatim
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user