From 663b3baddce648e320657b0443aaf2629e9be98d Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 21 Nov 2013 15:45:27 +0000 Subject: [PATCH] Remove legacy stuff. --- src/cfg_file.h | 32 -- src/cfg_file.l | 232 ---------- src/cfg_file.y | 1147 ----------------------------------------------- src/cfg_utils.c | 221 --------- src/main.c | 38 +- 5 files changed, 1 insertion(+), 1669 deletions(-) delete mode 100644 src/cfg_file.l delete mode 100644 src/cfg_file.y diff --git a/src/cfg_file.h b/src/cfg_file.h index f2744cb2c..d53829675 100644 --- a/src/cfg_file.h +++ b/src/cfg_file.h @@ -235,19 +235,6 @@ struct classifier_config { GList *post_callbacks; /**< list of callbacks that are called after classification */ }; -/** - * Config option for importing to script module - */ -struct config_scalar { - void *pointer; /**< pointer to data */ - enum { - SCALAR_TYPE_INT, - SCALAR_TYPE_UINT, - SCALAR_TYPE_STR, - SCALAR_TYPE_SIZE - } type; /**< type of data */ -}; - struct rspamd_worker_bind_conf { gchar *bind_host; guint16 bind_port; @@ -351,7 +338,6 @@ struct config_file { struct rspamd_worker_cfg_parser *wrk_parsers; /**< hash for worker config parsers, indexed by worker quarks */ gchar *filters_str; /**< string of filters */ ucl_object_t *rcl_obj; /**< rcl object */ - GHashTable* variables; /**< hash of $variables defined in config, indexed by variable name */ GHashTable* metrics; /**< hash of metrics indexed by metric name */ GList* symbols_groups; /**< groups of symbols */ GList* metrics_list; /**< linked list of metrics */ @@ -460,14 +446,6 @@ ucl_object_t* get_module_opt (struct config_file *cfg, const gchar *module_name, */ guint64 parse_limit (const gchar *limit, guint len); -/** - * Parse time - * @param t string representation of seconds (eg. 1D) - * @param default_type dimension of time if no suffix is specified - * @return value of time in milliseconds - */ -gdouble cfg_parse_time (const gchar *t, enum time_type default_type); - /** * Parse flag * @param str string representation of flag (eg. 'on') @@ -475,16 +453,6 @@ gdouble cfg_parse_time (const gchar *t, enum time_type default_type); */ gchar parse_flag (const gchar *str); -/** - * Substitutes variable in specified string, may be recursive (eg. ${var1${var2}}) - * @param cfg config file - * @param name variable's name - * @param str incoming string - * @param recursive whether do recursive scanning - * @return new string with substituted variables (uses cfg memory pool for allocating) - */ -gchar* substitute_variable (struct config_file *cfg, gchar *name, gchar *str, guchar recursive); - /** * Do post load actions for config * @param cfg config file diff --git a/src/cfg_file.l b/src/cfg_file.l deleted file mode 100644 index 542488e2f..000000000 --- a/src/cfg_file.l +++ /dev/null @@ -1,232 +0,0 @@ -%x incl -%x module_lex_state -%x worker_lex_state -%x classifier_lex_state - -%{ - -#define NO_GMIME -#include "config.h" -#include "cfg_file.h" -#include "cfg_yacc.h" - -#define ECHO do {} while(0) - -#define MAX_INCLUDE_DEPTH 10 -YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH]; -int line_stack[MAX_INCLUDE_DEPTH]; -int include_stack_ptr = 0; -int nested_depth = 0; -extern struct config_file *yacc_cfg; - -%} - -%option noyywrap -%option yylineno - -%% -[ \t]*#.* /* ignore comments */; -.include BEGIN(incl); -.module BEGIN(module_lex_state); -worker BEGIN(worker_lex_state); return WORKER; -composites BEGIN(module_lex_state);return COMPOSITES; -tempdir return TEMPDIR; -pidfile return PIDFILE; - -view return VIEW; -ip return IP; -client_ip return CLIENT_IP; -from return FROM; -symbols return SYMBOLS; -skip_check return SKIP_CHECK; - -error_time return ERROR_TIME; -dead_time return DEAD_TIME; -maxerrors return MAXERRORS; -reconnect_timeout return RECONNECT_TIMEOUT; -connect_timeout return CONNECT_TIMEOUT; -protocol return PROTOCOL; -memcached return MEMCACHED; -servers return SERVERS; - -modules return MODULES; -module_path return MODULE_PATH; - -settings return SETTINGS; -user_settings return USER_SETTINGS; -domain_settings return DOMAIN_SETTINGS; - -maxfiles return MAXFILES; -maxcore return MAXCORE; - -filters return FILTERS; -factors return FACTORS; -grow_factor return GROW_FACTOR; -metric return METRIC; -name return NAME; -required_score return REQUIRED_SCORE; -reject_score return REJECT_SCORE; -function return FUNCTION; -cache_file return CACHE_FILE; -control return CONTROL; -password return PASSWORD; -lmtp return LMTP; -raw_mode return RAW_MODE; -enabled return ENABLED; -delivery return DELIVERY; -agent return AGENT; - -classifier BEGIN(classifier_lex_state); return CLASSIFIER; - -logging return LOGGING; - -log_type return LOG_TYPE; -console return LOG_TYPE_CONSOLE; -syslog return LOG_TYPE_SYSLOG; -file return LOG_TYPE_FILE; -log_urls return LOG_URLS; - -log_level return LOG_LEVEL; -DEBUG return LOG_LEVEL_DEBUG; -INFO return LOG_LEVEL_INFO; -WARNING return LOG_LEVEL_WARNING; -ERROR return LOG_LEVEL_ERROR; -log_facility return LOG_FACILITY; -log_file return LOG_FILENAME; -log_buffer return LOG_BUFFER; -debug_ip return DEBUG_IP; -profile_file return PROFILE_FILE; - -statfile_pool_size return STATFILE_POOL_SIZE; - -\{ return OBRACE; -\} return EBRACE; -; return SEMICOLON; -, return COMMA; -= return EQSIGN; -yes|YES|no|NO|[yY]|[nN] yylval.flag=parse_flag(yytext); return FLAG; -\n /* ignore EOL */; -[ \t]+ /* ignore whitespace */; -\".+[^\\]\" yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; unescape_quotes(yylval.string); return QUOTEDSTRING; -\" return QUOTE; -\$[a-zA-Z_][a-zA-Z0-9_]+ yylval.string=strdup(yytext + 1); return VARIABLE; -[0-9]+ yylval.number=strtol(yytext, NULL, 10); return NUMBER; --?[0-9]+\.?[0-9]* yylval.fract=strtod(yytext, NULL); return FRACT; -[0-9]+[kKmMgG]? yylval.limit=parse_limit(yytext); return SIZELIMIT; -[0-9]+[mMsShHdD]? yylval.seconds=parse_seconds(yytext); return SECONDS; -[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} yylval.string=strdup(yytext); return IPADDR; -[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\/[0-9]{1,2} yylval.string=strdup(yytext); return IPNETWORK; -[*a-zA-Z0-9.-]+:[0-9]{1,5} yylval.string=strdup(yytext); return HOSTPORT; -[a-zA-Z<][a-zA-Z@+>_-]* yylval.string=strdup(yytext); return STRING; -\/[^/\n]+\/ yylval.string=strdup(yytext); return REGEXP; -[a-zA-Z0-9].[a-zA-Z0-9\/.-]+ yylval.string=strdup(yytext); return DOMAINNAME; -[ \t]* /* eat the whitespace */ -[^ \t\n]+ { /* got the include file name */ - /* got the include file name */ - /* Handle XML case */ - int len = strlen (yytext); - if (strcmp (yytext + len - 4, ".xml") == 0) { - if (!read_xml_config (yacc_cfg, yytext)) { - yyerror ("invalid xml detected"); - } - BEGIN(INITIAL); - } - if ( include_stack_ptr >= MAX_INCLUDE_DEPTH ) { - yyerror ("yylex: includes nested too deeply" ); - return -1; - } - - line_stack[include_stack_ptr] = yylineno; - include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER; - - yylineno = 1; - yyin = fopen (yytext, "r"); - - if (!yyin) { - yyerror ("yylex: cannot open include file"); - return -1; - } - - yy_switch_to_buffer (yy_create_buffer (yyin, YY_BUF_SIZE)); - - BEGIN(INITIAL); -} - -<> { - if ( --include_stack_ptr < 0 ) { - include_stack_ptr = 0; - yylineno = 1; - yyterminate (); - } - else { - yy_delete_buffer (YY_CURRENT_BUFFER); - yy_switch_to_buffer (include_stack[include_stack_ptr] ); - yylineno = line_stack[include_stack_ptr]; - } -} - -\n /* ignore EOL */; -[ \t]+ /* ignore whitespace */; -[ \t]*#.* /* ignore comments */; -\'[a-zA-Z0-9_-]+\' yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; return MODULE_OPT; -\{ nested_depth ++; return OBRACE; -\} if (--nested_depth == 0) { BEGIN(INITIAL); } return EBRACE; -\; return SEMICOLON; -= return EQSIGN; -\$[a-zA-Z_][a-zA-Z0-9_]+ yylval.string=strdup(yytext + 1); return VARIABLE; -[a-zA-Z0-9_%-]+ yylval.string=strdup(yytext); return PARAM; -\".+[^\\]\" yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; unescape_quotes(yylval.string); return QUOTEDSTRING; - -\n /* ignore EOL */; -[ \t]+ /* ignore whitespace */; -[ \t]*#.* /* ignore comments */; -\{ nested_depth ++; return OBRACE; -\} if (--nested_depth == 0) { BEGIN(INITIAL); } return EBRACE; -\; return SEMICOLON; -= return EQSIGN; -type return TYPE; -bind_socket return BINDSOCK; -count return COUNT; -[0-9]+ yylval.number=strtol(yytext, NULL, 10); return NUMBER; -[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} yylval.string=strdup(yytext); return IPADDR; -[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\/[0-9]{1,2} yylval.string=strdup(yytext); return IPNETWORK; -[*a-zA-Z0-9.-]+:[0-9]{1,5} yylval.string=strdup(yytext); return HOSTPORT; -[a-zA-Z<][a-zA-Z@+>_-]* yylval.string=strdup(yytext); return STRING; -\$[a-zA-Z_][a-zA-Z0-9_]+ yylval.string=strdup(yytext + 1); return VARIABLE; -\".+[^\\]\" yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; unescape_quotes(yylval.string); return QUOTEDSTRING; - -\n /* ignore EOL */; -[ \t]+ /* ignore whitespace */; -[ \t]*#.* /* ignore comments */; -\{ nested_depth ++; return OBRACE; -\} if (--nested_depth == 0) { BEGIN(INITIAL); } return EBRACE; -\; return SEMICOLON; -= return EQSIGN; -type return TYPE; -bind_socket return BINDSOCK; -count return COUNT; -statfile return STATFILE; -symbol return SYMBOL; -path return PATH; -size return SIZE; -tokenizer return TOKENIZER; -section return SECTION; -autolearn return AUTOLEARN; -min_mark return MIN_MARK; -max_mark return MAX_MARK; -binlog return BINLOG; -binlog_master return BINLOG_MASTER; -binlog_rotate return BINLOG_ROTATE; -normalizer return NORMALIZER; -[0-9]+ yylval.number=strtol(yytext, NULL, 10); return NUMBER; --?[0-9]+\.?[0-9]* yylval.fract=strtod(yytext, NULL); return FRACT; -[0-9]+[kKmMgG]? yylval.limit=parse_limit(yytext); return SIZELIMIT; -[0-9]+[mMsShHdD]? yylval.seconds=parse_seconds(yytext); return SECONDS; -\$[a-zA-Z_][a-zA-Z0-9_]+ yylval.string=strdup(yytext + 1); return VARIABLE; -[a-zA-Z0-9_%-]+ yylval.string=strdup(yytext); return PARAM; -\".+[^\\]\" yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; unescape_quotes(yylval.string); return QUOTEDSTRING; - -%% -/* - * vi:ts=4 - */ diff --git a/src/cfg_file.y b/src/cfg_file.y deleted file mode 100644 index 13902c6ae..000000000 --- a/src/cfg_file.y +++ /dev/null @@ -1,1147 +0,0 @@ -/* $Id$ */ - -%{ - -#include "config.h" -#include "cfg_file.h" -#include "main.h" -#include "expressions.h" -#include "classifiers/classifiers.h" -#include "tokenizers/tokenizers.h" -#include "view.h" -#include "settings.h" -#ifdef WITH_LUA -#include "lua/lua_common.h" -#else -#include "perl.h" -#endif -#define YYDEBUG 1 - -extern struct config_file *yacc_cfg; -extern int yylineno; -extern char *yytext; - -GList *cur_module_opt = NULL; -struct metric *cur_metric = NULL; -struct classifier_config *cur_classifier = NULL; -struct statfile *cur_statfile = NULL; -struct statfile_section *cur_section = NULL; -struct statfile_autolearn_params *cur_autolearn = NULL; -struct worker_conf *cur_worker = NULL; - -struct rspamd_view *cur_view = NULL; - -%} - -%union -{ - char *string; - size_t limit; - gboolean flag; - unsigned int seconds; - unsigned int number; - double fract; -} - -%token ERROR STRING QUOTEDSTRING FLAG -%token FILENAME REGEXP QUOTE SEMICOLON OBRACE EBRACE COMMA EQSIGN -%token BINDSOCK SOCKCRED DOMAINNAME IPADDR IPNETWORK HOSTPORT NUMBER CHECK_TIMEOUT -%token MAXSIZE SIZELIMIT SECONDS BEANSTALK MYSQL USER PASSWORD DATABASE -%token TEMPDIR PIDFILE SERVERS ERROR_TIME DEAD_TIME MAXERRORS CONNECT_TIMEOUT PROTOCOL RECONNECT_TIMEOUT -%token READ_SERVERS WRITE_SERVER DIRECTORY_SERVERS MAILBOX_QUERY USERS_QUERY LASTLOGIN_QUERY -%token MEMCACHED WORKER TYPE MODULES MODULE_PATH -%token MODULE_OPT PARAM VARIABLE -%token FILTERS FACTORS METRIC NAME CACHE_FILE -%token REQUIRED_SCORE REJECT_SCORE FUNCTION FRACT COMPOSITES CONTROL PASSWORD -%token LOGGING LOG_TYPE LOG_TYPE_CONSOLE LOG_TYPE_SYSLOG LOG_TYPE_FILE -%token LOG_LEVEL LOG_LEVEL_DEBUG LOG_LEVEL_INFO LOG_LEVEL_WARNING LOG_LEVEL_ERROR LOG_FACILITY LOG_FILENAME LOG_URLS -%token STATFILE ALIAS PATTERN WEIGHT STATFILE_POOL_SIZE SIZE TOKENIZER CLASSIFIER BINLOG BINLOG_MASTER BINLOG_ROTATE -%token DELIVERY LMTP ENABLED AGENT SECTION LUACODE RAW_MODE PROFILE_FILE COUNT -%token VIEW IP FROM SYMBOLS CLIENT_IP -%token AUTOLEARN MIN_MARK MAX_MARK MAXFILES MAXCORE -%token SETTINGS USER_SETTINGS DOMAIN_SETTINGS SYMBOL PATH SKIP_CHECK GROW_FACTOR -%token LOG_BUFFER DEBUG_IP NORMALIZER HEADER_ONLY - -%type STRING -%type VARIABLE -%type QUOTEDSTRING MODULE_OPT PARAM -%type FILENAME -%type SOCKCRED -%type IPADDR IPNETWORK -%type HOSTPORT -%type DOMAINNAME -%type SIZELIMIT -%type FLAG -%type SECONDS -%type NUMBER -%type memcached_hosts bind_cred -%type FRACT -%% - -file : /* empty */ - | file command SEMICOLON { } - ; - -command : - | tempdir - | pidfile - | memcached - | worker - | modules - | filters - | module_opt - | variable - | factors - | metric - | composites - | logging - | classifier - | statfile_pool_size - | luacode - | raw_mode - | profile_file - | view - | settings - ; - -tempdir : - TEMPDIR EQSIGN QUOTEDSTRING { - struct stat st; - - if (stat ($3, &st) == -1) { - yyerror ("yyparse: cannot stat directory \"%s\": %s", $3, strerror (errno)); - YYERROR; - } - if (!S_ISDIR (st.st_mode)) { - yyerror ("yyparse: \"%s\" is not a directory", $3); - YYERROR; - } - yacc_cfg->temp_dir = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - free ($3); - } - ; - -pidfile : - PIDFILE EQSIGN QUOTEDSTRING { - if (yacc_cfg->pid_file == NULL) { - /* Allow override this value from command line */ - yacc_cfg->pid_file = $3; - } - } - ; - - -filters: - FILTERS EQSIGN QUOTEDSTRING { - yacc_cfg->filters_str = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - free ($3); - } - ; - -memcached: - MEMCACHED OBRACE memcachedbody EBRACE - ; - -memcachedbody: - memcachedcmd SEMICOLON - | memcachedbody memcachedcmd SEMICOLON - ; - -memcachedcmd: - memcached_servers - | memcached_connect_timeout - | memcached_error_time - | memcached_dead_time - | memcached_maxerrors - | memcached_protocol - ; - -memcached_servers: - SERVERS EQSIGN memcached_server - ; - -memcached_server: - memcached_params - | memcached_server COMMA memcached_params - ; - -memcached_params: - memcached_hosts { - if (!add_memcached_server (yacc_cfg, $1)) { - yyerror ("yyparse: add_memcached_server"); - YYERROR; - } - free ($1); - } - ; -memcached_hosts: - STRING - | IPADDR - | DOMAINNAME - | HOSTPORT - ; -memcached_error_time: - ERROR_TIME EQSIGN NUMBER { - yacc_cfg->memcached_error_time = $3; - } - ; -memcached_dead_time: - DEAD_TIME EQSIGN NUMBER { - yacc_cfg->memcached_dead_time = $3; - } - ; -memcached_maxerrors: - MAXERRORS EQSIGN NUMBER { - yacc_cfg->memcached_maxerrors = $3; - } - ; -memcached_connect_timeout: - CONNECT_TIMEOUT EQSIGN SECONDS { - yacc_cfg->memcached_connect_timeout = $3; - } - ; - -memcached_protocol: - PROTOCOL EQSIGN STRING { - if (strncasecmp ($3, "udp", sizeof ("udp") - 1) == 0) { - yacc_cfg->memcached_protocol = UDP_TEXT; - } - else if (strncasecmp ($3, "tcp", sizeof ("tcp") - 1) == 0) { - yacc_cfg->memcached_protocol = TCP_TEXT; - } - else { - yyerror ("yyparse: cannot recognize protocol: %s", $3); - YYERROR; - } - } - ; - -/* Workers section */ -worker: - WORKER OBRACE workerbody EBRACE { - yacc_cfg->workers = g_list_prepend (yacc_cfg->workers, cur_worker); - cur_worker = NULL; - } - ; - -workerbody: - workercmd SEMICOLON - | workerbody workercmd SEMICOLON - ; - -workercmd: - | bindsock - | workertype - | workercount - | workerlimitfiles - | workerlimitcore - | workerparam - ; - -bindsock: - BINDSOCK EQSIGN bind_cred { - cur_worker = check_worker_conf (yacc_cfg, cur_worker); - - if (!parse_bind_line (yacc_cfg, cur_worker, $3)) { - yyerror ("yyparse: parse_bind_line"); - YYERROR; - } - free ($3); - } - ; - -bind_cred: - STRING { - $$ = $1; - } - | IPADDR{ - $$ = $1; - } - | DOMAINNAME { - $$ = $1; - } - | HOSTPORT { - $$ = $1; - } - | QUOTEDSTRING { - $$ = $1; - } - ; - -workertype: - TYPE EQSIGN QUOTEDSTRING { - cur_worker = check_worker_conf (yacc_cfg, cur_worker); - if (g_ascii_strcasecmp ($3, "normal") == 0) { - cur_worker->type = TYPE_WORKER; - cur_worker->has_socket = TRUE; - } - else if (g_ascii_strcasecmp ($3, "controller") == 0) { - cur_worker->type = TYPE_CONTROLLER; - cur_worker->has_socket = TRUE; - } - else if (g_ascii_strcasecmp ($3, "lmtp") == 0) { - cur_worker->type = TYPE_LMTP; - cur_worker->has_socket = TRUE; - } - else if (g_ascii_strcasecmp ($3, "fuzzy") == 0) { - cur_worker->type = TYPE_FUZZY; - cur_worker->has_socket = FALSE; - } - else { - yyerror ("yyparse: unknown worker type: %s", $3); - YYERROR; - } - } - ; - -workercount: - COUNT EQSIGN NUMBER { - cur_worker = check_worker_conf (yacc_cfg, cur_worker); - - if ($3 > 0) { - cur_worker->count = $3; - } - else { - yyerror ("yyparse: invalid number of workers: %d", $3); - YYERROR; - } - } - ; - -workerlimitfiles: - MAXFILES EQSIGN NUMBER { - cur_worker = check_worker_conf (yacc_cfg, cur_worker); - cur_worker->rlimit_nofile = $3; - } - ; - -workerlimitcore: - MAXCORE EQSIGN NUMBER { - cur_worker = check_worker_conf (yacc_cfg, cur_worker); - cur_worker->rlimit_maxcore = $3; - } - ; - -workerparam: - STRING EQSIGN QUOTEDSTRING { - cur_worker = check_worker_conf (yacc_cfg, cur_worker); - - g_hash_table_insert (cur_worker->params, $1, $3); - } - -metric: - METRIC OBRACE metricbody EBRACE { - if (cur_metric == NULL || cur_metric->name == NULL) { - yyerror ("yyparse: not enough arguments in metric definition"); - YYERROR; - } - if (cur_metric->classifier == NULL) { - cur_metric->classifier = get_classifier ("winnow"); - } - g_hash_table_insert (yacc_cfg->metrics, cur_metric->name, cur_metric); - yacc_cfg->metrics_list = g_list_prepend (yacc_cfg->metrics_list, cur_metric); - cur_metric = NULL; - } - ; - -metricbody: - | metriccmd SEMICOLON - | metricbody metriccmd SEMICOLON - ; -metriccmd: - | metricname - | metricfunction - | metricscore - | metricrjscore - | metriccache - ; - -metricname: - NAME EQSIGN QUOTEDSTRING { - if (cur_metric == NULL) { - cur_metric = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct metric)); - } - cur_metric->name = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - } - ; - -metricfunction: - FUNCTION EQSIGN QUOTEDSTRING { - if (cur_metric == NULL) { - cur_metric = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct metric)); - } - cur_metric->func_name = memory_pool_strdup (yacc_cfg->cfg_pool, $3); -#ifdef WITH_LUA - cur_metric->func = lua_consolidation_func; -#elif !defined(WITHOUT_PERL) - cur_metric->func = perl_consolidation_func; -#else - yyerror ("yyparse: rspamd is not compiled with perl or lua, so it is not possible to use custom consolidation functions"); -#endif - } - ; - -metricscore: - REQUIRED_SCORE EQSIGN NUMBER { - if (cur_metric == NULL) { - cur_metric = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct metric)); - } - cur_metric->required_score = $3; - } - | REQUIRED_SCORE EQSIGN FRACT { - if (cur_metric == NULL) { - cur_metric = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct metric)); - } - cur_metric->required_score = $3; - } - ; - -metricrjscore: - REJECT_SCORE EQSIGN NUMBER { - if (cur_metric == NULL) { - cur_metric = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct metric)); - } - cur_metric->reject_score = $3; - } - | REJECT_SCORE EQSIGN FRACT { - if (cur_metric == NULL) { - cur_metric = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct metric)); - } - cur_metric->reject_score = $3; - } - ; - -metriccache: - CACHE_FILE EQSIGN QUOTEDSTRING { - if (cur_metric == NULL) { - cur_metric = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct metric)); - } - cur_metric->cache_filename = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - } - ; - -factors: - FACTORS OBRACE factorsbody EBRACE - ; - -factorsbody: - factorparam SEMICOLON - | factorsbody factorparam SEMICOLON - ; - -factorparam: - QUOTEDSTRING EQSIGN FRACT { - double *tmp = memory_pool_alloc (yacc_cfg->cfg_pool, sizeof (double)); - *tmp = $3; - g_hash_table_insert (yacc_cfg->factors, $1, tmp); - } - | QUOTEDSTRING EQSIGN NUMBER { - double *tmp = memory_pool_alloc (yacc_cfg->cfg_pool, sizeof (double)); - *tmp = $3; - g_hash_table_insert (yacc_cfg->factors, $1, tmp); - } - | GROW_FACTOR EQSIGN FRACT { - yacc_cfg->grow_factor = $3; - } - | GROW_FACTOR EQSIGN NUMBER { - yacc_cfg->grow_factor = $3; - } - -modules: - MODULES OBRACE modulesbody EBRACE - ; - -modulesbody: - modulescmd SEMICOLON - | modulesbody modulescmd SEMICOLON - ; - -modulescmd: - MODULE_PATH EQSIGN QUOTEDSTRING { - struct stat st; - struct script_module *cur; - glob_t globbuf; - char *pattern; - size_t len; - int i; - - if (stat ($3, &st) == -1) { - yyerror ("yyparse: cannot stat path %s, %s", $3, strerror (errno)); - YYERROR; - } - - globbuf.gl_offs = 0; - len = strlen ($3) + sizeof ("*.lua"); - pattern = g_malloc (len); - snprintf (pattern, len, "%s%s", $3, "*.lua"); - - if (glob(pattern, GLOB_DOOFFS, NULL, &globbuf) == 0) { - for (i = 0; i < globbuf.gl_pathc; i ++) { - cur = memory_pool_alloc (yacc_cfg->cfg_pool, sizeof (struct script_module)); - if (cur == NULL) { - yyerror ("yyparse: g_malloc: %s", strerror(errno)); - YYERROR; - } - cur->path = memory_pool_strdup (yacc_cfg->cfg_pool, globbuf.gl_pathv[i]); - yacc_cfg->script_modules = g_list_prepend (yacc_cfg->script_modules, cur); - } - globfree (&globbuf); - } - else { - yyerror ("yyparse: glob: %s", strerror (errno)); - YYERROR; - } - g_free (pattern); - } - ; - -composites: - COMPOSITES OBRACE compositesbody EBRACE - ; - -compositesbody: - compositescmd SEMICOLON - | compositesbody compositescmd SEMICOLON - ; - -compositescmd: - PARAM EQSIGN QUOTEDSTRING { - struct expression *expr; - if ((expr = parse_expression (yacc_cfg->cfg_pool, $3)) == NULL) { - yyerror ("yyparse: cannot parse composite expression: %s", $3); - YYERROR; - } - g_hash_table_insert (yacc_cfg->composite_symbols, $1, expr); - } - ; -module_opt: - MODULE_OPT OBRACE moduleoptbody EBRACE { - g_hash_table_insert (yacc_cfg->modules_opts, $1, cur_module_opt); - cur_module_opt = NULL; - } - ; - -moduleoptbody: - optcmd SEMICOLON - | moduleoptbody optcmd SEMICOLON - ; - -optcmd: - PARAM EQSIGN QUOTEDSTRING { - struct module_opt *mopt; - mopt = memory_pool_alloc (yacc_cfg->cfg_pool, sizeof (struct module_opt)); - mopt->param = $1; - mopt->value = $3; - cur_module_opt = g_list_prepend (cur_module_opt, mopt); - } - | VARIABLE EQSIGN QUOTEDSTRING { - g_hash_table_insert (yacc_cfg->variables, $1, $3); - } - ; - -variable: - VARIABLE EQSIGN QUOTEDSTRING { - g_hash_table_insert (yacc_cfg->variables, $1, $3); - } - ; - -logging: - LOGGING OBRACE loggingbody EBRACE - ; - -loggingbody: - loggingcmd SEMICOLON - | loggingbody loggingcmd SEMICOLON - ; - -loggingcmd: - loggingtype - | logginglevel - | loggingfacility - | loggingfile - | loggingurls - | loggingbuffer - | loggingdebugip - ; - -loggingtype: - LOG_TYPE EQSIGN LOG_TYPE_CONSOLE { - yacc_cfg->log_type = RSPAMD_LOG_CONSOLE; - } - | LOG_TYPE EQSIGN LOG_TYPE_SYSLOG { - yacc_cfg->log_type = RSPAMD_LOG_SYSLOG; - } - | LOG_TYPE EQSIGN LOG_TYPE_FILE { - yacc_cfg->log_type = RSPAMD_LOG_FILE; - } - ; - -logginglevel: - LOG_LEVEL EQSIGN LOG_LEVEL_DEBUG { - yacc_cfg->log_level = G_LOG_LEVEL_DEBUG; - } - | LOG_LEVEL EQSIGN LOG_LEVEL_INFO { - yacc_cfg->log_level = G_LOG_LEVEL_INFO | G_LOG_LEVEL_MESSAGE; - } - | LOG_LEVEL EQSIGN LOG_LEVEL_WARNING { - yacc_cfg->log_level = G_LOG_LEVEL_WARNING; - } - | LOG_LEVEL EQSIGN LOG_LEVEL_ERROR { - yacc_cfg->log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL; - } - ; - -loggingfacility: - LOG_FACILITY EQSIGN QUOTEDSTRING { - if (strncasecmp ($3, "LOG_AUTH", sizeof ("LOG_AUTH") - 1) == 0) { - yacc_cfg->log_facility = LOG_AUTH; - } - else if (strncasecmp ($3, "LOG_CRON", sizeof ("LOG_CRON") - 1) == 0) { - yacc_cfg->log_facility = LOG_CRON; - } - else if (strncasecmp ($3, "LOG_DAEMON", sizeof ("LOG_DAEMON") - 1) == 0) { - yacc_cfg->log_facility = LOG_DAEMON; - } - else if (strncasecmp ($3, "LOG_MAIL", sizeof ("LOG_MAIL") - 1) == 0) { - yacc_cfg->log_facility = LOG_MAIL; - } - else if (strncasecmp ($3, "LOG_USER", sizeof ("LOG_USER") - 1) == 0) { - yacc_cfg->log_facility = LOG_USER; - } - else if (strncasecmp ($3, "LOG_LOCAL0", sizeof ("LOG_LOCAL0") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL0; - } - else if (strncasecmp ($3, "LOG_LOCAL1", sizeof ("LOG_LOCAL1") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL1; - } - else if (strncasecmp ($3, "LOG_LOCAL2", sizeof ("LOG_LOCAL2") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL2; - } - else if (strncasecmp ($3, "LOG_LOCAL3", sizeof ("LOG_LOCAL3") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL3; - } - else if (strncasecmp ($3, "LOG_LOCAL4", sizeof ("LOG_LOCAL4") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL4; - } - else if (strncasecmp ($3, "LOG_LOCAL5", sizeof ("LOG_LOCAL5") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL5; - } - else if (strncasecmp ($3, "LOG_LOCAL6", sizeof ("LOG_LOCAL6") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL6; - } - else if (strncasecmp ($3, "LOG_LOCAL7", sizeof ("LOG_LOCAL7") - 1) == 0) { - yacc_cfg->log_facility = LOG_LOCAL7; - } - else { - yyerror ("yyparse: invalid logging facility: %s", $3); - YYERROR; - } - - free ($3); - } - ; - -loggingfile: - LOG_FILENAME EQSIGN QUOTEDSTRING { - yacc_cfg->log_file = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - - free ($3); - } - ; - -loggingurls: - LOG_URLS EQSIGN FLAG { - if ($3 != 0) { - yacc_cfg->log_urls = TRUE; - } - } - ; - -loggingbuffer: - LOG_BUFFER EQSIGN NUMBER - | LOG_BUFFER EQSIGN SIZELIMIT { - yacc_cfg->log_buf_size = $3; - yacc_cfg->log_buffered = TRUE; - } - ; - -loggingdebugip: - DEBUG_IP EQSIGN QUOTEDSTRING { - yacc_cfg->debug_ip_map = $3; - } - ; - -classifier: - CLASSIFIER OBRACE classifierbody EBRACE { - if (cur_classifier == NULL || cur_classifier->classifier == NULL) { - yyerror ("yyparse: invalid classifier definition"); - YYERROR; - } - if (cur_classifier->metric == NULL) { - cur_classifier->metric = DEFAULT_METRIC; - } - if (cur_classifier->tokenizer == NULL) { - cur_classifier->tokenizer = get_tokenizer ("osb-text"); - } - - yacc_cfg->classifiers = g_list_prepend (yacc_cfg->classifiers, cur_classifier); - cur_classifier = NULL; - } - ; - -classifierbody: - | classifiercmd SEMICOLON - | classifierbody classifiercmd SEMICOLON - ; - -classifiercmd: - | statfile - | classifiertype - | classifiermetric - | classifiertokenizer - | classifieroption - ; - -classifiertype: - TYPE EQSIGN QUOTEDSTRING { - cur_classifier = check_classifier_cfg (yacc_cfg, cur_classifier); - if ((cur_classifier->classifier = get_classifier ($3)) == NULL) { - yyerror ("yyparse: unknown classifier type: %s", $3); - YYERROR; - } - } - ; -classifiertokenizer: - TOKENIZER EQSIGN QUOTEDSTRING { - cur_classifier = check_classifier_cfg (yacc_cfg, cur_classifier); - if ((cur_classifier->tokenizer = get_tokenizer ($3)) == NULL) { - yyerror ("yyparse: unknown tokenizer %s", $3); - YYERROR; - } - } - ; - -classifiermetric: - METRIC EQSIGN QUOTEDSTRING { - cur_classifier = check_classifier_cfg (yacc_cfg, cur_classifier); - cur_classifier->metric = $3; - memory_pool_add_destructor (yacc_cfg->cfg_pool, g_free, cur_classifier->metric); - } - ; - -classifieroption: - PARAM EQSIGN QUOTEDSTRING { - cur_classifier = check_classifier_cfg (yacc_cfg, cur_classifier); - g_hash_table_insert (cur_classifier->opts, $1, $3); - memory_pool_add_destructor (yacc_cfg->cfg_pool, g_free, $1); - memory_pool_add_destructor (yacc_cfg->cfg_pool, g_free, $3); - }; - -statfile: - STATFILE OBRACE statfilebody EBRACE { - if (cur_statfile == NULL || cur_statfile->path == NULL || cur_statfile->size == 0) { - yyerror ("yyparse: not enough arguments in statfile definition"); - YYERROR; - } - cur_classifier = check_classifier_cfg (yacc_cfg, cur_classifier); - cur_classifier->statfiles = g_list_prepend (cur_classifier->statfiles, cur_statfile); - yacc_cfg->statfiles = g_list_prepend (yacc_cfg->statfiles, cur_statfile); - cur_statfile = NULL; - } - ; - -statfilebody: - | statfilecmd SEMICOLON - | statfilebody statfilecmd SEMICOLON - ; - -statfilecmd: - | statfilesymbol - | statfilepath - | statfilesize - | statfilesection - | statfileautolearn - | statfilebinlog - | statfilebinlogrotate - | statfilebinlogmaster - | statfilenormalizer - ; - -statfilesymbol: - SYMBOL EQSIGN QUOTEDSTRING { - cur_classifier = check_classifier_cfg (yacc_cfg, cur_classifier); - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - cur_statfile->symbol = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - g_hash_table_insert (yacc_cfg->classifiers_symbols, $3, cur_classifier); - } - ; - -statfilepath: - PATH EQSIGN QUOTEDSTRING { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - cur_statfile->path = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - } - ; - - -statfilesize: - SIZE EQSIGN NUMBER { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - cur_statfile->size = $3; - } - | SIZE EQSIGN SIZELIMIT { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - cur_statfile->size = $3; - } - ; - - - -statfilesection: - SECTION OBRACE sectionbody EBRACE { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - if (cur_section == NULL || cur_section->code == 0) { - yyerror ("yyparse: error in section definition"); - YYERROR; - } - cur_statfile->sections = g_list_prepend (cur_statfile->sections, cur_section); - cur_section = NULL; - } - ; - -sectionbody: - sectioncmd SEMICOLON - | sectionbody sectioncmd SEMICOLON - ; - -sectioncmd: - sectionname - | sectionsize - | sectionweight - ; - -sectionname: - NAME EQSIGN QUOTEDSTRING { - if (cur_section == NULL) { - cur_section = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_section)); - } - cur_section->code = statfile_get_section_by_name ($3); - } - ; - -sectionsize: - SIZE EQSIGN NUMBER { - if (cur_section == NULL) { - cur_section = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_section)); - } - cur_section->size = $3; - } - | SIZE EQSIGN SIZELIMIT { - if (cur_section == NULL) { - cur_section = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_section)); - } - cur_section->size = $3; - } - ; - -sectionweight: - WEIGHT EQSIGN NUMBER { - if (cur_section == NULL) { - cur_section = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_section)); - } - cur_section->weight = $3; - } - | WEIGHT EQSIGN FRACT { - if (cur_section == NULL) { - cur_section = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_section)); - } - cur_section->weight = $3; - } - ; - -statfileautolearn: - AUTOLEARN OBRACE autolearnbody EBRACE { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - if (cur_autolearn == NULL) { - yyerror ("yyparse: error in autolearn definition"); - YYERROR; - } - cur_statfile->autolearn = cur_autolearn; - cur_autolearn = NULL; - } - ; - -autolearnbody: - autolearncmd SEMICOLON - | autolearnbody autolearncmd SEMICOLON - ; - -autolearncmd: - autolearnmetric - | autolearnmin - | autolearnmax - | autolearnsymbols - ; - -autolearnmetric: - METRIC EQSIGN QUOTEDSTRING { - if (cur_autolearn == NULL) { - cur_autolearn = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_autolearn_params)); - } - cur_autolearn->metric = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - } - ; - -autolearnmin: - MIN_MARK EQSIGN NUMBER { - if (cur_autolearn == NULL) { - cur_autolearn = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_autolearn_params)); - } - cur_autolearn->threshold_min = $3; - } - | MIN_MARK EQSIGN FRACT { - if (cur_autolearn == NULL) { - cur_autolearn = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_autolearn_params)); - } - cur_autolearn->threshold_min = $3; - } - ; - -autolearnmax: - MAX_MARK EQSIGN NUMBER { - if (cur_autolearn == NULL) { - cur_autolearn = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_autolearn_params)); - } - cur_autolearn->threshold_max = $3; - } - | MAX_MARK EQSIGN FRACT { - if (cur_autolearn == NULL) { - cur_autolearn = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_autolearn_params)); - } - cur_autolearn->threshold_max = $3; - } - ; - -autolearnsymbols: - SYMBOLS EQSIGN QUOTEDSTRING { - if (cur_autolearn == NULL) { - cur_autolearn = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_autolearn_params)); - } - cur_autolearn->symbols = parse_comma_list (yacc_cfg->cfg_pool, $3); - } - ; - -statfilebinlog: - BINLOG EQSIGN QUOTEDSTRING { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - if (cur_statfile->binlog == NULL) { - cur_statfile->binlog = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_binlog_params)); - } - if (g_ascii_strcasecmp ($3, "master") == 0) { - cur_statfile->binlog->affinity = AFFINITY_MASTER; - } - else if (g_ascii_strcasecmp ($3, "slave") == 0) { - cur_statfile->binlog->affinity = AFFINITY_SLAVE; - } - else { - cur_statfile->binlog->affinity = AFFINITY_NONE; - } - } - ; - -statfilebinlogrotate: - BINLOG_ROTATE EQSIGN QUOTEDSTRING { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - if (cur_statfile->binlog == NULL) { - cur_statfile->binlog = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_binlog_params)); - } - cur_statfile->binlog->rotate_time = parse_seconds ($3); - } - ; - -statfilebinlogmaster: - BINLOG_MASTER EQSIGN QUOTEDSTRING { - if (cur_statfile == NULL) { - cur_statfile = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile)); - } - if (cur_statfile->binlog == NULL) { - cur_statfile->binlog = memory_pool_alloc0 (yacc_cfg->cfg_pool, sizeof (struct statfile_binlog_params)); - } - if (!parse_host_port ($3, &cur_statfile->binlog->master_addr, &cur_statfile->binlog->master_port)) { - YYERROR; - } - } - ; - -statfilenormalizer: - NORMALIZER EQSIGN QUOTEDSTRING { - if (!parse_normalizer (yacc_cfg, cur_statfile, $3)) { - yyerror ("cannot parse normalizer string: %s", $3); - YYERROR; - } - cur_statfile->normalizer_str = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - } - ; - - -statfile_pool_size: - STATFILE_POOL_SIZE EQSIGN SIZELIMIT { - yacc_cfg->max_statfile_size = $3; - } - | STATFILE_POOL_SIZE EQSIGN NUMBER { - yacc_cfg->max_statfile_size = $3; - } - ; - - -luacode: - LUACODE - ; - -raw_mode: - RAW_MODE EQSIGN FLAG { - yacc_cfg->raw_mode = $3; - } - ; - -profile_file: - PROFILE_FILE EQSIGN QUOTEDSTRING { -#ifdef WITH_GPREF_TOOLS - yacc_cfg->profile_path = $3; -#else - yywarn ("yyparse: profile_file directive is ignored as gperf support is not enabled"); -#endif - } - ; - -view: - VIEW OBRACE viewbody EBRACE { - if (cur_view == NULL) { - yyerror ("yyparse: not enough arguments in view definition"); - YYERROR; - } - yacc_cfg->views = g_list_prepend (yacc_cfg->views, cur_view); - cur_view = NULL; - } - ; - -viewbody: - | viewcmd SEMICOLON - | viewbody viewcmd SEMICOLON - ; - -viewcmd: - | viewip - | viewclientip - | viewfrom - | viewsymbols - | viewskipcheck - ; - -viewip: - IP EQSIGN QUOTEDSTRING { - if (cur_view == NULL) { - cur_view = init_view (yacc_cfg->cfg_pool); - } - if (!add_view_ip (cur_view, $3)) { - yyerror ("yyparse: invalid ip line in view definition: ip = '%s'", $3); - YYERROR; - } - } - ; - -viewclientip: - CLIENT_IP EQSIGN QUOTEDSTRING { - if (cur_view == NULL) { - cur_view = init_view (yacc_cfg->cfg_pool); - } - if (!add_view_client_ip (cur_view, $3)) { - yyerror ("yyparse: invalid ip line in view definition: ip = '%s'", $3); - YYERROR; - } - } - ; - -viewfrom: - FROM EQSIGN QUOTEDSTRING { - if (cur_view == NULL) { - cur_view = init_view (yacc_cfg->cfg_pool); - } - if (!add_view_from (cur_view, $3)) { - yyerror ("yyparse: invalid from line in view definition: from = '%s'", $3); - YYERROR; - } - } - ; -viewsymbols: - SYMBOLS EQSIGN QUOTEDSTRING { - if (cur_view == NULL) { - cur_view = init_view (yacc_cfg->cfg_pool); - } - if (!add_view_symbols (cur_view, $3)) { - yyerror ("yyparse: invalid symbols line in view definition: symbols = '%s'", $3); - YYERROR; - } - } - ; -viewskipcheck: - SKIP_CHECK EQSIGN FLAG { - if (cur_view == NULL) { - cur_view = init_view (yacc_cfg->cfg_pool); - } - cur_view->skip_check = $3; - } - ; - -settings: - SETTINGS OBRACE settingsbody EBRACE - ; - -settingsbody: - | settingscmd SEMICOLON - | settingsbody settingscmd SEMICOLON - ; - -settingscmd: - | usersettings - | domainsettings - ; - -usersettings: - USER_SETTINGS EQSIGN QUOTEDSTRING { - if (!read_settings ($3, yacc_cfg, yacc_cfg->user_settings)) { - yyerror ("yyparse: cannot read settings %s", $3); - YYERROR; - } - yacc_cfg->user_settings_str = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - } - ; -domainsettings: - DOMAIN_SETTINGS EQSIGN QUOTEDSTRING { - if (!read_settings ($3, yacc_cfg, yacc_cfg->domain_settings)) { - yyerror ("yyparse: cannot read settings %s", $3); - YYERROR; - } - yacc_cfg->domain_settings_str = memory_pool_strdup (yacc_cfg->cfg_pool, $3); - } - ; -%% -/* - * vi:ts=4 - */ diff --git a/src/cfg_utils.c b/src/cfg_utils.c index 69529e9ee..80faadbf3 100644 --- a/src/cfg_utils.c +++ b/src/cfg_utils.c @@ -241,7 +241,6 @@ init_defaults (struct config_file *cfg) cfg->max_diff = 20480; cfg->max_statfile_size = DEFAULT_STATFILE_SIZE; - cfg->variables = g_hash_table_new (rspamd_str_hash, rspamd_str_equal); cfg->metrics = g_hash_table_new (rspamd_str_hash, rspamd_str_equal); cfg->c_modules = g_hash_table_new (rspamd_str_hash, rspamd_str_equal); cfg->composite_symbols = g_hash_table_new (rspamd_str_hash, rspamd_str_equal); @@ -266,8 +265,6 @@ free_config (struct config_file *cfg) remove_all_maps (cfg); ucl_obj_unref (cfg->rcl_obj); - g_hash_table_remove_all (cfg->variables); - g_hash_table_unref (cfg->variables); g_hash_table_remove_all (cfg->metrics); g_hash_table_unref (cfg->metrics); g_hash_table_remove_all (cfg->c_modules); @@ -347,117 +344,6 @@ parse_limit (const gchar *limit, guint len) return result; } -gdouble -cfg_parse_time (const gchar *t, enum time_type default_type) -{ - union { - guint i; - double d; - } result; - gboolean use_double = FALSE; - gchar *err_str; - - if (!t || *t == '\0') - return 0; - - errno = 0; - result.i = strtoul (t, &err_str, 10); - - if (*err_str != '\0') { - if (*err_str == '.') { - /* Try to handle decimal point */ - errno = 0; - result.d = strtod (t, &err_str); - use_double = TRUE; - } - /* Seconds */ - if (*err_str == 's' || *err_str == 'S') { - if (use_double) { - result.d *= 1000.; - } - else { - result.i *= 1000; - } - } - /* Minutes */ - else if (*err_str == 'm' || *err_str == 'M') { - /* Handle ms correctly */ - if (*(err_str + 1) != 's' && *(err_str + 1) != 'S') { - if (use_double) { - result.d *= 60. * 1000.; - } - else { - result.i *= 60 * 1000; - } - } - } - /* Hours */ - else if (*err_str == 'h' || *err_str == 'H') { - if (use_double) { - result.d *= 60. * 60. * 1000.; - } - else { - result.i *= 60 * 60 * 1000; - } - } - /* Days */ - else if (*err_str == 'd' || *err_str == 'D') { - if (use_double) { - result.d *= 24. * 60. * 60. * 1000.; - } - else { - result.i *= 24 * 60 * 60 * 1000; - } - } - else { - msg_warn ("invalid time value '%s' at position '%s'", t, err_str); - if (use_double) { - result.d = 0.; - } - else { - result.i = 0; - } - } - } - else { - /* Switch to default time multiplier */ - switch (default_type) { - case TIME_HOURS: - if (use_double) { - result.d *= 60. * 60. * 1000.; - } - else { - result.i *= 60 * 60 * 1000; - } - break; - case TIME_MINUTES: - if (use_double) { - result.d *= 60. * 1000.; - } - else { - result.i *= 60 * 1000; - } - break; - case TIME_SECONDS: - if (use_double) { - result.d *= 1000.; - } - else { - result.i *= 1000; - } - break; - case TIME_MILLISECONDS: - break; - } - } - if (use_double) { - return result.d; - } - else { - return (gdouble)result.i; - } -} - gchar parse_flag (const gchar *str) { @@ -511,110 +397,6 @@ parse_flag (const gchar *str) return -1; } -/* - * Try to substitute all variables in given string - * Return: newly allocated string with substituted variables (original string may be freed if variables are found) - */ -gchar * -substitute_variable (struct config_file *cfg, gchar *name, gchar *str, guchar recursive) -{ - gchar *var, *new, *v_begin, *v_end, *p, t; - gsize len; - gboolean changed = FALSE; - - if (str == NULL) { - msg_warn ("trying to substitute variable in NULL string"); - return NULL; - } - - p = str; - while ((v_begin = strstr (p, "${")) != NULL) { - len = strlen (str); - *v_begin = '\0'; - v_begin += 2; - if ((v_end = strstr (v_begin, "}")) == NULL) { - /* Not a variable, skip */ - p = v_begin; - continue; - } - t = *v_end; - *v_end = '\0'; - var = g_hash_table_lookup (cfg->variables, v_begin); - if (var == NULL) { - msg_warn ("variable %s is not defined", v_begin); - *v_end = t; - p = v_end + 1; - continue; - } - else if (recursive) { - var = substitute_variable (cfg, v_begin, var, recursive); - } - /* Allocate new string */ - new = memory_pool_alloc (cfg->cfg_pool, len - strlen (v_begin) + strlen (var) + 3); - - snprintf (new, len - strlen (v_begin) + strlen (var) + 3, "%s(%s)%s", str, var, v_end + 1); - p = new; - str = new; - changed = TRUE; - } - - if (changed && name != NULL) { - g_hash_table_insert (cfg->variables, name, str); - } - - return str; -} - -static void -substitute_module_variables (gpointer key, gpointer value, gpointer data) -{ - struct config_file *cfg = (struct config_file *)data; - GList *cur_opt = (GList *) value; - struct module_opt *cur; - - while (cur_opt) { - cur = cur_opt->data; - if (cur->value) { - cur->value = substitute_variable (cfg, NULL, cur->value, 1); - } - cur_opt = g_list_next (cur_opt); - } -} - -static void -substitute_all_variables (gpointer key, gpointer value, gpointer data) -{ - struct config_file *cfg = (struct config_file *)data; - - /* Do recursive substitution */ - (void)substitute_variable (cfg, (gchar *)key, (gchar *)value, 1); -} - -/* - * Place pointers to cfg_file structure to hash cfg_params - */ -static void -fill_cfg_params (struct config_file *cfg) -{ - struct config_scalar *scalars; - - scalars = memory_pool_alloc (cfg->cfg_pool, 10 * sizeof (struct config_scalar)); - - scalars[0].type = SCALAR_TYPE_STR; - scalars[0].pointer = &cfg->cfg_name; - g_hash_table_insert (cfg->cfg_params, "cfg_name", &scalars[0]); - scalars[1].type = SCALAR_TYPE_STR; - scalars[1].pointer = &cfg->pid_file; - g_hash_table_insert (cfg->cfg_params, "pid_file", &scalars[1]); - scalars[2].type = SCALAR_TYPE_STR; - scalars[2].pointer = &cfg->temp_dir; - g_hash_table_insert (cfg->cfg_params, "temp_dir", &scalars[2]); - scalars[3].type = SCALAR_TYPE_SIZE; - scalars[3].pointer = &cfg->max_statfile_size; - g_hash_table_insert (cfg->cfg_params, "max_statfile_size", &scalars[3]); - -} - gboolean get_config_checksum (struct config_file *cfg) { @@ -657,9 +439,6 @@ post_load_config (struct config_file *cfg) #endif struct metric *def_metric; - g_hash_table_foreach (cfg->variables, substitute_all_variables, cfg); - fill_cfg_params (cfg); - #ifdef HAVE_CLOCK_GETTIME #ifdef HAVE_CLOCK_PROCESS_CPUTIME_ID clock_getres (CLOCK_PROCESS_CPUTIME_ID, &ts); diff --git a/src/main.c b/src/main.c index c350951f1..b96d37309 100644 --- a/src/main.c +++ b/src/main.c @@ -71,7 +71,6 @@ static gchar *privkey = NULL; static gchar *rspamd_user = NULL; static gchar *rspamd_group = NULL; static gchar *rspamd_pidfile = NULL; -static gboolean dump_vars = FALSE; static gboolean dump_cache = FALSE; static gboolean is_debug = FALSE; static gboolean is_insecure = FALSE; @@ -97,7 +96,6 @@ static GOptionEntry entries[] = { "user", 'u', 0, G_OPTION_ARG_STRING, &rspamd_user, "User to run rspamd as", NULL }, { "group", 'g', 0, G_OPTION_ARG_STRING, &rspamd_group, "Group to run rspamd as", NULL }, { "pid", 'p', 0, G_OPTION_ARG_STRING, &rspamd_pidfile, "Path to pidfile", NULL }, - { "dump-vars", 'V', 0, G_OPTION_ARG_NONE, &dump_vars, "Print all rspamd variables and exit", NULL }, { "dump-cache", 'C', 0, G_OPTION_ARG_NONE, &dump_cache, "Dump symbols cache stats and exit", NULL }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &is_debug, "Force debug output", NULL }, { "insecure", 'i', 0, G_OPTION_ARG_NONE, &is_insecure, "Ignore running workers as privileged users (insecure)", NULL }, @@ -527,37 +525,6 @@ delay_fork (struct worker_conf *cf) set_alarm (SOFT_FORK_TIME); } - -static void -dump_module_variables (gpointer key, gpointer value, gpointer data) -{ - GList *cur_opt; - struct module_opt *cur; - - cur_opt = (GList *) value; - - while (cur_opt) { - cur = cur_opt->data; - if (cur->value) { - printf ("$%s = \"%s\"\n", cur->param, cur->value); - } - cur_opt = g_list_next (cur_opt); - } -} - -static void -dump_all_variables (gpointer key, gpointer value, gpointer data) -{ - printf ("$%s = \"%s\"\n", (gchar *)key, (gchar *)value); -} - - -static void -dump_cfg_vars (struct config_file *cfg) -{ - g_hash_table_foreach (cfg->variables, dump_all_variables, NULL); -} - static GList * create_listen_socket (const gchar *addr, gint port, gint family, gint listen_type) { @@ -1149,7 +1116,7 @@ main (gint argc, gchar **argv, gchar **env) rspamd_main->cfg->log_level = G_LOG_LEVEL_DEBUG; } - if (rspamd_main->cfg->config_test || dump_vars || dump_cache) { + if (rspamd_main->cfg->config_test || dump_cache) { /* Init events to test modules */ event_init (); res = TRUE; @@ -1174,9 +1141,6 @@ main (gint argc, gchar **argv, gchar **env) if (! validate_cache (rspamd_main->cfg->cache, rspamd_main->cfg, FALSE)) { res = FALSE; } - if (dump_vars) { - dump_cfg_vars (rspamd_main->cfg); - } if (dump_cache) { print_symbols_cache (rspamd_main->cfg); exit (EXIT_SUCCESS); -- 2.39.5