Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

5427 SEC Fixed different XSS issues triggerd from BI aggregation/ rule titles/descriptions

by Lars Michelsen

Module: check_mk Branch: master Commit: d788d1911002db5efd623e43f522e4471d1aa31a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d788d1911002db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 16:18:23 2017 +0200 5427 SEC Fixed different XSS issues triggerd from BI aggregation/rule titles/descriptions Different fields in the BI configuration (titles, ...) could be used to inject JS code into the WATO dialogs and the BI status views. This could be triggered by users with permission to administrate WATO. Change-Id: I5603d0464da058d73a2077ac46c2dbd1824dd9f8 --- .werks/5427 | 13 +++++++++++++ web/htdocs/bi.py | 4 ++-- web/htdocs/table.py | 5 +++++ web/plugins/views/bi.py | 6 +++--- web/plugins/wato/bi.py | 36 ++++++++++++++++++------------------ 5 files changed, 41 insertions(+), 23 deletions(-) diff --git a/.werks/5427 b/.werks/5427 new file mode 100644 index 0000000..9d7ad17 --- /dev/null +++ b/.werks/5427 @@ -0,0 +1,13 @@ +Title: Fixed different XSS issues triggerd from BI aggregation/rule titles/descriptions +Level: 1 +Component: bi +Class: security +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509112079 + +Different fields in the BI configuration (titles, ...) could be used to inject JS code +into the WATO dialogs and the BI status views. This could be triggered by users with +permission to administrate WATO. diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index d8b0aed..e61cc82 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2931,7 +2931,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, if is_leaf: h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") else: - h += tree[2]["title"].replace(" ", " ") + h += html.attrencode(tree[2]["title"].replace(" ", " ")) h += '</span> ' if not is_leaf and not omit_content: @@ -2957,7 +2957,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, css_class = "open" if is_open else "closed" - h += aggr_render_node(tree, tree[2]["title"], show_host, + h += aggr_render_node(tree, html.attrencode(tree[2]["title"]), show_host, mousecode=mc, img_class=css_class) if not is_empty: h += '<ul id="%d:%s" class="subtree %s">' % \ diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 1082814..8e72274 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -50,6 +50,11 @@ def row(*posargs, **kwargs): tables[-1].row(*posargs, **kwargs) +def text_cell(*posargs, **kwargs): + assert tables + tables[-1].text_cell(*posargs, **kwargs) + + def cell(*posargs, **kwargs): assert tables tables[-1].cell(*posargs, **kwargs) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index e6dcafb..539d90a 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -161,14 +161,14 @@ multisite_painters["aggr_group"] = { "title" : _("Aggregation group"), "short" : _("Group"), "columns" : [ "aggr_group" ], - "paint" : lambda row: ("", row["aggr_group"]) + "paint" : lambda row: ("", html.attrencode(row["aggr_group"])) } multisite_painters["aggr_name"] = { "title" : _("Aggregation name"), "short" : _("Aggregation"), "columns" : [ "aggr_name" ], - "paint" : lambda row: ("", row["aggr_name"]) + "paint" : lambda row: ("", html.attrencode(row["aggr_name"])) } multisite_painters["aggr_output"] = { @@ -272,7 +272,7 @@ def paint_aggr_tree_ltr(row, mirror): if not node[2].get("hidden"): leaves += gen_table(node, height - 1, show_host) h = '<div class="aggr tree">' \ - + bi.aggr_render_node(tree, tree[2]["title"], show_host) + "</div>" + + bi.aggr_render_node(tree, html.attrencode(tree[2]["title"]), show_host) + "</div>" if leaves: leaves[0][2].append((len(leaves), h)) return leaves diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 3bcfd17..47e6a59 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -832,7 +832,7 @@ class ModeBI(WatoMode): if not sub_rule_ids: html.open_li() html.open_a(href=edit_url) - html.write(title) + html.write_text(title) html.close_a() html.close_li() else: @@ -910,12 +910,12 @@ class ModeBIPacks(ModeBI): html.icon_button(delete_url, _("Delete this BI pack"), "delete") rules_url = html.makeuri_contextless([("mode", "bi_rules"), ("pack", pack_id)]) html.icon_button(rules_url, _("View and edit the rules and aggregations in this BI pack"), "bi_rules") - table.cell(_("ID"), pack_id) - table.cell(_("Title"), pack["title"]) - table.cell(_("Public"), pack["public"] and _("Yes") or _("No")) - table.cell(_("Aggregations"), len(pack["aggregations"]), css="number") - table.cell(_("Rules"), len(pack["rules"]), css="number") - table.cell(_("Contact groups"), HTML(", ").join(map(self._render_contact_group, pack["contact_groups"]))) + table.text_cell(_("ID"), pack_id) + table.text_cell(_("Title"), pack["title"]) + table.text_cell(_("Public"), pack["public"] and _("Yes") or _("No")) + table.text_cell(_("Aggregations"), len(pack["aggregations"]), css="number") + table.text_cell(_("Rules"), len(pack["rules"]), css="number") + table.text_cell(_("Contact groups"), HTML(", ").join(map(self._render_contact_group, pack["contact_groups"]))) table.end() @@ -1165,22 +1165,22 @@ class ModeBIAggregations(ModeBI): delete_url = html.makeactionuri([("_del_aggr", aggregation_id)]) html.icon_button(delete_url, _("Delete this aggregation"), "delete") - table.cell(_("Nr."), aggregation_id+1, css="number") - table.cell("", css="buttons") + table.text_cell(_("Nr."), aggregation_id+1, css="number") + table.text_cell("", css="buttons") if aggregation["disabled"]: html.icon(_("This aggregation is currently disabled."), "disabled") if aggregation["single_host"]: html.icon(_("This aggregation covers only data from a single host."), "host") - table.cell(_("Groups"), ", ".join(aggregation["groups"])) + table.text_cell(_("Groups"), ", ".join(aggregation["groups"])) ruleid, description = self.rule_called_by_node(aggregation["node"]) edit_url = html.makeuri([("mode", "bi_edit_rule"), ("pack", self._pack_id), ("id", ruleid)]) table.cell(_("Rule Tree"), css="bi_rule_tree") self.render_aggregation_rule_tree(aggregation) - table.cell(_("Note"), description) + table.text_cell(_("Note"), description) table.end() @@ -1387,12 +1387,12 @@ class ModeBIRules(ModeBI): else: html.empty_icon_button() - table.cell(_("Level"), level or "", css="number") - table.cell(_("ID"), html.render_a(rule_id, edit_url)) - table.cell(_("Parameters"), " ".join(rule["params"])) - table.cell(_("Title"), rule["title"]) - table.cell(_("Aggregation"), "/".join([rule["aggregation"][0]] + map(str, rule["aggregation"][1]))) - table.cell(_("Nodes"), len(rule["nodes"]), css="number") + table.text_cell(_("Level"), level or "", css="number") + table.text_cell(_("ID"), html.render_a(rule_id, edit_url)) + table.text_cell(_("Parameters"), " ".join(rule["params"])) + table.text_cell(_("Title"), rule["title"]) + table.text_cell(_("Aggregation"), "/".join([rule["aggregation"][0]] + map(str, rule["aggregation"][1]))) + table.text_cell(_("Nodes"), len(rule["nodes"]), css="number") table.cell(_("Used by")) have_this = set([]) for (aggr_id, aggregation) in aggregations_that_use_rule.get(rule_id, []): @@ -1402,7 +1402,7 @@ class ModeBIRules(ModeBI): html.a(self.aggregation_title(aggregation), href=aggr_url) html.br() have_this.add(aggr_id) - table.cell(_("Comment"), rule.get("comment", "")) + table.text_cell(_("Comment"), rule.get("comment", "")) table.end()

