- syslog-ng - lists.balabit.hu

[PATCH (3.5)] Add support for number unit suffixes
by Gergely Nagy 04 Sep '13

04 Sep '13

There are a number of cases in the configuration where one needs to set a size (think buffer sizes), and counting zeroes is extremely annoying and unintuitive. For this reason, we introduce number unit suffixes for kilo-, mega- and giga-: K, M, G, respectively (case-insensitive, optionally followed by a 'b' or 'B', for byte). The parser also understands KiB, MiB, etc to indicate base-two units. Anywhere where you can specify a number, you'll be able to specify one with a unit suffix from now on: log-fifo-size(200M) A function to parse longs already existed in basic-funcs (tf_parse_int), which was moved to lib/parse-number.c now, and enhanced to recognise the unit suffixes too. This also closes #28. Signed-off-by: Balazs Scheidler <bazsi(a)balabit.hu> Signed-off-by: Gergely Nagy <algernon(a)balabit.hu> --- lib/Makefile.am | 2 + lib/cfg-lex.l | 10 ++- lib/parse-number.c | 161 ++++++++++++++++++++++++++++++++++++ lib/parse-number.h | 9 ++ lib/tests/Makefile.am | 8 +- lib/tests/test_parse_number.c | 118 ++++++++++++++++++++++++++ modules/basicfuncs/basic-funcs.c | 21 +---- modules/basicfuncs/numeric-funcs.c | 4 +- modules/basicfuncs/str-funcs.c | 4 +- 9 files changed, 310 insertions(+), 27 deletions(-) create mode 100644 lib/parse-number.c create mode 100644 lib/parse-number.h create mode 100644 lib/tests/test_parse_number.c diff --git a/lib/Makefile.am b/lib/Makefile.am index f7eb421..5814596 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -63,6 +63,7 @@ pkginclude_HEADERS += \ lib/ml-batched-timer.h \ lib/msg-format.h \ lib/nvtable.h \ + lib/parse-number.h \ lib/persist-state.h \ lib/plugin.h \ lib/plugin-types.h \ @@ -139,6 +140,7 @@ lib_libsyslog_ng_la_SOURCES = \ lib/ml-batched-timer.c \ lib/msg-format.c \ lib/nvtable.c \ + lib/parse-number.c \ lib/persist-state.c \ lib/plugin.c \ lib/poll-events.c \ diff --git a/lib/cfg-lex.l b/lib/cfg-lex.l index 7b1a81d..b923a7c 100644 --- a/lib/cfg-lex.l +++ b/lib/cfg-lex.l @@ -27,7 +27,7 @@ #include "cfg-lexer.h" #include "cfg-grammar.h" #include "messages.h" -#include "misc.h" +#include "parse-number.h" #include <string.h> #include <strings.h> @@ -160,7 +160,13 @@ word [^ \#'"\{\}\\;\n\t,|\.@:] (-|\+)?{digit}+\.{digit}+ { yylval->fnum = strtod(yytext, NULL); return LL_FLOAT; } 0x{xdigit}+ { yylval->num = strtoll(yytext + 2, NULL, 16); return LL_NUMBER; } 0{odigit}+ { yylval->num = strtoll(yytext + 1, NULL, 8); return LL_NUMBER; } -(-|\+)?{digit}+ { yylval->num = strtoll(yytext, NULL, 10); return LL_NUMBER; } +(-|\+)?{digit}+(M|m|G|g|k|K)?(i|I)?(b|B)? { + if (!parse_number_with_suffix(yytext, &yylval->num)) + { + YY_FATAL_ERROR("Invalid number specification"); + } + return LL_NUMBER; + } ({word}+(\.)?)*{word}+ { return cfg_lexer_lookup_keyword(yyextra, yylval, yylloc, yytext); } $ | $ | diff --git a/lib/parse-number.c b/lib/parse-number.c new file mode 100644 index 0000000..b9b1be5 --- /dev/null +++ b/lib/parse-number.c @@ -0,0 +1,161 @@ +#include "parse-number.h" + +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +static gboolean +_valid_unit(const gchar unit_char) +{ + return (unit_char == 'B' || unit_char == 'b'); +} + +static gboolean +_valid_exponent(const gchar exponent_char) +{ + gchar e = exponent_char; + + return e == 'k' || e == 'K' || + e == 'm' || e == 'M' || + e == 'g' || e == 'G'; +} + +static gboolean +_parse_suffix(const gchar *suffix, gchar *exponent_char, gchar *base_char, gchar *unit_char) +{ + gint suffix_len; + + suffix_len = strlen(suffix); + if (suffix_len > 3) + return FALSE; + if (suffix_len == 0) + return TRUE; + + if (suffix_len == 3) + { + *exponent_char = suffix[0]; + *base_char = suffix[1]; + *unit_char = suffix[2]; + } + else if (suffix_len == 2) + { + *exponent_char = suffix[0]; + if (_valid_unit(suffix[1])) + *unit_char = suffix[1]; + else + *base_char = suffix[1]; + } + else if (suffix_len == 1) + { + if (_valid_exponent(suffix[0])) + *exponent_char = suffix[0]; + else if (_valid_unit(suffix[0])) + *unit_char = suffix[0]; + else + return FALSE; + } + return TRUE; +} + +static gboolean +_determine_multiplier(gchar base_char, glong *multiplier) +{ + if (base_char == 0) + *multiplier = 1000; + else if (base_char == 'I' || base_char == 'i') + *multiplier = 1024; + else + return FALSE; + return TRUE; +} + +static gboolean +_validate_unit(gchar unit_char) +{ + if (unit_char && !_valid_unit(unit_char)) + return FALSE; + return TRUE; +} + +static gboolean +_process_exponent(gchar exponent_char, glong *d, glong multiplier) +{ + switch (exponent_char) + { + case 'G': + case 'g': + (*d) *= multiplier; + case 'm': + case 'M': + (*d) *= multiplier; + case 'K': + case 'k': + (*d) *= multiplier; + case 0: + return TRUE; + default: + return FALSE; + } +} + +static gboolean +_process_suffix(const gchar *suffix, glong *d) +{ + gchar exponent_char = 0, base_char = 0, unit_char = 0; + glong multiplier = 0; + + if (!_parse_suffix(suffix, &exponent_char, &base_char, &unit_char)) + return FALSE; + + if (!_determine_multiplier(base_char, &multiplier)) + return FALSE; + + if (!_validate_unit(unit_char)) + return FALSE; + + if (!_process_exponent(exponent_char, d, multiplier)) + return FALSE; + + return TRUE; +} + +static gboolean +_parse_number(const gchar *s, gchar **endptr, long *d) +{ + glong val; + + errno = 0; + val = strtoll(s, endptr, 10); + + if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) + || (errno != 0 && val == 0)) + return FALSE; + + if (*endptr == s) + return FALSE; + + *d = val; + return TRUE; +} + +gboolean +parse_number(const gchar *s, glong *d) +{ + gchar *endptr; + + if (!_parse_number(s, &endptr, d)) + return FALSE; + if (*endptr) + return FALSE; + return TRUE; +} + +gboolean +parse_number_with_suffix(const gchar *s, glong *d) +{ + gchar *endptr; + + if (!_parse_number(s, &endptr, d)) + return FALSE; + return _process_suffix(endptr, d); +} diff --git a/lib/parse-number.h b/lib/parse-number.h new file mode 100644 index 0000000..e8e0c52 --- /dev/null +++ b/lib/parse-number.h @@ -0,0 +1,9 @@ +#ifndef PARSE_NUMBER_H_INCLUDED +#define PARSE_NUMBER_H_INCLUDED + +#include "syslog-ng.h" + +gboolean parse_number_with_suffix(const gchar *str, glong *result); +gboolean parse_number(const gchar *str, glong *result); + +#endif diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 6bead1d..ad5cd26 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -1,7 +1,8 @@ lib_tests_TESTS = \ lib/tests/test_log_message \ lib/tests/test_cfg_lexer_subst \ - lib/tests/test_type_hints + lib/tests/test_type_hints \ + lib/tests/test_parse_number check_PROGRAMS += ${lib_tests_TESTS} @@ -19,3 +20,8 @@ lib_tests_test_type_hints_CFLAGS = \ $(TEST_CFLAGS) lib_tests_test_type_hints_LDADD = \ $(TEST_LDADD) + +lib_tests_test_parse_number_CFLAGS = \ + $(TEST_CFLAGS) +lib_tests_test_parse_number_LDADD = \ + $(TEST_LDADD) diff --git a/lib/tests/test_parse_number.c b/lib/tests/test_parse_number.c new file mode 100644 index 0000000..5895005 --- /dev/null +++ b/lib/tests/test_parse_number.c @@ -0,0 +1,118 @@ +#include <stdlib.h> + +#include "testutils.h" +#include "parse-number.h" + +static void +assert_parse_with_suffix(const gchar *str, long expected) +{ + long n; + gboolean res; + + res = parse_number_with_suffix(str, &n); + + assert_gboolean(res, TRUE, "Parsing (w/ suffix) %s failed", str); + assert_gint64(n, expected, "Parsing (w/ suffix) %s failed", str); +} + +static void +assert_parse_with_suffix_fails(const gchar *str) +{ + long n; + gboolean res; + + res = parse_number_with_suffix(str, &n); + assert_gboolean(res, FALSE, "Parsing (w/ suffix) %s succeeded, while expecting failure", str); +} + +static void +assert_parse(const gchar *str, long expected) +{ + long n; + gboolean res; + + res = parse_number(str, &n); + + assert_gboolean(res, TRUE, "Parsing (w/o suffix) %s failed", str); + assert_gint64(n, expected, "Parsing (w/o suffix) %s failed", str); +} + +static void +assert_parse_fails(const gchar *str) +{ + long n; + gboolean res; + + res = parse_number(str, &n); + + assert_gboolean(res, FALSE, "Parsing (w/o suffix) %s succeeded, while expecting failure", str); +} + +static void +test_simple_numbers_are_parsed_properly(void) +{ + assert_parse_with_suffix("1234", 1234); + assert_parse_with_suffix("+1234", 1234); + assert_parse_with_suffix("-1234", -1234); + + assert_parse("1234", 1234); +} + +static void +test_exponent_suffix_is_parsed_properly(void) +{ + assert_parse_with_suffix("1K", 1000); + assert_parse_with_suffix("1k", 1000); + assert_parse_with_suffix("1m", 1000 * 1000); + assert_parse_with_suffix("1M", 1000 * 1000); + assert_parse_with_suffix("1G", 1000 * 1000 * 1000); + assert_parse_with_suffix("1g", 1000 * 1000 * 1000); +} + +static void +test_byte_units_are_accepted(void) +{ + assert_parse_with_suffix("1b", 1); + assert_parse_with_suffix("1B", 1); + assert_parse_with_suffix("1Kb", 1000); + assert_parse_with_suffix("1kB", 1000); + assert_parse_with_suffix("1mb", 1000 * 1000); + assert_parse_with_suffix("1MB", 1000 * 1000); + assert_parse_with_suffix("1Gb", 1000 * 1000 * 1000); + assert_parse_with_suffix("1gB", 1000 * 1000 * 1000); +} + +static void +test_base2_is_selected_by_an_i_modifier(void) +{ + assert_parse_with_suffix("1Kib", 1024); + assert_parse_with_suffix("1kiB", 1024); + assert_parse_with_suffix("1Ki", 1024); + assert_parse_with_suffix("1kI", 1024); + assert_parse_with_suffix("1mib", 1024 * 1024); + assert_parse_with_suffix("1MiB", 1024 * 1024); + assert_parse_with_suffix("1Gib", 1024 * 1024 * 1024); + assert_parse_with_suffix("1giB", 1024 * 1024 * 1024); +} + +static void +test_invalid_formats_are_not_accepted(void) +{ + assert_parse_with_suffix_fails("1234Z"); + assert_parse_with_suffix_fails("1234kZ"); + assert_parse_with_suffix_fails("1234kdZ"); + assert_parse_with_suffix_fails("1234kiZ"); + assert_parse_fails("1234kiZ"); +} + +int +main(int argc, char *argv[]) +{ + test_simple_numbers_are_parsed_properly(); + test_exponent_suffix_is_parsed_properly(); + test_byte_units_are_accepted(); + test_base2_is_selected_by_an_i_modifier(); + test_invalid_formats_are_not_accepted(); + + return 0; +} diff --git a/modules/basicfuncs/basic-funcs.c b/modules/basicfuncs/basic-funcs.c index cb73b02..523f6cf 100644 --- a/modules/basicfuncs/basic-funcs.c +++ b/modules/basicfuncs/basic-funcs.c @@ -26,6 +26,7 @@ #include "filter/filter-expr.h" #include "filter/filter-expr-parser.h" #include "cfg.h" +#include "parse-number.h" #include "str-format.h" #include "plugin-types.h" @@ -33,26 +34,6 @@ #include <errno.h> #include <string.h> -static gboolean -tf_parse_int(const gchar *s, long *d) -{ - gchar *endptr; - glong val; - - errno = 0; - val = strtoll(s, &endptr, 10); - - if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) - || (errno != 0 && val == 0)) - return FALSE; - - if (endptr == s || *endptr != '\0') - return FALSE; - - *d = val; - return TRUE; -} - /* in order to avoid having to declare all construct functions, we * include them all here. If it causes compilation times to increase * drastically, we should probably make them into separate compilation diff --git a/modules/basicfuncs/numeric-funcs.c b/modules/basicfuncs/numeric-funcs.c index 6bd00ef..9125c3c 100644 --- a/modules/basicfuncs/numeric-funcs.c +++ b/modules/basicfuncs/numeric-funcs.c @@ -32,7 +32,7 @@ tf_num_parse(gint argc, GString *argv[], return FALSE; } - if (!tf_parse_int(argv[0]->str, n)) + if (!parse_number_with_suffix(argv[0]->str, n)) { msg_debug("Parsing failed, template function's first argument is not a number", evt_tag_str("function", func_name), @@ -40,7 +40,7 @@ tf_num_parse(gint argc, GString *argv[], return FALSE; } - if (!tf_parse_int(argv[1]->str, m)) + if (!parse_number_with_suffix(argv[1]->str, m)) { msg_debug("Parsing failed, template function's first argument is not a number", evt_tag_str("function", func_name), diff --git a/modules/basicfuncs/str-funcs.c b/modules/basicfuncs/str-funcs.c index 6c8ae3c..060795d 100644 --- a/modules/basicfuncs/str-funcs.c +++ b/modules/basicfuncs/str-funcs.c @@ -79,14 +79,14 @@ tf_substr(LogMessage *msg, gint argc, GString *argv[], GString *result) return; /* get offset position from second argument */ - if (!tf_parse_int(argv[1]->str, &start)) { + if (!parse_number(argv[1]->str, &start)) { msg_error("$(substr) parsing failed, start could not be parsed", evt_tag_str("start", argv[1]->str), NULL); return; } /* if we were called with >2 arguments, third was desired length */ if (argc > 2) { - if (!tf_parse_int(argv[2]->str, &len)) { + if (!parse_number(argv[2]->str, &len)) { msg_error("$(substr) parsing failed, length could not be parsed", evt_tag_str("length", argv[2]->str), NULL); return; } -- 1.7.10.4

