Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 79538afe157b2b983071e81e132660effa199a83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79538afe157b2b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 3 13:36:10 2017 +0100 Mark IntColumn::getValue() call sites. This is an intermediate step to improve time zone handling. Tiny cleanup on the way. Change-Id: I835d46334a5da0a7ddf2d644134b744d3a970b9b --- livestatus/src/AttributeListAsIntColumn.cc | 12 +++++++----- livestatus/src/AttributeListAsIntColumn.h | 3 +-- livestatus/src/AttributeListColumn.cc | 4 ++-- livestatus/src/IntAggregator.cc | 1 + livestatus/src/IntColumn.cc | 1 + livestatus/src/IntFilter.cc | 1 + livestatus/src/TimeColumn.cc | 1 + 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/livestatus/src/AttributeListAsIntColumn.cc b/livestatus/src/AttributeListAsIntColumn.cc index 583d346..7b5db62 100644 --- a/livestatus/src/AttributeListAsIntColumn.cc +++ b/livestatus/src/AttributeListAsIntColumn.cc @@ -88,12 +88,14 @@ int32_t AttributeListAsIntColumn::getValue( } std::vector<std::string> AttributeListAsIntColumn::getAttributes( - Row row, const contact *auth_user) const { - modified_atttibutes values(getValue(row, auth_user)); + Row row) const { std::vector<std::string> attributes; - for (const auto &entry : known_attributes) { - if (values[entry.second]) { - attributes.push_back(entry.first); + if (auto p = columnData<unsigned long>(row)) { + modified_atttibutes values(*p); + for (const auto &entry : known_attributes) { + if (values[entry.second]) { + attributes.push_back(entry.first); + } } } return attributes; diff --git a/livestatus/src/AttributeListAsIntColumn.h b/livestatus/src/AttributeListAsIntColumn.h index 80be7ba..ddfd4b0 100644 --- a/livestatus/src/AttributeListAsIntColumn.h +++ b/livestatus/src/AttributeListAsIntColumn.h @@ -50,8 +50,7 @@ public: int32_t getValue(Row row, const contact *auth_user) const override; - std::vector<std::string> getAttributes(Row row, - const contact *auth_user) const; + std::vector<std::string> getAttributes(Row row) const; }; #endif // AttributeListAsIntColumn_h diff --git a/livestatus/src/AttributeListColumn.cc b/livestatus/src/AttributeListColumn.cc index 60c0d7d..0deafa9 100644 --- a/livestatus/src/AttributeListColumn.cc +++ b/livestatus/src/AttributeListColumn.cc @@ -34,7 +34,7 @@ std::unique_ptr<Filter> AttributeListColumn::createFilter( } std::vector<std::string> AttributeListColumn::getValue( - Row row, const contact *auth_user, + Row row, const contact * /*auth_user*/, std::chrono::seconds /*timezone_offset*/) const { - return _int_view_column.getAttributes(row, auth_user); + return _int_view_column.getAttributes(row); } diff --git a/livestatus/src/IntAggregator.cc b/livestatus/src/IntAggregator.cc index 4043f53..4cbc93b 100644 --- a/livestatus/src/IntAggregator.cc +++ b/livestatus/src/IntAggregator.cc @@ -32,6 +32,7 @@ void IntAggregator::consume(Row row, const contact *auth_user, std::chrono::seconds /* timezone_offset */) { _count++; + // NOTE: IntColumn::getValue() call site int32_t value = _column->getValue(row, auth_user); switch (getOperation()) { case StatsOperation::sum: diff --git a/livestatus/src/IntColumn.cc b/livestatus/src/IntColumn.cc index f7ab6a7..737e8bb 100644 --- a/livestatus/src/IntColumn.cc +++ b/livestatus/src/IntColumn.cc @@ -31,6 +31,7 @@ void IntColumn::output(Row row, RowRenderer &r, const contact *auth_user, std::chrono::seconds /*timezone_offset*/) const { + // NOTE: IntColumn::getValue() call site r.output(getValue(row, auth_user)); } diff --git a/livestatus/src/IntFilter.cc b/livestatus/src/IntFilter.cc index 42e5100..8683f18 100644 --- a/livestatus/src/IntFilter.cc +++ b/livestatus/src/IntFilter.cc @@ -47,6 +47,7 @@ int32_t IntFilter::convertRefValue(std::chrono::seconds timezone_offset) const { bool IntFilter::accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const { + // NOTE: IntColumn::getValue() call site int32_t act_value = _column.getValue(row, auth_user); int32_t ref_value = convertRefValue(timezone_offset); switch (_relOp) { diff --git a/livestatus/src/TimeColumn.cc b/livestatus/src/TimeColumn.cc index 0ebca0d..cc262ce 100644 --- a/livestatus/src/TimeColumn.cc +++ b/livestatus/src/TimeColumn.cc @@ -32,6 +32,7 @@ void TimeColumn::output(Row row, RowRenderer &r, const contact *auth_user, std::chrono::seconds /*timezone_offset*/) const { + // NOTE: IntColumn::getValue() call site r.output(std::chrono::system_clock::from_time_t(getValue(row, auth_user))); }

6 years, 10 months

Removed superfluous class.

by Sven Panne

Module: check_mk Branch: master Commit: 74258f5b8d6de9f53b09afc43e88eed6edbc4719 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74258f5b8d6de9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 3 13:07:48 2017 +0100 Removed superfluous class. Change-Id: I3e716cccaf7935d4a922a74b4f37f5b877c53da5 --- livestatus/src/Makefile.am | 1 - livestatus/src/ServiceGroupMembersColumn.cc | 24 ++++++++++++-- livestatus/src/ServiceGroupMembersFilter.cc | 50 ----------------------------- livestatus/src/ServiceGroupMembersFilter.h | 41 ----------------------- 4 files changed, 22 insertions(+), 94 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 02f4a58..a4ce651 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -103,7 +103,6 @@ liblivestatus_a_SOURCES = \ RendererPython3.cc \ ServiceContactsColumn.cc \ ServiceGroupMembersColumn.cc \ - ServiceGroupMembersFilter.cc \ ServiceGroupsColumn.cc \ ServiceListColumn.cc \ ServiceListStateColumn.cc \ diff --git a/livestatus/src/ServiceGroupMembersColumn.cc b/livestatus/src/ServiceGroupMembersColumn.cc index 15c0a2c..e597d61 100644 --- a/livestatus/src/ServiceGroupMembersColumn.cc +++ b/livestatus/src/ServiceGroupMembersColumn.cc @@ -25,10 +25,12 @@ #include "ServiceGroupMembersColumn.h" #include <algorithm> #include <iterator> +#include <ostream> #include "Filter.h" +#include "ListFilter.h" +#include "Logger.h" #include "Renderer.h" #include "Row.h" -#include "ServiceGroupMembersFilter.h" #ifdef CMC #include "Host.h" @@ -54,9 +56,27 @@ void ServiceGroupMembersColumn::output( } } +namespace { +// value must be of the form +// hostname hostservice_separator service_description +std::string checkValue(Logger *logger, RelationalOperator relOp, + const std::string &value) { + auto pos = value.find(ServiceGroupMembersColumn::separator()); + bool equality = relOp == RelationalOperator::equal || + relOp == RelationalOperator::not_equal; + if (pos == std::string::npos && !(equality && value.empty())) { + Informational(logger) + << "Invalid reference value for service list membership. Must be 'hostname" + << ServiceGroupMembersColumn::separator() << "servicename'"; + } + return value; +} +} // namespace + std::unique_ptr<Filter> ServiceGroupMembersColumn::createFilter( RelationalOperator relOp, const std::string &value) const { - return std::make_unique<ServiceGroupMembersFilter>(*this, relOp, value); + return std::make_unique<ListFilter>(*this, relOp, + checkValue(logger(), relOp, value)); } std::vector<std::string> ServiceGroupMembersColumn::getValue( diff --git a/livestatus/src/ServiceGroupMembersFilter.cc b/livestatus/src/ServiceGroupMembersFilter.cc deleted file mode 100644 index efbe79b..0000000 --- a/livestatus/src/ServiceGroupMembersFilter.cc +++ /dev/null @@ -1,50 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | Copyright Mathias Kettner 2014 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. - -#include "ServiceGroupMembersFilter.h" -#include <ostream> -#include "Logger.h" -#include "ServiceGroupMembersColumn.h" - -namespace { -// value must be of the form -// hostname hostservice_separator service_description -std::string checkValue(Logger *logger, RelationalOperator relOp, - const std::string &value) { - auto pos = value.find(ServiceGroupMembersColumn::separator()); - bool equality = relOp == RelationalOperator::equal || - relOp == RelationalOperator::not_equal; - if (pos == std::string::npos && !(equality && value.empty())) { - Informational(logger) - << "Invalid reference value for service list membership. Must be 'hostname" - << ServiceGroupMembersColumn::separator() << "servicename'"; - } - return value; -} -} // namespace - -ServiceGroupMembersFilter::ServiceGroupMembersFilter( - const ServiceGroupMembersColumn &column, RelationalOperator relOp, - const std::string &value) - : ListFilter(column, relOp, checkValue(column.logger(), relOp, value)) {} diff --git a/livestatus/src/ServiceGroupMembersFilter.h b/livestatus/src/ServiceGroupMembersFilter.h deleted file mode 100644 index 2af9acc..0000000 --- a/livestatus/src/ServiceGroupMembersFilter.h +++ /dev/null @@ -1,41 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | Copyright Mathias Kettner 2014 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. - -#ifndef ServiceGroupMembersFilter_h -#define ServiceGroupMembersFilter_h - -#include "config.h" // IWYU pragma: keep -#include <string> -#include "ListFilter.h" -#include "opids.h" -class ServiceGroupMembersColumn; - -class ServiceGroupMembersFilter : public ListFilter { -public: - ServiceGroupMembersFilter(const ServiceGroupMembersColumn &column, - RelationalOperator relOp, - const std::string &value); -}; - -#endif // ServiceGroupMembersFilter_h

6 years, 10 months

Moved bit fiddling to the right class.

by Sven Panne

Module: check_mk Branch: master Commit: 715b35bc6ce090b1cc38d41b966dfc1737b4bb32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=715b35bc6ce090… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 3 12:05:35 2017 +0100 Moved bit fiddling to the right class. Change-Id: I934d2530072f20819ff603fa096ce1b53d47f186 --- livestatus/src/AttributeListAsIntColumn.cc | 66 +++++++++++++++++++++++++++--- livestatus/src/AttributeListAsIntColumn.h | 6 ++- livestatus/src/AttributeListColumn.cc | 62 ++-------------------------- livestatus/src/AttributeListColumn.h | 3 -- 4 files changed, 69 insertions(+), 68 deletions(-) diff --git a/livestatus/src/AttributeListAsIntColumn.cc b/livestatus/src/AttributeListAsIntColumn.cc index 2c87b42..583d346 100644 --- a/livestatus/src/AttributeListAsIntColumn.cc +++ b/livestatus/src/AttributeListAsIntColumn.cc @@ -23,22 +23,78 @@ // Boston, MA 02110-1301 USA. #include "AttributeListAsIntColumn.h" +#include <bitset> +#include <cctype> +#include <map> #include <memory> -#include "AttributeListColumn.h" +#include <ostream> +#include <utility> #include "Filter.h" #include "IntFilter.h" +#include "Logger.h" #include "Row.h" +#include "strutil.h" + +namespace { +// see MODATTR_FOO in nagios/common.h +std::map<std::string, unsigned long> known_attributes = { + {"notifications_enabled", 0}, {"active_checks_enabled", 1}, + {"passive_checks_enabled", 2}, {"event_handler_enabled", 3}, + {"flap_detection_enabled", 4}, {"failure_prediction_enabled", 5}, + {"performance_data_enabled", 6}, {"obsessive_handler_enabled", 7}, + {"event_handler_command", 8}, {"check_command", 9}, + {"normal_check_interval", 10}, {"retry_check_interval", 11}, + {"max_check_attempts", 12}, {"freshness_checks_enabled", 13}, + {"check_timeperiod", 14}, {"custom_variable", 15}, + {"notification_timeperiod", 16}}; + +using modified_atttibutes = std::bitset<32>; + +std::string refValueFor(const std::string &value, Logger *logger) { + if (isdigit(value[0]) != 0) { + return value; + } + + std::vector<char> value_vec(value.begin(), value.end()); + value_vec.push_back('\0'); + char *scan = &value_vec[0]; + + modified_atttibutes values; + for (const char *t; (t = next_token(&scan, ',')) != nullptr;) { + auto it = known_attributes.find(t); + if (it == known_attributes.end()) { + Informational(logger) + << "Ignoring invalid value '" << t << "' for attribute list"; + continue; + } + values[it->second] = true; + } + return std::to_string(values.to_ulong()); +} +} // namespace std::unique_ptr<Filter> AttributeListAsIntColumn::createFilter( RelationalOperator relOp, const std::string &value) const { - return std::make_unique<IntFilter>( - *this, relOp, AttributeListColumn::refValueFor(value, logger())); + return std::make_unique<IntFilter>(*this, relOp, + refValueFor(value, logger())); } -int32_t AttributeListAsIntColumn::getValue(Row row, - const contact * /*unused*/) const { +int32_t AttributeListAsIntColumn::getValue( + Row row, const contact * /*auth_user*/) const { if (auto p = columnData<unsigned long>(row)) { return static_cast<int32_t>(*p); } return 0; } + +std::vector<std::string> AttributeListAsIntColumn::getAttributes( + Row row, const contact *auth_user) const { + modified_atttibutes values(getValue(row, auth_user)); + std::vector<std::string> attributes; + for (const auto &entry : known_attributes) { + if (values[entry.second]) { + attributes.push_back(entry.first); + } + } + return attributes; +} diff --git a/livestatus/src/AttributeListAsIntColumn.h b/livestatus/src/AttributeListAsIntColumn.h index 7c43835..80be7ba 100644 --- a/livestatus/src/AttributeListAsIntColumn.h +++ b/livestatus/src/AttributeListAsIntColumn.h @@ -29,6 +29,7 @@ #include <cstdint> #include <memory> #include <string> +#include <vector> #include "IntColumn.h" #include "contact_fwd.h" #include "opids.h" @@ -44,12 +45,13 @@ public: : IntColumn(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) {} - /// API of Column std::unique_ptr<Filter> createFilter(RelationalOperator, const std::string &) const override; - // API of IntColumn int32_t getValue(Row row, const contact *auth_user) const override; + + std::vector<std::string> getAttributes(Row row, + const contact *auth_user) const; }; #endif // AttributeListAsIntColumn_h diff --git a/livestatus/src/AttributeListColumn.cc b/livestatus/src/AttributeListColumn.cc index 30494a9..60c0d7d 100644 --- a/livestatus/src/AttributeListColumn.cc +++ b/livestatus/src/AttributeListColumn.cc @@ -23,72 +23,18 @@ // Boston, MA 02110-1301 USA. #include "AttributeListColumn.h" -#include <bitset> -#include <cctype> -#include <map> #include <memory> -#include <ostream> -#include <utility> #include <vector> #include "Filter.h" -#include "Logger.h" #include "Row.h" -#include "strutil.h" - -namespace { -// see MODATTR_FOO in nagios/common.h -std::map<std::string, unsigned long> known_attributes = { - {"notifications_enabled", 0}, {"active_checks_enabled", 1}, - {"passive_checks_enabled", 2}, {"event_handler_enabled", 3}, - {"flap_detection_enabled", 4}, {"failure_prediction_enabled", 5}, - {"performance_data_enabled", 6}, {"obsessive_handler_enabled", 7}, - {"event_handler_command", 8}, {"check_command", 9}, - {"normal_check_interval", 10}, {"retry_check_interval", 11}, - {"max_check_attempts", 12}, {"freshness_checks_enabled", 13}, - {"check_timeperiod", 14}, {"custom_variable", 15}, - {"notification_timeperiod", 16}}; - -using modified_atttibutes = std::bitset<32>; -} // namespace - -std::vector<std::string> AttributeListColumn::getValue( - Row row, const contact *auth_user, - std::chrono::seconds /*timezone_offset*/) const { - modified_atttibutes values(_int_view_column.getValue(row, auth_user)); - std::vector<std::string> attributes; - for (const auto &entry : known_attributes) { - if (values[entry.second]) { - attributes.push_back(entry.first); - } - } - return attributes; -} std::unique_ptr<Filter> AttributeListColumn::createFilter( RelationalOperator relOp, const std::string &value) const { return _int_view_column.createFilter(relOp, value); } -// static -std::string AttributeListColumn::refValueFor(const std::string &value, - Logger *logger) { - if (isdigit(value[0]) != 0) { - return value; - } - - std::vector<char> value_vec(value.begin(), value.end()); - value_vec.push_back('\0'); - char *scan = &value_vec[0]; - - modified_atttibutes values; - for (const char *t; (t = next_token(&scan, ',')) != nullptr;) { - auto it = known_attributes.find(t); - if (it == known_attributes.end()) { - Informational(logger) - << "Ignoring invalid value '" << t << "' for attribute list"; - continue; - } - values[it->second] = true; - } - return std::to_string(values.to_ulong()); +std::vector<std::string> AttributeListColumn::getValue( + Row row, const contact *auth_user, + std::chrono::seconds /*timezone_offset*/) const { + return _int_view_column.getAttributes(row, auth_user); } diff --git a/livestatus/src/AttributeListColumn.h b/livestatus/src/AttributeListColumn.h index 984900b..1ad2855 100644 --- a/livestatus/src/AttributeListColumn.h +++ b/livestatus/src/AttributeListColumn.h @@ -35,7 +35,6 @@ #include "contact_fwd.h" #include "opids.h" class Filter; -class Logger; class Row; class AttributeListColumn : public ListColumn { @@ -55,8 +54,6 @@ public: Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; - static std::string refValueFor(const std::string &value, Logger *logger); - private: AttributeListAsIntColumn _int_view_column; };

6 years, 10 months

Yet another fix for the column class hierarchy, this time:

by Sven Panne

AttributeListColumn Message-ID: <59fc4c68.bwKEkFIyOiz9cDEf%sp(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 861513218d043fe0a14a1c74c6b2b15b138ec7fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=861513218d043f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 3 11:36:15 2017 +0100 Yet another fix for the column class hierarchy, this time: AttributeListColumn As its name and output behaviour implies, it derives from ListColumn now. Filtering is done via via delegation to an int-based view. The bit fiddling stuff is not yet in the right place, but this will be fixed in another commit. Change-Id: Ia45ae0c608812b24d1d6433c643b73da74d52728 --- livestatus/src/AttributeListColumn.cc | 24 +++++++----------------- livestatus/src/AttributeListColumn.h | 27 ++++++++++++++------------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/livestatus/src/AttributeListColumn.cc b/livestatus/src/AttributeListColumn.cc index 69de926..30494a9 100644 --- a/livestatus/src/AttributeListColumn.cc +++ b/livestatus/src/AttributeListColumn.cc @@ -31,9 +31,7 @@ #include <utility> #include <vector> #include "Filter.h" -#include "IntFilter.h" #include "Logger.h" -#include "Renderer.h" #include "Row.h" #include "strutil.h" @@ -53,30 +51,22 @@ std::map<std::string, unsigned long> known_attributes = { using modified_atttibutes = std::bitset<32>; } // namespace -int32_t AttributeListColumn::getValue(Row row, - const contact * /*unused*/) const { - if (auto p = columnData<unsigned long>(row)) { - return static_cast<int32_t>(*p); - } - return 0; -} - -void AttributeListColumn::output( - Row row, RowRenderer &r, const contact * /*auth_user*/, +std::vector<std::string> AttributeListColumn::getValue( + Row row, const contact *auth_user, std::chrono::seconds /*timezone_offset*/) const { - ListRenderer l(r); - modified_atttibutes values(getValue(row, nullptr)); + modified_atttibutes values(_int_view_column.getValue(row, auth_user)); + std::vector<std::string> attributes; for (const auto &entry : known_attributes) { if (values[entry.second]) { - l.output(entry.first); + attributes.push_back(entry.first); } } + return attributes; } std::unique_ptr<Filter> AttributeListColumn::createFilter( RelationalOperator relOp, const std::string &value) const { - return std::make_unique<IntFilter>(*this, relOp, - refValueFor(value, logger())); + return _int_view_column.createFilter(relOp, value); } // static diff --git a/livestatus/src/AttributeListColumn.h b/livestatus/src/AttributeListColumn.h index a07e288..984900b 100644 --- a/livestatus/src/AttributeListColumn.h +++ b/livestatus/src/AttributeListColumn.h @@ -27,37 +27,38 @@ #include "config.h" // IWYU pragma: keep #include <chrono> -#include <cstdint> #include <memory> #include <string> -#include "Column.h" -#include "IntColumn.h" +#include <vector> +#include "AttributeListAsIntColumn.h" +#include "ListColumn.h" #include "contact_fwd.h" #include "opids.h" class Filter; class Logger; class Row; -class RowRenderer; -class AttributeListColumn : public IntColumn { +class AttributeListColumn : public ListColumn { public: AttributeListColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, int offset) - : IntColumn(name, description, indirect_offset, extra_offset, - extra_extra_offset, offset) {} + : ListColumn(name, description, indirect_offset, extra_offset, + extra_extra_offset, offset) + , _int_view_column(name, description, indirect_offset, extra_offset, + extra_extra_offset, offset) {} - // API of Column - ColumnType type() const override { return ColumnType::list; } - void output(Row row, RowRenderer &r, const contact *auth_user, - std::chrono::seconds timezone_offset) const override; std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; - // API of IntColumn - int32_t getValue(Row row, const contact *auth_user) const override; + std::vector<std::string> getValue( + Row row, const contact *auth_user, + std::chrono::seconds timezone_offset) const override; static std::string refValueFor(const std::string &value, Logger *logger); + +private: + AttributeListAsIntColumn _int_view_column; }; #endif // AttributeListColumn_h

6 years, 10 months

Fixed merge issues in recent fix

by Lars Michelsen

Module: check_mk Branch: master Commit: 21f2d89b21b6a46db1d639641d6d33dcfef5eae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21f2d89b21b6a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 3 11:14:26 2017 +0100 Fixed merge issues in recent fix Change-Id: Ia895d31fe72711bf7e794afaef1e7ad1e118f9e0 --- web/plugins/sidebar/shipped.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 7903393..52b21b4 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1495,7 +1495,7 @@ class BookmarkList(pagetypes.Overridable): title = _("URL"), size = 50, allow_empty = False, - validate = self.validate_url, + validate = cls.validate_url, )), (IconSelector( title = _("Icon"), @@ -1528,6 +1528,7 @@ class BookmarkList(pagetypes.Overridable): return parameters + @classmethod def validate_url(cls, value, varprefix): parsed = urlparse.urlparse(value) @@ -1539,7 +1540,6 @@ class BookmarkList(pagetypes.Overridable): @classmethod def _load(cls): cls.load_legacy_bookmarks() - self.load_legacy_bookmarks() @classmethod

6 years, 10 months

5431 SEC Fixed possible reflected XSS using custom bookmarks

by Lars Michelsen

Module: check_mk Branch: master Commit: 504bd5002b76c3756868df11901a56f0f9b8ac14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=504bd5002b76c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 3 10:34:41 2017 +0100 5431 SEC Fixed possible reflected XSS using custom bookmarks It was possible to create custom bookmarks by making the user open a crafted URL. This created a bookmark in the users default bookmark list which could be used to execute custom javascript code when the user clicks on the just created link. For example the user session cookies can be read and reported to the attackers, who could then hijack the users sessions with the application. This issue has been fixed by limiting absolute URLs in bookmarks to the URL schemes <tt>https</tt> and <tt>http</tt>. Change-Id: I80a47c981970f23dd9737f1c6000cc82799220b1 --- .werks/5431 | 20 ++++++++++++++++++++ web/plugins/sidebar/shipped.py | 11 +++++++++++ 2 files changed, 31 insertions(+) diff --git a/.werks/5431 b/.werks/5431 new file mode 100644 index 0000000..35e29cc --- /dev/null +++ b/.werks/5431 @@ -0,0 +1,20 @@ +Title: Fixed possible reflected XSS using custom bookmarks +Level: 1 +Component: multisite +Class: security +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509701263 + +It was possible to create custom bookmarks by making the user open a +crafted URL. This created a bookmark in the users default bookmark list +which could be used to execute custom javascript code when the user +clicks on the just created link. + +For example the user session cookies can be read and reported to the +attackers, who could then hijack the users sessions with the application. + +This issue has been fixed by limiting absolute URLs in bookmarks to the +URL schemes <tt>https</tt> and <tt>http</tt>. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 03a8467..7903393 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1495,6 +1495,7 @@ class BookmarkList(pagetypes.Overridable): title = _("URL"), size = 50, allow_empty = False, + validate = self.validate_url, )), (IconSelector( title = _("Icon"), @@ -1527,9 +1528,18 @@ class BookmarkList(pagetypes.Overridable): return parameters + def validate_url(cls, value, varprefix): + parsed = urlparse.urlparse(value) + + # Absolute URLs are allowed, but limit it to http/https + if parsed.scheme != "" and parsed.scheme not in [ "http", "https" ]: + raise MKUserError(varprefix, _("This URL ist not allowed to be used as bookmark")) + + @classmethod def _load(cls): cls.load_legacy_bookmarks() + self.load_legacy_bookmarks() @classmethod @@ -1694,6 +1704,7 @@ def ajax_add_bookmark(): title = html.var("title") url = html.var("url") if title and url: + BookmarkList.validate_url(url, "url") add_bookmark(title, url) render_bookmarks()

6 years, 10 months

5290 salesforce_instances: Monitors the instances of Salesforce

by Simon Betz

Module: check_mk Branch: master Commit: 9490801b95b7735923547d4a3354faba2c046d7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9490801b95b773… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 25 14:26:07 2017 +0200 5290 salesforce_instances: Monitors the instances of Salesforce Change-Id: I671562ecc9b0ad4b74d206f06dbad342adfac862 --- .werks/5290 | 10 +++++ agents/special/agent_salesforce | 38 ++++++++++++++++ agents/special/lib/cmk_special_agent_api.py | 69 ++++++++++++++++++++++++++++ checkman/salesforce_instances | 15 +++++++ checks/agent_salesforce | 36 +++++++++++++++ checks/salesforce_instances | 70 +++++++++++++++++++++++++++++ web/plugins/wato/datasource_programs.py | 14 ++++++ 7 files changed, 252 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9490801b95…

6 years, 11 months

Always obey Query's request to stop producing rows.

by Sven Panne

Module: check_mk Branch: master Commit: 9dc4bb968063ce5d97d7b0f8103cfcca37b5c204 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dc4bb968063ce… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 16:58:20 2017 +0100 Always obey Query's request to stop producing rows. Change-Id: I90688cad53b8e3de6e154a05841d79e417b5efee --- livestatus/src/TableEventConsole.cc | 4 +++- livestatus/src/TableHostsByGroup.cc | 2 +- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableServicesByGroup.cc | 2 +- livestatus/src/TableServicesByHostGroup.cc | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index a346c5c..107f31a 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -82,7 +82,9 @@ private: row._host = it == row._map.end() ? nullptr : _mc->getHostByDesignation(it->second); - _query->processDataset(Row(&row)); + if (!_query->processDataset(Row(&row))) { + return; + } } } while (true); } diff --git a/livestatus/src/TableHostsByGroup.cc b/livestatus/src/TableHostsByGroup.cc index 82380c0..4dc19a2 100644 --- a/livestatus/src/TableHostsByGroup.cc +++ b/livestatus/src/TableHostsByGroup.cc @@ -64,7 +64,7 @@ void TableHostsByGroup::answerQuery(Query *query) { for (hostsmember *m = hg->members; m != nullptr; m = m->next) { hostbygroup hbg = {*m->host_ptr, hg}; if (!query->processDataset(Row(&hbg))) { - break; + return; } } } diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 2c6c99b..8c167d5 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -494,7 +494,7 @@ void TableServices::answerQuery(Query *query) { for (servicesmember *smem = m->host_ptr->services; smem != nullptr; smem = smem->next) { if (!query->processDataset(Row(smem->service_ptr))) { - break; + return; } } } diff --git a/livestatus/src/TableServicesByGroup.cc b/livestatus/src/TableServicesByGroup.cc index 1306e74..0f61546 100644 --- a/livestatus/src/TableServicesByGroup.cc +++ b/livestatus/src/TableServicesByGroup.cc @@ -65,7 +65,7 @@ void TableServicesByGroup::answerQuery(Query *query) { for (servicesmember *m = sg->members; m != nullptr; m = m->next) { servicebygroup sbg = {*m->service_ptr, sg}; if (!query->processDataset(Row(&sbg))) { - break; + return; } } } diff --git a/livestatus/src/TableServicesByHostGroup.cc b/livestatus/src/TableServicesByHostGroup.cc index 6d01daa..e4a5d27 100644 --- a/livestatus/src/TableServicesByHostGroup.cc +++ b/livestatus/src/TableServicesByHostGroup.cc @@ -59,7 +59,7 @@ void TableServicesByHostGroup::answerQuery(Query *query) { smem != nullptr; smem = smem->next) { servicebyhostgroup sbhg = {*smem->service_ptr, hg}; if (!query->processDataset(Row(&sbhg))) { - break; + return; } } }

6 years, 11 months

Removed superfluous argument. Renaming.

by Sven Panne

Module: check_mk Branch: master Commit: 8c42c6de9412364583eb15a5d88fbea5ac0b9053 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c42c6de941236… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 16:32:15 2017 +0100 Removed superfluous argument. Renaming. Change-Id: Icca2884f17008a80a6b55699969d4127d3f707d0 --- livestatus/src/TableComments.cc | 6 ++--- livestatus/src/TableDowntimes.cc | 6 ++--- livestatus/src/TableEventConsoleEvents.cc | 6 ++--- livestatus/src/TableEventConsoleEvents.h | 2 +- livestatus/src/TableEventConsoleHistory.cc | 2 +- livestatus/src/TableHosts.cc | 38 +++++++++++++++++------------- livestatus/src/TableHosts.h | 5 ++-- livestatus/src/TableHostsByGroup.cc | 2 +- livestatus/src/TableLog.cc | 4 ++-- livestatus/src/TableServices.cc | 23 +++++++++--------- livestatus/src/TableServices.h | 5 ++-- livestatus/src/TableServicesByGroup.cc | 2 +- livestatus/src/TableServicesByHostGroup.cc | 2 +- livestatus/src/TableStateHistory.cc | 4 ++-- 14 files changed, 54 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8c42c6de94…

6 years, 11 months

Push nullptr check into implementation where it belongs. Renaming.

by Sven Panne

Module: check_mk Branch: master Commit: b97548077855a29fe2add921473d1d52edc54cdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b97548077855a2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 2 15:22:30 2017 +0100 Push nullptr check into implementation where it belongs. Renaming. Change-Id: I9b52be420c30cac6ad9ed2258c88ae51afa7f97f --- livestatus/src/HostGroupsColumn.cc | 3 +-- livestatus/src/ServiceGroupsColumn.cc | 3 +-- livestatus/src/auth.cc | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/livestatus/src/HostGroupsColumn.cc b/livestatus/src/HostGroupsColumn.cc index c70ccf4..22f470c 100644 --- a/livestatus/src/HostGroupsColumn.cc +++ b/livestatus/src/HostGroupsColumn.cc @@ -34,8 +34,7 @@ std::vector<std::string> HostGroupsColumn::getValue( if (auto p = columnData<objectlist *>(row)) { for (objectlist *list = *p; list != nullptr; list = list->next) { auto hg = static_cast<hostgroup *>(list->object_ptr); - if (auth_user == nullptr || - is_authorized_for_host_group(_mc, hg, auth_user)) { + if (is_authorized_for_host_group(_mc, hg, auth_user)) { group_names.emplace_back(hg->group_name); } } diff --git a/livestatus/src/ServiceGroupsColumn.cc b/livestatus/src/ServiceGroupsColumn.cc index 5213305..a5f6aed 100644 --- a/livestatus/src/ServiceGroupsColumn.cc +++ b/livestatus/src/ServiceGroupsColumn.cc @@ -34,8 +34,7 @@ std::vector<std::string> ServiceGroupsColumn::getValue( if (auto p = columnData<objectlist *>(row)) { for (objectlist *list = *p; list != nullptr; list = list->next) { auto sg = static_cast<servicegroup *>(list->object_ptr); - if (auth_user == nullptr || - is_authorized_for_service_group(_mc, sg, auth_user)) { + if (is_authorized_for_service_group(_mc, sg, auth_user)) { group_names.emplace_back(sg->group_name); } } diff --git a/livestatus/src/auth.cc b/livestatus/src/auth.cc index 867f066..4acbd06 100644 --- a/livestatus/src/auth.cc +++ b/livestatus/src/auth.cc @@ -57,6 +57,9 @@ bool is_authorized_for(MonitoringCore *mc, const contact *ctc, const host *hst, bool is_authorized_for_host_group(MonitoringCore *mc, const hostgroup *hg, const contact *ctc) { + if (ctc == nullptr) { + return true; + } if (ctc == unknown_auth_user()) { return false; } @@ -84,6 +87,9 @@ bool is_authorized_for_host_group(MonitoringCore *mc, const hostgroup *hg, bool is_authorized_for_service_group(MonitoringCore *mc, const servicegroup *sg, const contact *ctc) { + if (ctc == nullptr) { + return true; + } if (ctc == unknown_auth_user()) { return false; }

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017