6 years, 10 months

table: Add new helper function to render simple text (escaped)

by Lars Michelsen

Module: check_mk Branch: master Commit: ee71372f09cae99ec404f5e8750c318e4f8b9ec3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee71372f09cae9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 15:12:51 2017 +0200 table: Add new helper function to render simple text (escaped) Change-Id: Iea07fc44a4396700e7ecdc7abfba644d21885c32 --- web/htdocs/table.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index ebdfd42..1082814 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -141,6 +141,11 @@ class Table(object): self.next_args = posargs, kwargs + def text_cell(self, *args, **kwargs): + kwargs["escape_text"] = True + cell(*args, **kwargs) + + def cell(self, *posargs, **kwargs): self.finish_previous() self.next_func = self.add_cell @@ -167,18 +172,24 @@ class Table(object): self.options["collect_headers"] = False - def add_cell(self, title="", text="", css=None, help=None, colspan=None, sortable=True): - if isinstance(text, HTML): - text = "%s" % text - if type(text) != unicode: - text = str(text) + def add_cell(self, title="", text="", css=None, help=None, colspan=None, sortable=True, escape_text=False): + if escape_text: + text = html.permissive_attrencode(text) + else: + if isinstance(text, HTML): + text = "%s" % text + if type(text) != unicode: + text = str(text) + htmlcode = text + html.drain() + if self.options["collect_headers"] == True: # small helper to make sorting introducion easier. Cells which contain # buttons are never sortable if css and 'buttons' in css and sortable: sortable = False self.headers.append((title, css, help, sortable)) + self.rows[-1][0].append((htmlcode, css, colspan))