1 0

Re: [syslog-ng] [PATCH] Add support for number unit suffixes
by Balazs Scheidler 04 Sep '13

04 Sep '13

Hi, I've received your patch via the merge-queue/3.5 branch: > There are a number of cases in the configuration where one needs to set > a size (think buffer sizes), and counting zeroes is extremely annoying > and unintuitive. For this reason, we introduce number unit suffixes for > kilo-, mega- and giga-: K, M, G, respectively (case-insensitive, > optionally followed by a 'b' or 'B', for byte). > > Anywhere where you can specify a number, you'll be able to specify one > with a unit suffix from now on: > > log-fifo-size(200M) > > A function to parse longs already existed in basic-funcs (tf_parse_int), > which was moved to lib/misc.c now, and enhanced to recognise the unit > suffixes too. > > This also closes #28. > > Signed-off-by: Gergely Nagy <algernon(a)balabit.hu> > I really like the change as it definitely seems useful, however I'd have some things I'd like changed, and I've coded this up in a branch named numeric-suffixes. Could you please fold the patches and resubmit them? Thanks. This is the patch I had in mind commit 3fb2cfbbefe5b3d8f2952e807aa40a7b207a7a68 Author: Balazs Scheidler <bazsi(a)balabit.hu> Date: Tue Jul 30 16:37:31 2013 +0200 parse-number: follow up patch to number-units functionality This patch improves the patch series in a number of ways: - moves the number parsing to its separate module - removes the conflicting rule from the lexer, which would never match - accepts 'i' modifier in suffixes to indicate base2 units - string related functions don't get the suffixes functionality - extends the test suite, and adds test functions to indicate the intent of various asserts - test-num-parse is moved under lib/tests This patch should be folded back into the base set before integration. diff --git a/lib/Makefile.am b/lib/Makefile.am index d16f755..44ee107 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -62,6 +62,7 @@ pkginclude_HEADERS += \ lib/ml-batched-timer.h \ lib/msg-format.h \ lib/nvtable.h \ + lib/parse-number.h \ lib/persist-state.h \ lib/plugin.h \ lib/plugin-types.h \ @@ -135,6 +136,7 @@ lib_libsyslog_ng_la_SOURCES = \ lib/ml-batched-timer.c \ lib/msg-format.c \ lib/nvtable.c \ + lib/parse-number.c \ lib/persist-state.c \ lib/plugin.c \ lib/pragma-parser.c \ diff --git a/lib/cfg-lex.l b/lib/cfg-lex.l index ed61c6f..b923a7c 100644 --- a/lib/cfg-lex.l +++ b/lib/cfg-lex.l @@ -27,7 +27,7 @@ #include "cfg-lexer.h" #include "cfg-grammar.h" #include "messages.h" -#include "misc.h" +#include "parse-number.h" #include <string.h> #include <strings.h> @@ -160,14 +160,13 @@ word [^ \#'"\{\}\\;\n\t,|\.@:] (-|\+)?{digit}+\.{digit}+ { yylval->fnum = strtod(yytext, NULL); return LL_FLOAT; } 0x{xdigit}+ { yylval->num = strtoll(yytext + 2, NULL, 16); return LL_NUMBER; } 0{odigit}+ { yylval->num = strtoll(yytext + 1, NULL, 8); return LL_NUMBER; } -(-|\+)?{digit}+(M|m|G|g|k|K)?(b|B)? { - if (!num_parse_int(yytext, &yylval->num)) +(-|\+)?{digit}+(M|m|G|g|k|K)?(i|I)?(b|B)? { + if (!parse_number_with_suffix(yytext, &yylval->num)) { YY_FATAL_ERROR("Invalid number specification"); } return LL_NUMBER; } -(-|\+)?{digit}+ { yylval->num = strtoll(yytext, NULL, 10); return LL_NUMBER; } ({word}+(\.)?)*{word}+ { return cfg_lexer_lookup_keyword(yyextra, yylval, yylloc, yytext); } $ | $ | diff --git a/lib/misc.c b/lib/misc.c index 2d95c78..7a5fad6 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -635,48 +635,3 @@ utf8_escape_string(const gchar *str, gssize len) return res; } - -gboolean -num_parse_int(const gchar *s, long *d) -{ - gchar *endptr; - glong val; - - errno = 0; - val = strtoll(s, &endptr, 10); - - if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) - || (errno != 0 && val == 0)) - return FALSE; - - if (endptr == s) - return FALSE; - - switch (*endptr) - { - case 'G': - case 'g': - val *= 1000; - case 'm': - case 'M': - val *= 1000; - case 'K': - case 'k': - val *= 1000; - endptr++; - break; - case '\0': - break; - default: - return FALSE; - } - - if (*endptr == 'b' || *endptr == 'B') - endptr++; - - if (*endptr != '\0') - return FALSE; - - *d = val; - return TRUE; -} diff --git a/lib/parse-number.c b/lib/parse-number.c new file mode 100644 index 0000000..b9b1be5 --- /dev/null +++ b/lib/parse-number.c @@ -0,0 +1,161 @@ +#include "parse-number.h" + +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +static gboolean +_valid_unit(const gchar unit_char) +{ + return (unit_char == 'B' || unit_char == 'b'); +} + +static gboolean +_valid_exponent(const gchar exponent_char) +{ + gchar e = exponent_char; + + return e == 'k' || e == 'K' || + e == 'm' || e == 'M' || + e == 'g' || e == 'G'; +} + +static gboolean +_parse_suffix(const gchar *suffix, gchar *exponent_char, gchar *base_char, gchar *unit_char) +{ + gint suffix_len; + + suffix_len = strlen(suffix); + if (suffix_len > 3) + return FALSE; + if (suffix_len == 0) + return TRUE; + + if (suffix_len == 3) + { + *exponent_char = suffix[0]; + *base_char = suffix[1]; + *unit_char = suffix[2]; + } + else if (suffix_len == 2) + { + *exponent_char = suffix[0]; + if (_valid_unit(suffix[1])) + *unit_char = suffix[1]; + else + *base_char = suffix[1]; + } + else if (suffix_len == 1) + { + if (_valid_exponent(suffix[0])) + *exponent_char = suffix[0]; + else if (_valid_unit(suffix[0])) + *unit_char = suffix[0]; + else + return FALSE; + } + return TRUE; +} + +static gboolean +_determine_multiplier(gchar base_char, glong *multiplier) +{ + if (base_char == 0) + *multiplier = 1000; + else if (base_char == 'I' || base_char == 'i') + *multiplier = 1024; + else + return FALSE; + return TRUE; +} + +static gboolean +_validate_unit(gchar unit_char) +{ + if (unit_char && !_valid_unit(unit_char)) + return FALSE; + return TRUE; +} + +static gboolean +_process_exponent(gchar exponent_char, glong *d, glong multiplier) +{ + switch (exponent_char) + { + case 'G': + case 'g': + (*d) *= multiplier; + case 'm': + case 'M': + (*d) *= multiplier; + case 'K': + case 'k': + (*d) *= multiplier; + case 0: + return TRUE; + default: + return FALSE; + } +} + +static gboolean +_process_suffix(const gchar *suffix, glong *d) +{ + gchar exponent_char = 0, base_char = 0, unit_char = 0; + glong multiplier = 0; + + if (!_parse_suffix(suffix, &exponent_char, &base_char, &unit_char)) + return FALSE; + + if (!_determine_multiplier(base_char, &multiplier)) + return FALSE; + + if (!_validate_unit(unit_char)) + return FALSE; + + if (!_process_exponent(exponent_char, d, multiplier)) + return FALSE; + + return TRUE; +} + +static gboolean +_parse_number(const gchar *s, gchar **endptr, long *d) +{ + glong val; + + errno = 0; + val = strtoll(s, endptr, 10); + + if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) + || (errno != 0 && val == 0)) + return FALSE; + + if (*endptr == s) + return FALSE; + + *d = val; + return TRUE; +} + +gboolean +parse_number(const gchar *s, glong *d) +{ + gchar *endptr; + + if (!_parse_number(s, &endptr, d)) + return FALSE; + if (*endptr) + return FALSE; + return TRUE; +} + +gboolean +parse_number_with_suffix(const gchar *s, glong *d) +{ + gchar *endptr; + + if (!_parse_number(s, &endptr, d)) + return FALSE; + return _process_suffix(endptr, d); +} diff --git a/lib/parse-number.h b/lib/parse-number.h new file mode 100644 index 0000000..e8e0c52 --- /dev/null +++ b/lib/parse-number.h @@ -0,0 +1,9 @@ +#ifndef PARSE_NUMBER_H_INCLUDED +#define PARSE_NUMBER_H_INCLUDED + +#include "syslog-ng.h" + +gboolean parse_number_with_suffix(const gchar *str, glong *result); +gboolean parse_number(const gchar *str, glong *result); + +#endif diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 7117983..4d88daa 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -1,4 +1,8 @@ -lib_tests_TESTS = lib/tests/test_log_message lib/tests/test_cfg_lexer_subst +lib_tests_TESTS = \ + lib/tests/test_log_message \ + lib/tests/test_cfg_lexer_subst \ + lib/tests/test_parse_number + check_PROGRAMS += ${lib_tests_TESTS} lib_tests_test_log_message_CFLAGS = \ @@ -10,3 +14,8 @@ lib_tests_test_cfg_lexer_subst_CFLAGS = \ $(TEST_CFLAGS) lib_tests_test_cfg_lexer_subst_LDADD = \ $(TEST_LDADD) + +lib_tests_test_parse_number_CFLAGS = \ + $(TEST_CFLAGS) +lib_tests_test_parse_number_LDADD = \ + $(TEST_LDADD) diff --git a/lib/tests/test_parse_number.c b/lib/tests/test_parse_number.c new file mode 100644 index 0000000..5895005 --- /dev/null +++ b/lib/tests/test_parse_number.c @@ -0,0 +1,118 @@ +#include <stdlib.h> + +#include "testutils.h" +#include "parse-number.h" + +static void +assert_parse_with_suffix(const gchar *str, long expected) +{ + long n; + gboolean res; + + res = parse_number_with_suffix(str, &n); + + assert_gboolean(res, TRUE, "Parsing (w/ suffix) %s failed", str); + assert_gint64(n, expected, "Parsing (w/ suffix) %s failed", str); +} + +static void +assert_parse_with_suffix_fails(const gchar *str) +{ + long n; + gboolean res; + + res = parse_number_with_suffix(str, &n); + assert_gboolean(res, FALSE, "Parsing (w/ suffix) %s succeeded, while expecting failure", str); +} + +static void +assert_parse(const gchar *str, long expected) +{ + long n; + gboolean res; + + res = parse_number(str, &n); + + assert_gboolean(res, TRUE, "Parsing (w/o suffix) %s failed", str); + assert_gint64(n, expected, "Parsing (w/o suffix) %s failed", str); +} + +static void +assert_parse_fails(const gchar *str) +{ + long n; + gboolean res; + + res = parse_number(str, &n); + + assert_gboolean(res, FALSE, "Parsing (w/o suffix) %s succeeded, while expecting failure", str); +} + +static void +test_simple_numbers_are_parsed_properly(void) +{ + assert_parse_with_suffix("1234", 1234); + assert_parse_with_suffix("+1234", 1234); + assert_parse_with_suffix("-1234", -1234); + + assert_parse("1234", 1234); +} + +static void +test_exponent_suffix_is_parsed_properly(void) +{ + assert_parse_with_suffix("1K", 1000); + assert_parse_with_suffix("1k", 1000); + assert_parse_with_suffix("1m", 1000 * 1000); + assert_parse_with_suffix("1M", 1000 * 1000); + assert_parse_with_suffix("1G", 1000 * 1000 * 1000); + assert_parse_with_suffix("1g", 1000 * 1000 * 1000); +} + +static void +test_byte_units_are_accepted(void) +{ + assert_parse_with_suffix("1b", 1); + assert_parse_with_suffix("1B", 1); + assert_parse_with_suffix("1Kb", 1000); + assert_parse_with_suffix("1kB", 1000); + assert_parse_with_suffix("1mb", 1000 * 1000); + assert_parse_with_suffix("1MB", 1000 * 1000); + assert_parse_with_suffix("1Gb", 1000 * 1000 * 1000); + assert_parse_with_suffix("1gB", 1000 * 1000 * 1000); +} + +static void +test_base2_is_selected_by_an_i_modifier(void) +{ + assert_parse_with_suffix("1Kib", 1024); + assert_parse_with_suffix("1kiB", 1024); + assert_parse_with_suffix("1Ki", 1024); + assert_parse_with_suffix("1kI", 1024); + assert_parse_with_suffix("1mib", 1024 * 1024); + assert_parse_with_suffix("1MiB", 1024 * 1024); + assert_parse_with_suffix("1Gib", 1024 * 1024 * 1024); + assert_parse_with_suffix("1giB", 1024 * 1024 * 1024); +} + +static void +test_invalid_formats_are_not_accepted(void) +{ + assert_parse_with_suffix_fails("1234Z"); + assert_parse_with_suffix_fails("1234kZ"); + assert_parse_with_suffix_fails("1234kdZ"); + assert_parse_with_suffix_fails("1234kiZ"); + assert_parse_fails("1234kiZ"); +} + +int +main(int argc, char *argv[]) +{ + test_simple_numbers_are_parsed_properly(); + test_exponent_suffix_is_parsed_properly(); + test_byte_units_are_accepted(); + test_base2_is_selected_by_an_i_modifier(); + test_invalid_formats_are_not_accepted(); + + return 0; +} diff --git a/modules/basicfuncs/basic-funcs.c b/modules/basicfuncs/basic-funcs.c index c519d86..26fa8bd 100644 --- a/modules/basicfuncs/basic-funcs.c +++ b/modules/basicfuncs/basic-funcs.c @@ -26,7 +26,7 @@ #include "filter/filter-expr.h" #include "filter/filter-expr-parser.h" #include "cfg.h" -#include "misc.h" +#include "parse-number.h" #include "str-format.h" #include "plugin-types.h" diff --git a/modules/basicfuncs/numeric-funcs.c b/modules/basicfuncs/numeric-funcs.c index 39e4d83..9125c3c 100644 --- a/modules/basicfuncs/numeric-funcs.c +++ b/modules/basicfuncs/numeric-funcs.c @@ -32,7 +32,7 @@ tf_num_parse(gint argc, GString *argv[], return FALSE; } - if (!num_parse_int(argv[0]->str, n)) + if (!parse_number_with_suffix(argv[0]->str, n)) { msg_debug("Parsing failed, template function's first argument is not a number", evt_tag_str("function", func_name), @@ -40,7 +40,7 @@ tf_num_parse(gint argc, GString *argv[], return FALSE; } - if (!num_parse_int(argv[1]->str, m)) + if (!parse_number_with_suffix(argv[1]->str, m)) { msg_debug("Parsing failed, template function's first argument is not a number", evt_tag_str("function", func_name), diff --git a/modules/basicfuncs/str-funcs.c b/modules/basicfuncs/str-funcs.c index b0bcdd4..060795d 100644 --- a/modules/basicfuncs/str-funcs.c +++ b/modules/basicfuncs/str-funcs.c @@ -79,14 +79,14 @@ tf_substr(LogMessage *msg, gint argc, GString *argv[], GString *result) return; /* get offset position from second argument */ - if (!num_parse_int(argv[1]->str, &start)) { + if (!parse_number(argv[1]->str, &start)) { msg_error("$(substr) parsing failed, start could not be parsed", evt_tag_str("start", argv[1]->str), NULL); return; } /* if we were called with >2 arguments, third was desired length */ if (argc > 2) { - if (!num_parse_int(argv[2]->str, &len)) { + if (!parse_number(argv[2]->str, &len)) { msg_error("$(substr) parsing failed, length could not be parsed", evt_tag_str("length", argv[2]->str), NULL); return; } diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index d5c8ac6..8841834 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -15,8 +15,7 @@ tests_unit_TESTS = \ tests/unit/test_logwriter \ tests/unit/test_zone \ tests/unit/test_persist_state \ - tests/unit/test_value_pairs \ - tests/unit/test_num_parse + tests/unit/test_value_pairs check_PROGRAMS += \ ${tests_unit_TESTS} @@ -81,10 +80,6 @@ tests_unit_test_persist_state_LDADD = \ tests_unit_test_value_pairs_LDADD = \ $(TEST_LDADD) $(unit_test_extra_modules) -tests_unit_test_num_parse_CFLAGS = ${TEST_CFLAGS} -tests_unit_test_num_parse_LDADD = \ - $(TEST_LDADD) - CLEANFILES += \ test_values.persist \ test_values.persist- diff --git a/tests/unit/test_num_parse.c b/tests/unit/test_num_parse.c deleted file mode 100644 index ab75d9e..0000000 --- a/tests/unit/test_num_parse.c +++ /dev/null @@ -1,37 +0,0 @@ -#include <stdlib.h> - -#include "testutils.h" -#include "misc.h" - -static void -assert_num_parse (const gchar *str, long expected) -{ - long n; - gboolean res; - - res = num_parse_int(str, &n); - - assert_gboolean(res, TRUE, "Parsing %s failed", str); - assert_gint64(n, expected, "Parsing %s failed", str); -} - -int -main(int argc, char *argv[]) -{ - assert_num_parse("1234", 1234); - assert_num_parse("+1234", 1234); - assert_num_parse("-1234", -1234); - - assert_num_parse("1K", 1000); - assert_num_parse("1k", 1000); - assert_num_parse("1kB", 1000); - assert_num_parse("1Kb", 1000); - - assert_num_parse("1m", 1000 * 1000); - assert_num_parse("1M", 1000 * 1000); - - assert_num_parse("1G", 1000 * 1000 * 1000); - assert_num_parse("1g", 1000 * 1000 * 1000); - - return 0; -}

