Module: check_mk
Branch: master
Commit: 72997abe02dd19214bb5db20c5d99c0e71671751
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72997abe02dd19…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 17 18:01:06 2013 +0100
FIX Better error handling for invalid service regex in rule conditions
Previous versions of the rule editor in WATO did not check whether or not
the regular expressions provided for matching services are valid. This
change adds a regular expression validation.
---
.bugs/890 | 7 +++++--
.werks/385 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 6 ++++--
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/.bugs/890 b/.bugs/890
index 30f064f..c0dafa6 100644
--- a/.bugs/890
+++ b/.bugs/890
@@ -1,11 +1,14 @@
Title: Better error handling for invalid regex in rule
Component: core
-State: open
+Class: nastiness
+State: done
Date: 2013-06-03 14:18:36
Targetversion: 1.2.3
-Class: nastiness
If you enter e.g. H:\ into the "Mount Point" of the df-Rule then cmk -C
crashes with an exception.
Can we make a validator here?
+
+2013-12-17 17:58:48: changed state open -> done
+Added RegExp validation to all service related fields in rule conditions.
diff --git a/.werks/385 b/.werks/385
new file mode 100644
index 0000000..ddded24
--- /dev/null
+++ b/.werks/385
@@ -0,0 +1,10 @@
+Title: Better error handling for invalid service regex in rule conditions
+Level: 2
+Component: wato
+Version: 1.2.5i1
+Date: 1387299554
+Class: fix
+
+Previous versions of the rule editor in WATO did not check whether or not
+the regular expressions provided for matching services are valid. This
+change adds a regular expression validation.
diff --git a/ChangeLog b/ChangeLog
index f541473..b3e0cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,7 @@
* 0341 FIX: Avoid rare exception in WATO when deleting a host...
* 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now
* 0346 FIX: Fix folder visibility in WATO for unpriviledged users...
+ * 0385 FIX: Better error handling for invalid service regex in rule conditions...
Notifications:
* 0362 sms: now searching PATH for sendsms and smssend commands...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 4518ff6..3c22d8c 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -11654,7 +11654,9 @@ def get_rule_conditions(ruleset):
itemspec = ListChoice(choices = itemenum, columns = 3)
item_list = [ x+"$" for x in
itemspec.from_html_vars("item") ]
else:
- vs = ListOfStrings(valuespec = ruleset["itemspec"])
+ vs = ListOfStrings(valuespec = RegExpUnicode(
+ title = ruleset["itemspec"].title(),
+ ))
item_list = vs.from_html_vars("itemlist")
vs.validate_value(item_list, "itemlist")
@@ -11892,7 +11894,7 @@ def mode_edit_rule(phase, new = False):
else:
ListOfStrings(
orientation = "horizontal",
- valuespec = TextAscii(size = 30)).render_input("itemlist",
item_list)
+ valuespec = RegExpUnicode(size =
30)).render_input("itemlist", item_list)
html.write("<br><br>")
html.help(_("The entries here are regular expressions to match the
beginning. "