[checkmk-commits] Move regex validator PS check to plugins/wato/check_parameters.py

Module: check_mk Branch: master Commit: f998ae9bccd19823672f29002bbbf108ed2cacfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f998ae9bccd198… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 19 14:08:22 2018 +0100 Move regex validator PS check to plugins/wato/check_parameters.py Change-Id: Ib6b6b01e4ff0a04f38bc1506de8787aa12f8ff59 --- cmk/gui/plugins/wato/check_parameters.py | 18 ++++++++++++++++-- cmk/regex.py | 14 -------------- tests/unit/checks/test_ps.py | 13 ------------- .../unit/cmk/gui/plugins/wato/test_check_parameters.py | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 1699ab7..ff04da8 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -24,8 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import re import cmk.defines as defines -import cmk.regex as regex from cmk.gui.plugins.wato.active_checks import check_icmp_params @@ -1380,6 +1380,20 @@ def convert_inventory_processes(old_dict): return new_dict +def forbid_re_delimiters_inside_groups(pattern, varprefix): + # Used as input validation in PS check wato config + group_re = r'\(.*?\)' + for match in re.findall(group_re, pattern): + for char in ['\\b', '$', '^']: + if char in match: + raise MKUserError( + varprefix, + _('"%s" is not allowed inside the regular expression group %s. ' + 'Bounding characters inside groups will vanish after discovery, ' + 'because processes are instanced for every matching group. ' + 'Thus enforce delimiters outside the group.') % (char, match)) + + register_rule( group + '/' + subgroup_inventory, varname="inventory_processes_rules", @@ -1426,7 +1440,7 @@ register_rule( RegExp( size=50, mode=RegExp.prefix, - validate=regex.forbid_re_delimiters_inside_groups, + validate=forbid_re_delimiters_inside_groups, ), title=_("Regular expression matching command line"), label=_("Command line:"), diff --git a/cmk/regex.py b/cmk/regex.py index b24526a..83750c0 100644 --- a/cmk/regex.py +++ b/cmk/regex.py @@ -68,17 +68,3 @@ def escape_regex_chars(match): r += "\\" r += c return r - - -def forbid_re_delimiters_inside_groups(pattern, varprefix): - # Used as input validation in PS check wato config - group_re = r'\(.*?\)' - for match in re.findall(group_re, pattern): - for char in ['\\b', '$', '^']: - if char in match: - raise MKUserError( - varprefix, - _('"%s" is not allowed inside the regular expression group %s. ' - 'Bounding characters inside groups will vanish after discovery, ' - 'because processes are instanced for every matching group. ' - 'Thus enforce delimiters outside the group.') % (char, match)) diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index 1916640..849325f 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -1,8 +1,6 @@ from collections import namedtuple import pytest from cmk_base.check_api import MKGeneralException -from cmk.gui.exceptions import MKUserError -from cmk.regex import forbid_re_delimiters_inside_groups from checktestlib import CheckResult, assertCheckResultsEqual pytestmark = pytest.mark.checks @@ -592,17 +590,6 @@ def test_check_ps_common_count(check_manager, levels, reference): assertCheckResultsEqual(output, reference) -(a)pytest.mark.parametrize('pattern'ern', ["(test)$", 'foo\\b', '^bar', '\\bfoo\\b', '(a)\\b']) -def test_validate_ps_allowed_regex(pattern): - assert forbid_re_delimiters_inside_groups(pattern, '') is None - - -(a)pytest.mark.parametrize('pattern'ern', ["(test$)", '(foo\\b)', '(^bar)', '(\\bfoo\\b)']) -def test_validate_ps_forbidden_regex(pattern): - with pytest.raises(MKUserError): - forbid_re_delimiters_inside_groups(pattern, '') - - def test_subset_patterns(check_manager): check = check_manager.get_check("ps") diff --git a/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py b/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py new file mode 100644 index 0000000..afe72e3 --- /dev/null +++ b/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py @@ -0,0 +1,14 @@ +import pytest +from cmk.gui.exceptions import MKUserError +from cmk.gui.plugins.wato.check_parameters import forbid_re_delimiters_inside_groups + + +(a)pytest.mark.parametrize('pattern'ern', ["(test)$", 'foo\\b', '^bar', '\\bfoo\\b', '(a)\\b']) +def test_validate_ps_allowed_regex(pattern): + assert forbid_re_delimiters_inside_groups(pattern, '') is None + + +(a)pytest.mark.parametrize('pattern'ern', ["(test$)", '(foo\\b)', '(^bar)', '(\\bfoo\\b)']) +def test_validate_ps_forbidden_regex(pattern): + with pytest.raises(MKUserError): + forbid_re_delimiters_inside_groups(pattern, '')