3 2

[Bug 251] New: Missing property 'inherit-properties' from tag 'action/ message' in patterndb.xsd
by bugzilla＠bugzilla.balabit.com 04 Sep '13

04 Sep '13

https://bugzilla.balabit.com/show_bug.cgi?id=251 Summary: Missing property 'inherit-properties' from tag 'action/message' in patterndb.xsd Product: syslog-ng Version: 3.4.x Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: unspecified Component: syslog-ng AssignedTo: bazsi(a)balabit.hu ReportedBy: bugzilla.balabit(a)faxm0dem.org Type of the Report: --- Estimated Hours: 0.0 The property 'inherit-properties' from tag 'action/message' seems to be missing from patterndb-4.xsd, resulting in parse errors when running 'pdbtool --validate'. -- Configure bugmail: https://bugzilla.balabit.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

1 5

Handling correctly HOST value on the client side
by Christophe Brocas 02 Sep '13

02 Sep '13

Hello, I have a log management infrastructure with many servers sending logs to centralized servers. Currently, on the server side, I use the HOST field present in the log messages to store log messages in separate files (like <path>/<host>/messages). Of course, due to inconsistent content of the HOST value in the log messages, I have several log file locations for a single client. Bad point. My question : I want to fix the problem at the source and so, set a single unique value in the HOST field of every log message sent by each client. What is your preferred way to address this problem on the client side ? Do you use use_fqdn() global option ? If yes, how it works ? A reverse DNS call ? What is the value returned if a PTR value is not set in the DNS zone for the IP of the host ? Thank you for the reading and for your answer :) Christophe ***************************************************** "Le contenu de ce courriel et ses eventuelles pièces jointes sont confidentiels. Ils s'adressent exclusivement à la personne destinataire. Si cet envoi ne vous est pas destiné, ou si vous l'avez reçu par erreur, et afin de ne pas violer le secret des correspondances, vous ne devez pas le transmettre à d'autres personnes ni le reproduire. Merci de le renvoyer à l'émetteur et de le détruire. Attention : L'Organisme de l'émetteur du message ne pourra être tenu responsable de l'altération du présent courriel. Il appartient au destinataire de vérifier que les messages et pièces jointes reçus ne contiennent pas de virus. Les opinions contenues dans ce courriel et ses éventuelles pièces jointes sont celles de l'émetteur. Elles ne reflètent pas la position de l'Organisme sauf s'il en est disposé autrement dans le présent courriel." ******************************************************