6 years, 10 months

Fixed wrong signal comment

by Lars Michelsen

Module: check_mk Branch: master Commit: e49cca94df95de18045afa3299bf3f71a257a42b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e49cca94df95de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 11:34:47 2017 +0200 Fixed wrong signal comment Change-Id: Ibc620937eb3be9a407ead142b28a40f2de8cc1ea --- tests/livestatus/test_liveproxyd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 39bfbf5..da8a431 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -3,6 +3,7 @@ import os import time import pytest +import signal from testlib import web @pytest.fixture(scope="module") @@ -43,7 +44,7 @@ def _change_liveproxyd_sites(site, sites): site.execute(["rm", "tmp/run/liveproxy/*"]) # Trigger config reload - os.kill(int(site.read_file("tmp/run/liveproxyd.pid").strip()), 10) # SIGHUP + os.kill(int(site.read_file("tmp/run/liveproxyd.pid").strip()), signal.SIGUSR1) def _all_sockets_opened(): return all([ site.file_exists("tmp/run/liveproxy/%s" % site_id)

6 years, 10 months

liveproxyd: Improved logging of site process startup/termination

by Lars Michelsen

Module: check_mk Branch: master Commit: 43a012bf3e0faf2f9abfc72d19e8a7acc6f04c6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43a012bf3e0faf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 12:06:23 2017 +0200 liveproxyd: Improved logging of site process startup/termination Change-Id: I7dfe22e8d1cb19dd540564f9b3bc1551e3d11025 --- tests/livestatus/test_liveproxyd.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index da8a431..1017f5b 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -40,9 +40,6 @@ def _change_liveproxyd_sites(site, sites): site.write_file("etc/check_mk/liveproxyd.mk", """sites.update(%r)""" % sites) - # Cleanup all existing socket files - site.execute(["rm", "tmp/run/liveproxy/*"]) - # Trigger config reload os.kill(int(site.read_file("tmp/run/liveproxyd.pid").strip()), signal.SIGUSR1)

6 years, 10 months

Fix Win-agent crash when failing to read registry

by Jukka Aro

