[checkmk-commits] Check_MK Git: check_mk: FIX Allowing "-" chars in var names again

Module: check_mk Branch: master Commit: 6630e5148d15128d2929d524098eda623145e892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6630e5148d1512… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 6 16:23:36 2013 +0100 FIX Allowing "-" chars in var names again In last i-releases, we introduced a feature which checks for invalid URL variable names. It filters out variable names which contain unwanted chars. The "-" is not evil and should be allowed again. --- .werks/46 | 11 +++++++++++ ChangeLog | 5 +++-- web/htdocs/html_mod_python.py | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/46 b/.werks/46 new file mode 100644 index 0000000..9ef505a --- /dev/null +++ b/.werks/46 @@ -0,0 +1,11 @@ +Title: Allowing "-" chars in var names again +Level: 2 +Component: multisite +Version: 1.2.3i7 +Date: 1383751261 +Class: fix + +In last i-releases, we introduced a feature which checks +for invalid URL variable names. It filters out variable +names which contain unwanted chars. The "-" is not evil +and should be allowed again. diff --git a/ChangeLog b/ChangeLog index 64fa31d..1694c8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 1.2.3i7: Checks & Agents: - * 0060: cisco_fantray: new check for monitoring fan trays of Cisco Nexus switches... - * 0061: cisco_cpu: check now recognizes new object cpmCPUTotal5minRev... + * 0060 cisco_fantray: new check for monitoring fan trays of Cisco Nexus switches... + * 0061 cisco_cpu: check now recognizes new object cpmCPUTotal5minRev... * 0024 FIX: cisco_wlc: removed configuration parameter ap_model... Multisite: @@ -10,6 +10,7 @@ * 0043 FIX: LDAP: Improved error reporting during synchronisation... * 0044 FIX: LDAP: Fixed error with empty groups during non nested group sync... * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles... + * 0046 FIX: Allowing "-" chars in var names again... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index fd8a17a..f50d8ad 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -3,7 +3,7 @@ import htmllib import os, time, config, weblib, re import defaults -varname_regex = re.compile('^[\w\d_.%+]+$') +varname_regex = re.compile('^[\w\d_.%+-]+$') class html_mod_python(htmllib.html):