2 3

[PATCH (3.5)] test_template_compile v2
by Juhász Viktor 30 Aug '13

30 Aug '13

From: Juhasz Viktor <jviktor(a)balabit.hu> test_template_compile unit test is refactorized The assert macros are merged into the assert_compile_template macro This macro fill the expected_elem global variable and checks the current_elem. Therefore we don't need the local expected_element variables and calling the fill_expected_template_element macro This patch based on log-template-refactor branch Signed-off-by: Juhasz Viktor <jviktor(a)balabit.hu> --- tests/unit/test_template_compile.c | 171 +++++++++--------------------------- 1 file changed, 41 insertions(+), 130 deletions(-) diff --git a/tests/unit/test_template_compile.c b/tests/unit/test_template_compile.c index fd6fd50..9378e34 100644 --- a/tests/unit/test_template_compile.c +++ b/tests/unit/test_template_compile.c @@ -26,22 +26,6 @@ Plugin hello_plugin = TEMPLATE_FUNCTION_PLUGIN(hello, "hello"); } \ assert_gint(current_elem->msg_ref, expected.msg_ref, ASSERTION_ERROR("Bad compiled template msg_ref")); -#define assert_value_element(expected) \ - assert_gint(current_elem->type, LTE_VALUE, ASSERTION_ERROR("Bad compiled template type")); \ - assert_common_element(expected); \ - assert_gint(current_elem->value_handle, expected.value_handle, ASSERTION_ERROR("Bad compiled template macro")); - -#define assert_macro_element(expected) \ - assert_gint(current_elem->type, LTE_MACRO, ASSERTION_ERROR("Bad compiled template type")); \ - assert_common_element(expected); \ - assert_gint(current_elem->macro, expected.macro, ASSERTION_ERROR("Bad compiled template macro")); - -#define assert_func_element(expected) \ - assert_gint(current_elem->type, LTE_FUNC, ASSERTION_ERROR("Bad compiled template type")); \ - assert_common_element(expected); \ - assert_gpointer(current_elem->func.ops, expected.func.ops, ASSERTION_ERROR("Bad compiled template macro")); - - #define fill_expected_template_element(element, text, default_value, spec, type, msg_ref) {\ element.text; \ element.default_value; \ @@ -49,6 +33,13 @@ Plugin hello_plugin = TEMPLATE_FUNCTION_PLUGIN(hello, "hello"); element.type; \ element.msg_ref; } +#define assert_compiled_template(text, default_value, spec, type, msg_ref) \ + fill_expected_template_element(expected_elem, text, default_value, spec, type, msg_ref); \ + assert_gint((current_elem->type), (expected_elem.type), ASSERTION_ERROR("Bad compiled template type")); \ + assert_common_element(expected_elem); \ + if ((expected_elem.type) == LTE_MACRO) assert_gint(current_elem->macro, expected_elem.macro, ASSERTION_ERROR("Bad compiled template macro")); \ + if ((expected_elem.type) == LTE_VALUE) assert_gint(current_elem->value_handle, expected_elem.value_handle, ASSERTION_ERROR("Bad compiled template macro")); \ + if ((expected_elem.type) == LTE_FUNC) assert_gpointer(current_elem->func.ops, expected_elem.func.ops, ASSERTION_ERROR("Bad compiled template macro")); \ #define TEMPLATE_TESTCASE(x, ...) do { template_testcase_begin(#x, #__VA_ARGS__); x(__VA_ARGS__); template_testcase_end(); } while(0) @@ -75,6 +66,7 @@ Plugin hello_plugin = TEMPLATE_FUNCTION_PLUGIN(hello, "hello"); static LogTemplate *template; static GList *current_elem_list; static LogTemplateElem *current_elem; +static LogTemplateElem expected_elem; static void select_current_element(void) @@ -121,163 +113,119 @@ assert_failed_template_compile(const gchar *template_string, const gchar *expect static void test_simple_string_literal(void) { - LogTemplateElem expected_element; gchar *text = "Test String"; assert_template_compile(text); - fill_expected_template_element(expected_element, text = text, default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = text, default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_simple_macro(void) { - LogTemplateElem expected_element; - assert_template_compile("${MESSAGE}"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); } static void test_macro_and_text(void) { - LogTemplateElem expected_element; assert_template_compile("${MESSAGE}test value"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); select_next_element(); - fill_expected_template_element(expected_element, text = "test value", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "test value", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_macro_without_braces(void) { - LogTemplateElem expected_element; - assert_template_compile("$MESSAGE"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); } static void test_macro_name_without_braces_are_terminated_with_non_identifier_characters(void) { - LogTemplateElem expected_element; - /* macro names consist of [A-Z0-9_] */ assert_template_compile("$MESSAGE test value"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); select_next_element(); - fill_expected_template_element(expected_element, text = " test value", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = " test value", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_macro_without_at_records_that_no_msgref_was_present_by_msgref_zero(void) { - LogTemplateElem expected_element; - assert_template_compile("${MESSAGE}"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); } static void test_macro_with_at_references_a_single_msg_in_the_context_stack_by_setting_msgref(void) { - LogTemplateElem expected_element; - assert_template_compile("${MESSAGE}@0"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 1); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 1); assert_template_compile("${MESSAGE}@1"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 2); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 2); } static void test_macro_with_invalid_msgref_are_recognized_as_the_top_element_in_the_stack(void) { - LogTemplateElem expected_element; - assert_template_compile("${MESSAGE}(a)gmail.com"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 1); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 1); select_next_element(); - fill_expected_template_element(expected_element, text = "gmail.com", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "gmail.com", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_dollar_prefixed_with_backslash_is_a_literal_dollar(void) { - LogTemplateElem expected_element; - assert_template_compile("Test \\$STRING"); - fill_expected_template_element(expected_element, text = "Test $STRING", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "Test $STRING", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_colon_dash_in_braces_is_parsed_as_default_value(void) { - LogTemplateElem expected_element; - assert_template_compile("${MESSAGE:-default value}"); - fill_expected_template_element(expected_element, text = "", default_value = "default value", macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = "default value", macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); assert_template_compile("${MESSAGE:-}"); - fill_expected_template_element(expected_element, text = "", default_value = "", macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "", default_value = "", macro = M_MESSAGE, type = LTE_MACRO, msg_ref = 0); } static void test_double_dollars_is_a_literal_dollar() { - LogTemplateElem expected_element; - assert_template_compile("$$VALUE_NAME"); - fill_expected_template_element(expected_element, text = "$VALUE_NAME", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "$VALUE_NAME", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); assert_template_compile("$${VALUE_NAME}"); - fill_expected_template_element(expected_element, text = "${VALUE_NAME}", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "${VALUE_NAME}", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_dollar_with_an_invalid_macro_name_without_braces_is_parsed_as_a_literal_dollar(void) { - LogTemplateElem expected_element; - assert_template_compile("$:VALUE_NAME"); - fill_expected_template_element(expected_element, text = "$:VALUE_NAME", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "$:VALUE_NAME", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); assert_template_compile("$"); - fill_expected_template_element(expected_element, text = "$", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "$", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_backslash_without_finishing_the_escape_sequence_is_ignored(void) { - LogTemplateElem expected_element; - assert_template_compile("foo\\"); - fill_expected_template_element(expected_element, text = "foo", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "foo", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void @@ -301,41 +249,29 @@ test_template_compile_macro(void) static void test_simple_value(void) { - LogTemplateElem expected_element; - assert_template_compile("${VALUE_NAME}"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, value_handle = log_msg_get_value_handle("VALUE_NAME"), type = LTE_VALUE, msg_ref = 0); - assert_value_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, value_handle = log_msg_get_value_handle("VALUE_NAME"), type = LTE_VALUE, msg_ref = 0); } static void test_value_without_braces(void) { - LogTemplateElem expected_element; - assert_template_compile("$VALUE_NAME"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, value_handle = log_msg_get_value_handle("VALUE_NAME"), type = LTE_VALUE, msg_ref = 0); - assert_value_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, value_handle = log_msg_get_value_handle("VALUE_NAME"), type = LTE_VALUE, msg_ref = 0); } static void test_backslash_within_braces_is_taken_literally(void) { - LogTemplateElem expected_element; - assert_template_compile("${VALUE\\}NAME}"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, value_handle = log_msg_get_value_handle("VALUE\\"), type = LTE_VALUE, msg_ref = 0); - assert_value_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, value_handle = log_msg_get_value_handle("VALUE\\"), type = LTE_VALUE, msg_ref = 0); } static void test_value_name_can_be_the_empty_string_when_referenced_using_braces(void) { - LogTemplateElem expected_element; - assert_template_compile("${}"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, value_handle = log_msg_get_value_handle(""), type = LTE_VALUE, msg_ref = 0); - assert_value_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, value_handle = log_msg_get_value_handle(""), type = LTE_VALUE, msg_ref = 0); } static void @@ -350,35 +286,25 @@ test_template_compile_value() static void test_simple_template_function(void) { - LogTemplateElem expected_element; - assert_template_compile("$(hello)"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, func.ops = hello_construct(&hello_plugin, configuration, LL_CONTEXT_TEMPLATE_FUNC, "hello"), type = LTE_FUNC, msg_ref = 0); - assert_func_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, func.ops = hello_construct(&hello_plugin, configuration, LL_CONTEXT_TEMPLATE_FUNC, "hello"), type = LTE_FUNC, msg_ref = 0); } static void test_complicated_template_function(void) { - LogTemplateElem expected_element; - assert_template_compile("$( hello \\tes\t\t\t value(xyz) \"value with spaces\" 'test value with spa\"ces')@2"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, func.ops = hello_construct(&hello_plugin, configuration, LL_CONTEXT_TEMPLATE_FUNC, "hello"), type = LTE_FUNC, msg_ref = 3); - assert_func_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, func.ops = hello_construct(&hello_plugin, configuration, LL_CONTEXT_TEMPLATE_FUNC, "hello"), type = LTE_FUNC, msg_ref = 3); } static void test_simple_template_function_with_additional_text(void) { - LogTemplateElem expected_element; - assert_template_compile("$(hello)test value"); - fill_expected_template_element(expected_element, text = "", default_value = NULL, func.ops = hello_construct(&hello_plugin, configuration, LL_CONTEXT_TEMPLATE_FUNC, "hello"), type = LTE_FUNC, msg_ref = 0); - assert_func_element(expected_element); + assert_compiled_template(text = "", default_value = NULL, func.ops = hello_construct(&hello_plugin, configuration, LL_CONTEXT_TEMPLATE_FUNC, "hello"), type = LTE_FUNC, msg_ref = 0); select_next_element(); - fill_expected_template_element(expected_element, text = "test value", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "test value", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void @@ -392,53 +318,38 @@ test_template_compile_func(void) static void test_invalid_macro(void) { - LogTemplateElem expected_element; - assert_failed_template_compile("${MESSAGE", "Invalid macro, '}' is missing, error_pos='9'"); - fill_expected_template_element(expected_element, text = "error in template: ${MESSAGE", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "error in template: ${MESSAGE", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_invalid_subst(void) { - LogTemplateElem expected_element; - assert_failed_template_compile("${MESSAGE:1}", "Unknown substitution function, error_pos='10'"); - fill_expected_template_element(expected_element, text = "error in template: ${MESSAGE:1}", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "error in template: ${MESSAGE:1}", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_template_function_bad1(void) { - LogTemplateElem expected_element; - assert_failed_template_compile("$( hello \\tes\t\t\t value(xyz \"value with spaces\" 'test value with spa\"ces')", "Invalid template function reference, missing function name or inbalanced '(', error_pos='73'"); - fill_expected_template_element(expected_element, text = "error in template: $( hello \\tes\t\t\t value(xyz \"value with spaces\" 'test value with spa\"ces')", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "error in template: $( hello \\tes\t\t\t value(xyz \"value with spaces\" 'test value with spa\"ces')", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_template_function_bad2(void) { - LogTemplateElem expected_element; - assert_failed_template_compile("$( hello \\tes\t\t\t value xyz \"value with spaces\" 'test value with spa\"ces'", "Invalid template function reference, missing function name or inbalanced '(', error_pos='72'"); - fill_expected_template_element(expected_element, text = "error in template: $( hello \\tes\t\t\t value xyz \"value with spaces\" 'test value with spa\"ces'", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "error in template: $( hello \\tes\t\t\t value xyz \"value with spaces\" 'test value with spa\"ces'", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void test_unknown_function(void) { - LogTemplateElem expected_element; - assert_failed_template_compile("$(unknown function)", "Unknown template function unknown"); - fill_expected_template_element(expected_element, text = "error in template: $(unknown function)", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); - assert_macro_element(expected_element); + assert_compiled_template(text = "error in template: $(unknown function)", default_value = NULL, macro = M_NONE, type = LTE_MACRO, msg_ref = 0); } static void -- 1.7.9.5

2 1

syslog conf (off topic)
by Mike Siedelberg 29 Aug '13

29 Aug '13

Hello, this is a bit off topic but I can't find a good syslog list anymore. This has to do with the old original syslog, sorry :-). I like syslog-ng and use it, but we also have AIX hosts to deal with. One of our applications programmers supposedly found this remote syslog config on a site on how to comply with basic security. I can't seem to convince folks here about why this is wrong. When this config is modeled we do get events. Please comment on the correctnes of the syslog.conf lines below. As you can see, all the remote lines point to the same syslog collector. Many thanks. If there is a more appropriate list to go to, please advise, thanks. auth.info @arcsl1 local7.info @arcsl1 local6.info @arcsl1 auth.* @arcsl1 authpriv.* @arcsl1 local7.* @arcsl1

2 1

How to use parsed results from program pattern?
by Daniel Walter 29 Aug '13

29 Aug '13

Hi folks, the documentation (https://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-gui…) states multiple times that program patterns and message patterns work the same way. "You can also use parsers in the program pattern if needed, and use the parsed results later. For example: <pattern>postfix\@ESTRING:.postfix.component:[@</pattern>" I try to achieve exactly this behaviour. But my foobar.pdb (see attachment or http://pastebin.com/aZKMKmkc) seems not to work. I tested it with pdbtool: pdbtool -v test foobar.pdb Testing message program='imapd(foo)' message='connect from 192.168.2.179 (192.168.2.179)' Match name='.classifier.rule_id', value='foobaz', expected='foobaz' Match name='IPA', value='192.168.2.179', expected='192.168.2.179' Match name='IPB', value='192.168.2.179', expected='192.168.2.179' Wrong match name='FOOA', value='', expected='foo' Wrong match name='FOOB', value='', expected='foo' What I am doing wrong? How can I use the parsed results from program pattern later? Tested with syslog version: syslog-ng 3.4.3 Installer-Version: 3.4.3 Revision: ssh+git://algernon@git.balabit/var/scm/git/syslog-ng/syslog-ng-ose--mainline--3.4#no_branch#64d670f3cbfb90769f3c7f0fdd9c70bb9136ec5b Compile-Date: Aug 27 2013 17:55:45 Available-Modules: afsocket-tls,cryptofuncs,affile,afsocket,syslogformat,dbparser,afsocket-notls,basicfuncs,json-plugin,system-source,afmongodb,afamqp,afprog,afuser,confgen,csvparser Enable-Debug: off Enable-GProf: off Enable-Memtrace: off Enable-IPv6: on Enable-Spoof-Source: off Enable-TCP-Wrapper: off Enable-Linux-Caps: on Enable-Pcre: on And: syslog-ng 3.3.9 Installer-Version: 3.3.9 Revision: 3.3.9-1 (/) Compile-Date: May 26 2013 11:36:00 Default-Modules: affile,afprog,afsocket,afuser,afsql,basicfuncs,csvparser,dbparser,syslogformat Available-Modules: afsocket-notls,basicfuncs,confgen,afsocket,convertfuncs,syslogformat,afuser,csvparser,dbparser,affile,afsocket-tls,afprog Enable-Debug: off Enable-GProf: off Enable-Memtrace: off Enable-IPv6: on Enable-Spoof-Source: on Enable-TCP-Wrapper: on Enable-Linux-Caps: on Enable-Pcre: on Best Regards, Daniel

2 1

Re: [syslog-ng] patterndb and intrusion prevention
by Valentijn Sessink 29 Aug '13

29 Aug '13

Hi Florian, Thank you for your explanation. You are using the "program" destination, which works fine. The problem I am experiencing only shows up when using "file" output, as there seems to be a problem with lseek in combination with the proc filesystem. Best regards, Valentijn -- Mobile - hence terse.

2 1

patterndb and intrusion prevention
by Matt Zagrabelny 28 Aug '13

28 Aug '13

Greetings, In 2011, Bazsi posted an entry [1] about a fellow named Valentijn Sessink doing some interesting work with patterndb and the iptables xt_recent module. I am mostly there (following Valentijn's example), but am having issues. Specifically, it does not seem that syslog-ng is writing the IPs to the xt_recent proc "file". Syslog-ng is writing them to a regular log file, though: # cat /proc/net/xt_recent/syslogblock # other-system$ ssh doug@system other-system$ # cat /var/log/syslogblock 2013-07-30 16:26:42 Failed password for invalid user doug from 131.212.109.58 port 37867 ssh2 +131.212.109.58 2013-07-30 16:26:42 Failed password for invalid user doug from 131.212.109.58 port 37867 ssh2 +131.212.109.58 2013-07-30 16:45:26 Failed none for invalid user doug from 131.212.109.58 port 37956 ssh2 +131.212.109.58 # cat /proc/net/xt_recent/syslogblock # I can add the host by hand to the xt_recent file: # echo '+131.212.109.58' > /proc/net/xt_recent/syslogblock # echo '+131.212.109.58' > /proc/net/xt_recent/syslogblock # echo '+131.212.109.58' > /proc/net/xt_recent/syslogblock # cat /proc/net/xt_recent/syslogblock src=131.212.109.58 ttl: 0 last_seen: 5445045124 oldest_pkt: 3 5445044388, 5445044844, 5445045124 The above is the expected output. Here are my configs: $ cat /etc/syslog-ng/conf.d/ssh-failure-iptables-recent-block.conf # a destination; we have a dual destination here, a file to see the # blocked hosts, and an iptables-destination in /proc to block them. destination d_syslogblock { file( "/proc/net/xt_recent/syslogblock" template("+${usracct.device}\n") ); file( "/var/log/syslogblock" template("$YEAR-$MONTH-$DAY $HOUR:$MIN:$SEC $MSG +${usracct.device}\n") ); }; # a parser for the pattern-DB we made in step 1 parser pattern_db { db_parser( file("/var/lib/syslog-ng/patterndb.xml") ); }; # a filter to filter the parser results filter f_syslogblock { tags("secevt") and match( "REJECT" value("secevt.verdict") ); }; # and finally, the log itself: log { source(s_src); parser(pattern_db); filter(f_syslogblock); destination(d_syslogblock); };

3 5

[Bug 155] New: Compilation failure in 3.3.3: the Darwin linker does not accept "--whole-archive"
by bugzilla＠bugzilla.balabit.com 26 Aug '13

26 Aug '13

https://bugzilla.balabit.com/show_bug.cgi?id=155 Summary: Compilation failure in 3.3.3: the Darwin linker does not accept "--whole-archive" Product: syslog-ng Version: 3.3.x Platform: Macintosh OS/Version: Mac OS Status: NEW Severity: normal Priority: unspecified Component: syslog-ng AssignedTo: bazsi(a)balabit.hu ReportedBy: jacknagel(a)gmail.com Type of the Report: bug Estimated Hours: 0.0 Trying to compile 3.3.3 on Mac OS X 10.6.8/XCode 4.2, I get this: libtool: link: /usr/bin/llvm-gcc -std=gnu99 -dynamiclib -o .libs/libsyslog-ng-3.3.3.dylib [...] ld: unknown option: --whole-archive collect2: ld returned 1 exit status some cursory googling reveals that the Darwin linker does not accept "--whole-archive". I'd be happy to help test a patch. -- Configure bugmail: https://bugzilla.balabit.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

1 11