Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

View JSON export: Fixed possible encoding issue when

by Lars Michelsen

Module: check_mk Branch: master Commit: 1e21f21724d191de3521e64e5e4d7ac8a1c3f639 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e21f21724d191… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 28 12:45:40 2017 +0200 View JSON export: Fixed possible encoding issue when Change-Id: I20b31f0b8890ec4153fe6d6d7eb07a41fc51453e --- web/plugins/views/webservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 3a5fc9a..ef9c675 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -88,7 +88,7 @@ def render_json(rows, view, group_cells, cells, num_columns, show_checkboxes, ex if type(content) == unicode: content = content.encode("utf-8") else: - content = str(content) + content = "%s" % content content = html.strip_tags(content.replace("<br>","\n")) painted_row.append(content)

7 years, 7 months

4473 FIX agent_hp_msa: HP MSA agent no longer throws ssl validation errors

by Andreas Boesl

Module: check_mk Branch: master Commit: d4e245fce7a4e703cc4883031396b36cdd086146 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4e245fce7a4e7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 28 10:44:49 2017 +0200 4473 FIX agent_hp_msa: HP MSA agent no longer throws ssl validation errors Starting with python 2.7.9, strict ssl certificate checking was introduced. This werk simply deactivates this check again. Change-Id: Ica4f78cb4f2b7d4336cabe5db234f405e036ceb7 --- .werks/4473 | 11 +++++++++++ agents/special/agent_hp_msa | 35 +++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/.werks/4473 b/.werks/4473 new file mode 100644 index 0000000..7971ba9 --- /dev/null +++ b/.werks/4473 @@ -0,0 +1,11 @@ +Title: agent_hp_msa: HP MSA agent no longer throws ssl validation errors +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493368821 +Class: fix + +Starting with python 2.7.9, strict ssl certificate checking was introduced. +This werk simply deactivates this check again. diff --git a/agents/special/agent_hp_msa b/agents/special/agent_hp_msa index 0157c9c..ea073ab 100755 --- a/agents/special/agent_hp_msa +++ b/agents/special/agent_hp_msa @@ -25,7 +25,15 @@ # Boston, MA 02110-1301 USA. -import getopt, sys, socket, urllib2, traceback, re, hashlib +import getopt, sys, socket, traceback, re, hashlib + +import requests +try: + from requests.packages.urllib3.exceptions import InsecureRequestWarning + requests.packages.urllib3.disable_warnings(InsecureRequestWarning) +except: + pass + def usage(): sys.stderr.write("""Check_MK HP MSA Agent @@ -162,37 +170,31 @@ class HTMLObjectParser(HTMLParser): parser = HTMLObjectParser() + + try: + session = requests.Session() # Login login_hash = hashlib.md5() login_hash.update("%s_%s" % (username, password)) login_url = "https://%s/v3/api/login/%s" % (host_address, login_hash.hexdigest()) socket.setdefaulttimeout(opt_timeout) - req = urllib2.Request(login_url) - handle = urllib2.urlopen(req) - contents = handle.read() + r = session.get(login_url, verify=False) # Extract sessionKey - session_key = re.match('.*"response">(.*?)<.*', contents).groups()[0] - - headers = { - 'User-agent': 'Check_MK agent_hp_msa', - 'sessionKey': session_key, - } + session_key = re.match('.*"response">(.*?)<.*', r.text).groups()[0] + session.headers.update({"sessionKey": session_key, + "User-agent": "Check_MK agent_hp_msa"}) # Query objects for element in api_get_objects: show_url = "https://%s/v3/api/show/%s" % (host_address, element) - req = urllib2.Request(show_url, None, headers) - handle = urllib2.urlopen(req) - - contents = handle.read() - parser.feed(contents) + parser.feed(session.get(show_url, verify=False).text) # Output sections for section, lines in sections.items(): print "<<<hp_msa_%s>>>" % section - print "\n".join(lines) + print "\n".join(map(lambda x: x.encode("utf-8"), lines)) except Exception, e: if opt_debug: @@ -204,3 +206,4 @@ except Exception, e: sys.stderr.write("Connection error: %s" % e) sys.exit(1) +

7 years, 7 months

Tests with daily version: Delete package after deleting

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ecc0f6f448bc9f23a32119af89de257b28b1299 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ecc0f6f448bc9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 28 10:11:25 2017 +0200 Tests with daily version: Delete package after deleting Change-Id: I99eb08ac564b61dacb8d9a09f11a3b7b1201d4d7 --- tests/testlib/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 6160dfa..c1c20a9 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -159,6 +159,8 @@ class CMKVersion(object): if os.system(cmd) >> 8 != 0: raise Exception("Failed to install package: %s" % temp_package_path) + os.unlink(temp_package_path) + assert self.is_installed()

7 years, 7 months

Minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 24165123cfcdaa9f4de02ae1a043e4b237116e3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24165123cfcdaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 28 08:42:35 2017 +0200 Minor cleanups Change-Id: Ibdf6c063d380047bf00e106efb893bec00df7d61 --- web/htdocs/wato.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 776670e..5d076c1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11003,32 +11003,29 @@ def mode_edit_user(phase): # Contact groups forms.header(_("Contact Groups"), isopen=False) forms.section() - url1 = folder_preserving_link([("mode", "contact_groups")]) - url2 = folder_preserving_link([("mode", "rulesets"), ("group", "grouping")]) + groups_page_url = folder_preserving_link([("mode", "contact_groups")]) + group_assign_url = folder_preserving_link([("mode", "rulesets"), ("group", "grouping")]) if len(contact_groups) == 0: html.write(_("Please first create some <a href='%s'>contact groups</a>") % - url1) + groups_page_url) else: - entries = [ (group['alias'], c) for c, group in contact_groups.items() ] - entries.sort() + entries = sorted([ (group['alias'], c) for c, group in contact_groups.items() ]) is_member_of_at_least_one = False for alias, gid in entries: if not alias: alias = gid + if not is_locked('contactgroups'): html.checkbox("cg_" + gid, gid in user.get("contactgroups", [])) - url = folder_preserving_link([("mode", "edit_contact_group"), ("edit", gid)]) - html.a(alias, href=url) - html.br() else: is_member = gid in user.get("contactgroups", []) if is_member: is_member_of_at_least_one = True - url = folder_preserving_link([("mode", "edit_contact_group"), ("edit", gid)]) - html.a(alias, href=url) - html.br() + html.hidden_field("cg_" + gid, '1' if is_member else '') - html.hidden_field("cg_" + gid, is_member and '1' or '') + url = folder_preserving_link([("mode", "edit_contact_group"), ("edit", gid)]) + html.a(alias, href=url) + html.br() if is_locked('contactgroups') and not is_member_of_at_least_one: html.i(_('No contact groups assigned.')) @@ -11038,7 +11035,8 @@ def mode_edit_user(phase): "then first <a href='%s'>do so</a>. Hosts and services can be " "assigned to contact groups using <a href='%s'>rules</a>.<br><br>" "If you do not put the user into any contact group " - "then no monitoring contact will be created for the user.") % (url1, url2)) + "then no monitoring contact will be created for the user.") % + (groups_page_url, group_assign_url)) forms.header(_("Notifications"), isopen=False) if not rulebased_notifications:

7 years, 7 months

4627 FIX apc_symmetra: Fix bogus 100000000 A battery current occurring on some devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: f24ae397b0d82ca258f3d6cc79f553fc736e602c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f24ae397b0d82c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Apr 27 15:25:43 2017 +0200 4627 FIX apc_symmetra: Fix bogus 100000000 A battery current occurring on some devices Some APC Symmetra devices react badly to OIDs being polled out of order, leading to a 1000000000 A being displayed in the check that cannot be seen in an SNMP walk. The OIDs of this check have been reordered to circumvent this problem. Change-Id: I22622b01513f63190c1200350b03808fbd68a887 --- .werks/4627 | 13 +++++++++++++ checks/apc_symmetra | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/4627 b/.werks/4627 new file mode 100644 index 0000000..eefffe7 --- /dev/null +++ b/.werks/4627 @@ -0,0 +1,13 @@ +Title: apc_symmetra: Fix bogus 100000000 A battery current occurring on some devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1493298932 + +Some APC Symmetra devices react badly to OIDs being polled out of order, leading to +a 1000000000 A being displayed in the check that cannot be seen in an SNMP walk. +The OIDs of this check have been reordered to circumvent this problem. diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 8c86b17..4a1ef0b 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -67,9 +67,9 @@ def parse_apc_symmetra(info): return parsed # some numeric fields may be empty - battery_status, output_status, state_output_state, battery_capacity, \ + battery_status, output_status, battery_capacity, \ battery_replace, battery_num_batt_packs, battery_time_remain, calib_result, \ - last_diag_date, battery_temp, battery_current = info[0] + last_diag_date, battery_temp, battery_current, state_output_state = info[0] if state_output_state != '': # string contains a bitmask, convert to int @@ -245,10 +245,11 @@ check_info['apc_symmetra'] = { "inventory_function" : inventory_apc_symmetra, "check_function" : check_apc_symmetra, "service_description" : "APC Symmetra status", + # A Note on the order of OIDs: If the 11.1.1.0 is not the last to be polled, + # this leads to bogus values for some other OIDs on some devices. "snmp_info" : (".1.3.6.1.4.1.318.1.1.1", [ "2.1.1.0", # PowerNet-MIB::upsBasicBatteryStatus, "4.1.1.0", # PowerNet-MIB::upsBasicOutputStatus, - "11.1.1.0", # PowerNet-MIB::upsBasicStateOutputState "2.2.1.0", # PowerNet-MIB::upsAdvBatteryCapacity, "2.2.4.0", # PowerNet-MIB::upsAdvBatteryReplaceIndicator, "2.2.6.0", # PowerNet-MIB::upsAdvBatteryNumOfBadBattPacks, @@ -257,6 +258,7 @@ check_info['apc_symmetra'] = { "7.2.4.0", # PowerNet-MIB::upsLastDiagnosticsDate "2.2.2.0", # PowerNet-MIB::upsAdvBatteryTemperature, "2.2.9.0", # PowerNet-MIB::upsAdvBatteryCurrent, + "11.1.1.0", # PowerNet-MIB::upsBasicStateOutputState ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "has_perfdata" : True,

7 years, 7 months

4639 bintec_cpu: Added CPU utilization to bintec devices

by Marcel Arentz

Module: check_mk Branch: master Commit: 88453696a6c0814e09ef48997cc5da3f29db8ce3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88453696a6c081… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Apr 27 11:19:37 2017 +0200 4639 bintec_cpu: Added CPU utilization to bintec devices Change-Id: I07132514e039a41bac5a335fceaf6379263a7f3c --- .werks/4639 | 10 ++++++ checkman/bintec_cpu | 12 ++++++++ checks/bintec_cpu | 68 +++++++++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 12 ++++++++ 4 files changed, 102 insertions(+) diff --git a/.werks/4639 b/.werks/4639 new file mode 100644 index 0000000..f088c3a --- /dev/null +++ b/.werks/4639 @@ -0,0 +1,10 @@ +Title: bintec_cpu: Added CPU utilization to bintec devices +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493284746 +Class: feature + + diff --git a/checkman/bintec_cpu b/checkman/bintec_cpu new file mode 100644 index 0000000..3d5412a --- /dev/null +++ b/checkman/bintec_cpu @@ -0,0 +1,12 @@ +title: Bintec Devices: CPU Utilization +agents: snmp +catalog: os/kernel +license: GPL +distribution: check_mk +description: + This check measures the CPU utilization during the last check cycle. Levels can + be set on the total utilization. Additionally levels can be set for a high + utilization over an extended period of time. + +inventory: + Creates one check per host if the data is provided by device diff --git a/checks/bintec_cpu b/checks/bintec_cpu new file mode 100644 index 0000000..693eb4d --- /dev/null +++ b/checks/bintec_cpu @@ -0,0 +1,68 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +# Diese OIDs liefern nicht die LOAD, wie man annehmen könnte, sondern die +# UTILIZATION, da ausschließlich die Auslastung der CPU berücksichtigt wird. +# .1.3.6.1.4.1.272.4.17.4.1.1.15.1.0 5 --> BIANCA-BRICK-MIBRES-MIB::CpuLoadUser60s.1.0 +# .1.3.6.1.4.1.272.4.17.4.1.1.16.1.0 1 --> BIANCA-BRICK-MIBRES-MIB::CpuLoadSystem60s.1.0 +# .1.3.6.1.4.1.272.4.17.4.1.1.17.1.0 9 --> BIANCA-BRICK-MIBRES-MIB::CpuLoadStreams60s.1.0 + + +def inventory_bintec_cpu(info): + if info: + return [(None, {})] + + +def check_bintec_cpu(_no_item, params, info): + user = float(info[0][0]) + system = float(info[0][1]) + streams = float(info[0][2]) + util = user + system + streams + + for res in check_cpu_util(util, params): + state, infotext, perfdata = res + #print + yield state, "total: %s" % infotext, perfdata + + yield 0, "user: %.1f%%, system: %.1f%%, streams: %.1f%%" % \ + (user, system, streams), [ ("streams", "%.3f" % streams), ] + + +check_info['bintec_cpu'] = { + 'inventory_function' : inventory_bintec_cpu, + 'check_function' : check_bintec_cpu, + 'service_description' : 'CPU utilization', + 'snmp_info' : ('.1.3.6.1.4.1.272.4.17.4.1.1', [ + "15", # cpuLoadUser60s + "16", # cpuLoadSystem60s + "17", # cpuLoadStreams60s + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.272.4."), + 'has_perfdata' : True, + 'group' : 'cpu_utilization_os', + 'includes' : [ 'cpu_util.include' ], +} diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fe22acb..fae8c2c 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -375,6 +375,12 @@ metric_info["lifetime_remaining"] = { "color" : "#80f000", } +metric_info["streams"] = { + "title" : _("Streams"), + "unit" : "%", + "color" : "35/a", +} + metric_info["cache_hit_ratio"] = { "title" : _("Cache hit ratio"), "unit" : "%", @@ -5126,6 +5132,12 @@ perfometer_info.append({ perfometer_info.append({ "type" : "linear", + "segments" : [ "user", "system", "streams" ], + "total" : 100.0, +}) + +perfometer_info.append({ + "type" : "linear", "segments" : [ "citrix_load" ], "total" : 100.0, })

7 years, 7 months

Fixed linking of our SUID executables, which was broken recently.

by Sven Panne

Module: check_mk Branch: master Commit: e0aade379841f643d66da59d8a71d68426f4b677 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0aade379841f6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 27 09:24:21 2017 +0200 Fixed linking of our SUID executables, which was broken recently. The detection of the right RRD library is a bit tricky: We can't simply put -lrrd_th or -lrrd globally into LIBS. The problem is that our SUID programs icmpsender and icmpreceiver would be linked with that option, too, but because of security reasons the dynamic linker will ignore our LD_LIBRARY_PATH => no RRD library found or even the wrong one... :-/ Change-Id: I136227050e7fd1c3ba4fa354e56b1d85314ac11c --- configure.ac | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b2d2965..2238308 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,19 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(socket, connect) AC_CHECK_LIB(socket, shutdown) -AC_SEARCH_LIBS([rrd_xport], [rrd_th rrd], [], [AC_MSG_ERROR([unable to find the rrd_xport function])]) + +# The detection of the right RRD library is a bit tricky: We can't simply put +# -lrrd_th or -lrrd globally into LIBS. The problem is that our SUID programs +# icmpsender and icmpreceiver would be linked with that option, too, but because +# of security reasons the dynamic linker will ignore our LD_LIBRARY_PATH => no +# RRD library found or even the wrong one... :-/ +RRDLIB= +old_LIBS=$LIBS +AC_SEARCH_LIBS([rrd_xport], [rrd_th rrd], + [test "$ac_cv_search_rrd_xport" = "none required" || RRDLIB="$ac_cv_search_rrd_xport"], + [AC_MSG_ERROR([unable to find the rrd_xport function])]) +LIBS=$old_LIBS +AC_SUBST(RRDLIB) # Checks for header files. AC_HEADER_DIRENT

7 years, 7 months

Added html.render_javascript.

by Roland Halbig

Module: check_mk Branch: master Commit: 8e351d25d8140c1b32b35630c8396291059c1de7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e351d25d8140c… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Apr 26 16:15:50 2017 +0200 Added html.render_javascript. Change-Id: I4b1610d4df8cd0d74de5bbcbbdb8cddab1d72755 --- web/htdocs/htmllib.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5d8c01a..244c921 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -759,8 +759,12 @@ class HTMLGenerator(OutputFunnel): # + def render_javascript(self, code): + return HTML("<script type=\"text/javascript\">\n%s\n</script>\n" % code) + + def javascript(self, code): - self.write_html("<script type=\"text/javascript\">\n%s\n</script>\n" % code) + self.write_html(self.render_javascript(code)) def javascript_file(self, src):

7 years, 7 months

Small change in comment.

by Roland Halbig

Module: check_mk Branch: master Commit: df5f08fdaa6c3e422667b2ca20102e80bd6c086c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df5f08fdaa6c3e… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 15 13:06:40 2017 +0100 Small change in comment. Change-Id: I8f535efeba7b4608209c7b2a310a6b3d652ce7b4 --- web/htdocs/sidebar.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index ba48b4c..d9abb4a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -464,7 +464,8 @@ def ajax_snapin(): with html.plugged(): try: - # For testing purposes only: raise Exception("Test") + # For testing purposes uncomment: + # raise Exception("Test") snapin["render"]() except Exception, e: write_snapin_exception(e)

7 years, 7 months

refactoring htmllib: escaping and encodings via member object calls.

by Roland Halbig

Module: check_mk Branch: master Commit: c6b46606eedc7c5a561f3dd0b65f4778f9b6564b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6b46606eedc7c… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Apr 20 13:27:02 2017 +0200 refactoring htmllib: escaping and encodings via member object calls. Change-Id: I49654704d9a55a1d3bd49ee224809f100b410838 --- web/htdocs/htmllib.py | 84 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 29 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 90e1364..5d8c01a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -111,7 +111,7 @@ class Escaper(object): # For example: replace '"' with '"', '<' with '<'. # This code is slow. Works on str and unicode without changing # the type. Also works on things that can be converted with '%s'. - def _escape_attribute(self, value): + def escape_attribute(self, value): attr_type = type(value) if value is None: return '' @@ -133,12 +133,12 @@ class Escaper(object): # This is useful for messages where we want to keep formatting # options. (Formerly known as 'permissive_attrencode') """ # for the escaping functions - def _escape_text(self, text): + def escape_text(self, text): if isinstance(text, HTML): return "%s" % text # This is HTML code which must not be escaped - text = self._escape_attribute(text) + text = self.escape_attribute(text) text = self._unescaper_text.sub(r'<\1\2>', text) # Also repair link definitions text = self._unescaper_href.sub(r'<a href="\1">', text) @@ -151,21 +151,6 @@ class Escaper(object): # - # Encode HTML attributes: replace " with ", also replace - # < and >. This code is slow. Works on str and unicode without - # changing the type. Also works on things that can be converted - # with %s. - def attrencode(self, value): - return self._escape_attribute(value) - - - # Only strip off some tags. We allow some simple tags like - # <b>, <tt>, <i> to be part of the string. This is useful - # for messages where we still want to have formating options. - def permissive_attrencode(self, obj): - return self._escape_text(obj) - - #. # # HTML encoding @@ -522,7 +507,7 @@ class OutputFunnel(object): # '----------------------------------------------------------------------' -class HTMLGenerator(Escaper, OutputFunnel): +class HTMLGenerator(OutputFunnel): """ Usage Notes: @@ -581,6 +566,9 @@ class HTMLGenerator(Escaper, OutputFunnel): self.testing_mode = False + self.escaper = Escaper() + + # # Rendering @@ -618,14 +606,14 @@ class HTMLGenerator(Escaper, OutputFunnel): if v is None: continue - k = self._escape_attribute(k.rstrip('_')) + k = self.escaper.escape_attribute(k.rstrip('_')) if v == '': options.append(k) continue if not isinstance(v, list): - v = self._escape_attribute(v) + v = self.escaper.escape_attribute(v) else: if k == "class": sep = ' ' @@ -634,7 +622,7 @@ class HTMLGenerator(Escaper, OutputFunnel): else: sep = '_' - v = sep.join([a for a in (self._escape_attribute(vi) for vi in v) if a]) + v = sep.join([a for a in (self.escaper.escape_attribute(vi) for vi in v) if a]) if sep.startswith(';'): v = re.sub(';+', ';', v) @@ -672,7 +660,7 @@ class HTMLGenerator(Escaper, OutputFunnel): if isinstance(tag_content, HTML): tag += tag_content.lstrip(' ').rstrip('\n') else: - tag += self._escape_text(tag_content) + tag += self.escaper.escape_text(tag_content) tag += "</%s>" % (tag_name) @@ -726,7 +714,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def write_text(self, text): """ Write text. Highlighting tags such as h2|b|tt|i|br|pre|a|sup|p|li|ul|ol are not escaped. """ - self.write(self._escape_text(text)) + self.write(self.escaper.escape_text(text)) def write_html(self, content): @@ -1356,13 +1344,10 @@ class RequestHandler(object): # '----------------------------------------------------------------------' -class html(HTMLGenerator, Encoder, RequestHandler): +class html(HTMLGenerator, RequestHandler): def __init__(self): super(html, self).__init__() -# HTMLGenerator.__init__(self) -# Encoder.__init__(self) -# RequestHandler.__init__(self) # rendering state self.html_is_open = False @@ -1420,6 +1405,10 @@ class html(HTMLGenerator, Encoder, RequestHandler): # FIXME: Drop this self.auto_id = 0 + # encoding + self.encoder = Encoder() + + RETURN = 13 SHIFT = 16 CTRL = 17 @@ -1428,6 +1417,43 @@ class html(HTMLGenerator, Encoder, RequestHandler): F1 = 112 + # + # Encoding + # + + def urlencode_vars(self, vars): + return self.encoder.urlencode_vars(vars) + + def urlencode(self, value): + return self.encoder.urlencode(value) + + # Escape a variable name so that it only uses allowed charachters for URL variables + def varencode(self, varname): + return self.encoder.varencode(varname) + + def u8(self, c): + return self.encoder.u8(c) + + def utf8_to_entities(self, text): + return self.encoder.utf8_to_entities(text) + + + # + # escaping - deprecated functions + # + # Encode HTML attributes: e.g. replace '"' with '"', '<' and '>' with '<' and '>' + def attrencode(self, value): + return self.escaper.escape_attribute(value) + + # Only strip off some tags. We allow some simple tags like <b> or <tt>. + def permissive_attrencode(self, obj): + return self.escaper.escape_text(obj) + + + # + # Stripping + # + # remove all HTML-tags def strip_tags(self, ht): @@ -2563,7 +2589,7 @@ class html(HTMLGenerator, Encoder, RequestHandler): id_ = id self._context_button(title, url, icon=icon, hot=hot, id_=id_, bestof=bestof, hover_title=hover_title, fkey=fkey, class_=class_) if fkey and self.keybindings_enabled: - self.add_keybinding([self.F1 + (fkey - 1)], "document.location='%s';" % self._escape_attribute(url)) + self.add_keybinding([self.F1 + (fkey - 1)], "document.location='%s';" % self.escaper.escape_attribute(url)) def _context_button(self, title, url, icon=None, hot=False, id_=None, bestof=None, hover_title=None, fkey=None, class_=None):

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017