Module: check_mk Branch: master Commit: 2555cc8a3223e3fe98610a36f64ddbf56f246cd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2555cc8a3223e3… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Oct 27 12:38:54 2017 +0200 Fix Win-agent crash when failing to read registry Windows agent crashed when failing to read perf counters from registry. Throw and catch exceptions when storing configurables instead of returning and storing nullptr's that get never checked afterwards. Broken by the huge refactoring c5ee818358e695b01c2f2dbc05ad0713723a37f8 Change-Id: I897fc158acaf608e8cc96bd2ca403afa95044b57 --- agents/windows/Configurable.h | 14 +++++++++++--- agents/windows/build_version | 2 +- agents/windows/types.cc | 24 +++++++++--------------- agents/windows/types.h | 6 ++++++ 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/agents/windows/Configurable.h b/agents/windows/Configurable.h index 3ffd712..043879d 100644 --- a/agents/windows/Configurable.h +++ b/agents/windows/Configurable.h @@ -89,7 +89,11 @@ public: virtual void startBlock() { _block_mode.startBlock(_values); } virtual void feed(const std::string &, const std::string &value) override { - this->add(from_string<DataT>(_winapi, value)); + try { + this->add(from_string<DataT>(_winapi, value)); + } catch (const StringConversionError &e) { + std::cerr << e.what() << std::endl; + } } virtual void output(const std::string &key, @@ -158,8 +162,12 @@ public: key = std::string(var.begin() + pos + 1, var.end()); } startBlock(); - _add_mode.add(_values, - std::make_pair(key, from_string<DataT>(_winapi, value))); + try { + _add_mode.add(_values, std::make_pair(key, from_string<DataT>( + _winapi, value))); + } catch (const StringConversionError &e) { + std::cerr << e.what() << std::endl; + } } virtual void output(const std::string &key, diff --git a/agents/windows/build_version b/agents/windows/build_version index 1648816..ce89b3e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2990 +2992 diff --git a/agents/windows/types.cc b/agents/windows/types.cc index 806c3e2..4fe4e5d 100644 --- a/agents/windows/types.cc +++ b/agents/windows/types.cc @@ -88,22 +88,18 @@ mrpe_entry *from_string<mrpe_entry *>(const WinApiAdaptor &winapi, } if (command_line.empty()) { - fprintf(stderr, - "Invalid command specification for mrpe:\r\n" - "Format: SERVICEDESC COMMANDLINE\r\n"); - return nullptr; + throw StringConversionError( + "Invalid command specification for mrpe:\r\n" + "Format: SERVICEDESC COMMANDLINE"); } if (winapi.PathIsRelative(command_line.c_str())) { Environment *env = Environment::instance(); - if (env != nullptr) { - snprintf(result->command_line, sizeof(result->command_line), - "%s\\%s", env->agentDirectory().c_str(), - lstrip(command_line.c_str())); - } else { - fprintf(stderr, "No environment\n"); - return nullptr; + if (env == nullptr) { + throw StringConversionError("No environment"); } + snprintf(result->command_line, sizeof(result->command_line), "%s\\%s", + env->agentDirectory().c_str(), lstrip(command_line.c_str())); } else { strncpy(result->command_line, command_line.c_str(), sizeof(result->command_line)); @@ -150,10 +146,8 @@ winperf_counter *from_string<winperf_counter *>(const WinApiAdaptor &winapi, result->id = PerfCounterObject::resolve_counter_name(winapi, base_id.c_str()); if (result->id == -1) { - fprintf(stderr, - "No matching performance counter id found for %s.\n", - value.c_str()); - return nullptr; + throw StringConversionError( + "No matching performance counter id found for " + value); } } diff --git a/agents/windows/types.h b/agents/windows/types.h index 61e3c2f..c25d614 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -82,6 +82,12 @@ static const unsigned int SECTION_WINPERF = SECTION_WINPERF_IF | SECTION_WINPERF_CPU | SECTION_WINPERF_PHYDISK | SECTION_WINPERF_CONFIG; +class StringConversionError : public std::invalid_argument { +public: + explicit StringConversionError(const std::string &what) + : std::invalid_argument(what) {} +}; + template <typename T> T from_string(const WinApiAdaptor &winapi, const std::string &input);

6 years, 10 months

Renamed BlobColumn::getBlob() to getValue() for consistency with other column types.

by Sven Panne

Module: check_mk Branch: master Commit: 55fa603065ad2ac539ee18f031d41149b91b716d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fa603065ad2a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 11:43:41 2017 +0200 Renamed BlobColumn::getBlob() to getValue() for consistency with other column types. Change-Id: Ic2c3c75420ef2f336e5ee86ce8c55439edcb006b --- livestatus/src/BlobColumn.cc | 2 +- livestatus/src/BlobColumn.h | 3 ++- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 2 +- livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/HostFileColumn.h | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/livestatus/src/BlobColumn.cc b/livestatus/src/BlobColumn.cc index 00908de..001278f 100644 --- a/livestatus/src/BlobColumn.cc +++ b/livestatus/src/BlobColumn.cc @@ -29,7 +29,7 @@ void BlobColumn::output(Row row, RowRenderer &r, const contact * /* auth_user */) const { - if (std::unique_ptr<std::vector<char>> blob = getBlob(row)) { + if (std::unique_ptr<std::vector<char>> blob = getValue(row)) { r.output(*blob); } else { r.output(Null()); diff --git a/livestatus/src/BlobColumn.h b/livestatus/src/BlobColumn.h index 451b948..ba1d0b9 100644 --- a/livestatus/src/BlobColumn.h +++ b/livestatus/src/BlobColumn.h @@ -43,6 +43,7 @@ public: int offset) : Column(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) {} + ColumnType type() const override { return ColumnType::blob; } void output(Row row, RowRenderer &r, @@ -51,7 +52,7 @@ public: std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; - virtual std::unique_ptr<std::vector<char>> getBlob(Row row) const = 0; + virtual std::unique_ptr<std::vector<char>> getValue(Row row) const = 0; }; #endif // BlobColumn_h diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index b5efd20..eadcde3 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -61,7 +61,7 @@ public: extra_extra_offset, offset) , _blob(std::move(blob)) {} - std::unique_ptr<std::vector<char>> getBlob( + std::unique_ptr<std::vector<char>> getValue( Row /* unused */) const override { return std::make_unique<std::vector<char>>(_blob.begin(), _blob.end()); }; diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index c4ccedf..c201343 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -49,7 +49,7 @@ HostFileColumn::HostFileColumn(const std::string& name, , _base_dir(std::move(base_dir)) , _suffix(std::move(suffix)) {} -std::unique_ptr<std::vector<char>> HostFileColumn::getBlob(Row row) const { +std::unique_ptr<std::vector<char>> HostFileColumn::getValue(Row row) const { if (_base_dir.empty()) { return nullptr; // Path is not configured } diff --git a/livestatus/src/HostFileColumn.h b/livestatus/src/HostFileColumn.h index 27b562e..d122c98 100644 --- a/livestatus/src/HostFileColumn.h +++ b/livestatus/src/HostFileColumn.h @@ -39,7 +39,7 @@ public: int extra_extra_offset, int offset, std::string base_dir, std::string suffix); - std::unique_ptr<std::vector<char>> getBlob(Row row) const override; + std::unique_ptr<std::vector<char>> getValue(Row row) const override; private: std::string _base_dir;

6 years, 10 months

Removed useless override.

by Sven Panne

Module: check_mk Branch: master Commit: 89df6dba239707bd70cbb9fde2d9ec17951b2377 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89df6dba239707… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 12:03:14 2017 +0200 Removed useless override. Change-Id: I499e7ec2e8767c004a33897601bde6b4db09cee8 --- livestatus/src/HostListColumn.cc | 7 ------- livestatus/src/HostListColumn.h | 6 ------ 2 files changed, 13 deletions(-) diff --git a/livestatus/src/HostListColumn.cc b/livestatus/src/HostListColumn.cc index afe57e9..d0a10db 100644 --- a/livestatus/src/HostListColumn.cc +++ b/livestatus/src/HostListColumn.cc @@ -25,8 +25,6 @@ #include "HostListColumn.h" #include <algorithm> #include <iterator> -#include "Filter.h" -#include "ListFilter.h" #include "Renderer.h" #include "Row.h" @@ -56,11 +54,6 @@ void HostListColumn::output(Row row, RowRenderer &r, } } -std::unique_ptr<Filter> HostListColumn::createFilter( - RelationalOperator relOp, const std::string &value) const { - return std::make_unique<ListFilter>(*this, relOp, value); -} - std::vector<std::string> HostListColumn::getValue( Row row, const contact *auth_user) const { auto members = getMembers(row, auth_user); diff --git a/livestatus/src/HostListColumn.h b/livestatus/src/HostListColumn.h index d205979..b625d43 100644 --- a/livestatus/src/HostListColumn.h +++ b/livestatus/src/HostListColumn.h @@ -26,13 +26,10 @@ #define HostListColumn_h #include "config.h" // IWYU pragma: keep -#include <memory> #include <string> #include <vector> #include "ListColumn.h" #include "contact_fwd.h" -#include "opids.h" -class Filter; enum class HostState; class MonitoringCore; class Row; @@ -52,9 +49,6 @@ public: void output(Row row, RowRenderer &r, const contact *auth_user) const override; - std::unique_ptr<Filter> createFilter( - RelationalOperator relOp, const std::string &value) const override; - std::vector<std::string> getValue(Row row, const contact *auth_user) const override;

6 years, 10 months

5351 check_http: Use HTTPS instead of HTTP in service description for SSL/ TLS connections

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 8e915562f24a44a2899c0fa875cf979f48fd9b24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e915562f24a44… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Oct 26 15:34:43 2017 +0200 5351 check_http: Use HTTPS instead of HTTP in service description for SSL/TLS connections For Check HTTP checks the service description now uses HTTPS instead of HTTP if a connection via SSL/TLS is used. This makes it easy to distinguish if a Check uses HTTP or HTTPS for a connection. This feature is automatically enabled for new Check_MK installations. If you upgrade an existing Check_MK installation you have to enable it in the global settings via the option "Use new service descriptions" in the section "Execution of checks". Be aware that the change may effect existing rules, performance data (if present), and the availability history. Change-Id: Ic4a67be14196935b6b2c564175b66136d70cd4d8 --- .werks/5351 | 20 ++++++++++++++++++++ checks/check_http | 14 +++++++++++--- cmk_base/config.py | 15 +++++++++++++-- web/htdocs/wato.py | 1 + web/plugins/wato/active_checks.py | 3 ++- web/plugins/wato/check_mk_configuration.py | 1 + 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/.werks/5351 b/.werks/5351 new file mode 100644 index 0000000..c2d5e94 --- /dev/null +++ b/.werks/5351 @@ -0,0 +1,20 @@ +Title: check_http: Use HTTPS instead of HTTP in service description for SSL/TLS connections +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1509024010 +Class: feature + +For Check HTTP checks the service description now uses HTTPS instead of +HTTP if a connection via SSL/TLS is used. This makes it easy to distinguish +if a Check uses HTTP or HTTPS for a connection. + +This feature is automatically enabled for new Check_MK installations. +If you upgrade an existing Check_MK installation you have to enable it +in the global settings via the option "Use new service descriptions" +in the section "Execution of checks". Be aware that the change may effect +existing rules, performance data (if present), and the availability +history. + diff --git a/checks/check_http b/checks/check_http index aaa6e27..85d3232 100644 --- a/checks/check_http +++ b/checks/check_http @@ -157,10 +157,18 @@ def check_http_arguments(params): def check_http_desc(params): - if params[0].startswith("^"): - return params[0][1:] + description, settings = params + + if description.startswith("^"): + return description[1:] + + # here we have to cover connection and certificate checks + if settings.get("ssl") or settings.get("cert_days"): + protocol = "HTTPS" + else: + protocol = "HTTP" - return "HTTP %s" % params[0] + return "%s %s" % (protocol, description) active_check_info['http'] = { diff --git a/cmk_base/config.py b/cmk_base/config.py index cca564a..6d73d15 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -1050,13 +1050,24 @@ def service_description(hostname, check_type, item): return get_final_service_description(hostname, descr) +_old_active_check_service_descriptions = { + "http": lambda params: (params[0][1:] if params[0].startswith("^") + else "HTTP %s" % params[0]) +} + + def active_check_service_description(hostname, active_check_type, params): import cmk_base.checks as checks if active_check_type not in checks.active_check_info: return "Unimplemented check %s" % active_check_type - act_info = checks.active_check_info[active_check_type] - description = act_info["service_description"](params) + if (active_check_type in _old_active_check_service_descriptions and + active_check_type not in use_new_descriptions_for): + description = _old_active_check_service_descriptions[active_check_type](params) + else: + act_info = checks.active_check_info[active_check_type] + description = act_info["service_description"](params) + description = description.replace('$HOSTNAME$', hostname) return get_final_service_description(hostname, description) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1243d97..a8b2069 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14698,6 +14698,7 @@ def create_sample_config(): "nullmailer_mailq", "barracuda_mailqueues", "qmail_stats", + "http", ], "enable_rulebased_notifications": True, } diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 95e2f83..1e23127 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -864,7 +864,8 @@ register_rule(group, TextUnicode( title = _("Name"), help = _("Will be used in the service description. If the name starts with " - "a caret (<tt>^</tt>), the service description will not be prefixed with <tt>HTTP</tt>." ), + "a caret (<tt>^</tt>), the service description will not be prefixed with either " + "<tt>HTTP</tt> or <tt>HTTPS</tt>." ), allow_empty = False), Alternative( title = _("Mode of the Check"), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 4d05751..c94682e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1270,6 +1270,7 @@ register_configvar(group, ( "nullmailer_mailq", _("Nullmailer: Mail Queue")), ( "barracuda_mailqueues", _("Barracuda: Mail Queue")), ( "qmail_stats", _("Qmail: Mail Queue")), + ( "http", _("Check HTTP: Use HTTPS instead of HTTP for SSL/TLS connectoins")), ], render_orientation = "vertical", ),

6 years, 10 months

Removed useless parameter.

by Sven Panne

Module: check_mk Branch: master Commit: 9266f91d029eb35d210c4a8ab964076a7b33195a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9266f91d029eb3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 11:15:07 2017 +0200 Removed useless parameter. Change-Id: Id7b2e325762edc8c2464a6c4d5ff1f80e270e8fe --- livestatus/src/ServiceListColumn.cc | 4 ++-- livestatus/src/ServiceListColumn.h | 4 +--- livestatus/src/TableHosts.cc | 8 ++++---- livestatus/src/TableServiceGroups.cc | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/livestatus/src/ServiceListColumn.cc b/livestatus/src/ServiceListColumn.cc index 8b8c849..8ab12f9 100644 --- a/livestatus/src/ServiceListColumn.cc +++ b/livestatus/src/ServiceListColumn.cc @@ -49,11 +49,11 @@ void ServiceListColumn::output(Row row, RowRenderer &r, if ((auth_user == nullptr) || is_authorized_for(_mc, auth_user, svc->host_ptr, svc)) { // show only service name => no sublist - if (!_show_host && _info_depth == 0) { + if (!_hostname_required && _info_depth == 0) { l.output(std::string(svc->description)); } else { SublistRenderer s(l); - if (_show_host) { + if (_hostname_required) { s.output(std::string(svc->host_name)); } s.output(std::string(svc->description)); diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index 68e65ca..0359541 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -47,12 +47,11 @@ public: ServiceListColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, int offset, MonitoringCore *mc, - bool hostname_required, bool show_host, int info_depth) + bool hostname_required, int info_depth) : Column(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) , _mc(mc) , _hostname_required(hostname_required) - , _show_host(show_host) , _info_depth(info_depth) {} ColumnType type() const override { return ColumnType::list; }; void output(Row row, RowRenderer &r, @@ -70,7 +69,6 @@ public: private: MonitoringCore *_mc; bool _hostname_required; - bool _show_host; int _info_depth; #ifndef CMC diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 31693e8..52480e4 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -613,22 +613,22 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc, table->addColumn(std::make_unique<ServiceListColumn>( prefix + "services", "A list of all services of the host", indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services), - table->core(), false, false, 0)); + table->core(), false, 0)); table->addColumn(std::make_unique<ServiceListColumn>( prefix + "services_with_state", "A list of all services of the host together with state and has_been_checked", indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services), - table->core(), false, false, 1)); + table->core(), false, 1)); table->addColumn(std::make_unique<ServiceListColumn>( prefix + "services_with_info", "A list of all services including detailed information about each service", indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services), - table->core(), false, false, 2)); + table->core(), false, 2)); table->addColumn(std::make_unique<ServiceListColumn>( prefix + "services_with_fullstate", "A list of all services including full state information. The list of entries can grow in future versions.", indirect_offset, extra_offset, -1, DANGEROUS_OFFSETOF(host, services), - table->core(), false, false, 3)); + table->core(), false, 3)); table->addColumn(std::make_unique<MetricsColumn>( prefix + "metrics", diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc index 97f2267..2e86492 100644 --- a/livestatus/src/TableServiceGroups.cc +++ b/livestatus/src/TableServiceGroups.cc @@ -70,12 +70,12 @@ void TableServiceGroups::addColumns(Table *table, const std::string &prefix, prefix + "members", "A list of all members of the service group as host/service pairs", indirect_offset, -1, -1, DANGEROUS_OFFSETOF(servicegroup, members), - table->core(), true, true, 0)); + table->core(), true, 0)); table->addColumn(std::make_unique<ServiceListColumn>( prefix + "members_with_state", "A list of all members of the service group with state and has_been_checked", indirect_offset, -1, -1, DANGEROUS_OFFSETOF(servicegroup, members), - table->core(), true, true, 1)); + table->core(), true, 1)); table->addColumn(std::make_unique<ServiceListStateColumn>( prefix + "worst_service_state",

6 years, 10 months

5425 FIX Fixed broken bookmark list management for users with non ascii characters in User IDs

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b16078877c203908b9e2fc750ce5444479681c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b16078877c203… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 27 10:14:10 2017 +0200 5425 FIX Fixed broken bookmark list management for users with non ascii characters in User IDs Change-Id: Ic7ddd70e310fa708be8273c96180a242f4a21c8f --- .werks/5425 | 11 +++++++++++ web/htdocs/pagetypes.py | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/5425 b/.werks/5425 new file mode 100644 index 0000000..65351c3 --- /dev/null +++ b/.werks/5425 @@ -0,0 +1,11 @@ +Title: Fixed broken bookmark list management for users with non ascii characters in User IDs +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509091834 + + diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 989fbb5..1510f52 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -715,10 +715,10 @@ class Overridable(Base): cls.add_instance(("", name), new_page) # Now scan users subdirs for files "user_$type_name.mk" - subdirs = os.listdir(config.config_dir) - for user in subdirs: + for user in os.listdir(config.config_dir): + user = user.decode("utf-8") try: - path = "%s/%s/user_%ss.mk" % (config.config_dir, user, cls.type_name()) + path = "%s/%s/user_%ss.mk" % (config.config_dir, user.encode("utf-8"), cls.type_name()) if not os.path.exists(path): continue @@ -1026,7 +1026,7 @@ class Overridable(Base): cls.remove_instance((owner_user_id, page_name)) # will be added later again else: # clone title = cls.phrase("clone") - load_user = html.var("load_user") # FIXME: Change varname to "owner" + load_user = html.var_utf8("load_user") # FIXME: Change varname to "owner" page = cls.instance((load_user, page_name)) page_dict = page.internal_representation()

6 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017