Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Fixed host address validation in case of empty value

by Lars Michelsen

Module: check_mk Branch: master Commit: 04e23c99b32277d871efbe962f031de288d4f7c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04e23c99b32277… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 29 10:22:01 2016 +0200 Fixed host address validation in case of empty value --- web/htdocs/valuespec.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8ab3bd3..ba4520e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -634,13 +634,13 @@ class HostAddress(TextAscii): def validate_value(self, value, varprefix): - if self._allow_host_name and self._is_valid_host_name(value): + if value and self._allow_host_name and self._is_valid_host_name(value): pass - elif self._allow_ipv4_address and self._is_valid_ipv4_address(value): + elif value and self._allow_ipv4_address and self._is_valid_ipv4_address(value): pass - elif self._allow_ipv6_address and self._is_valid_ipv6_address(value): + elif value and self._allow_ipv6_address and self._is_valid_ipv6_address(value): pass - else: + elif not self._allow_empty: raise MKUserError(varprefix, _("Invalid host address. You need to specify the address " "either as %s." % ", ".join(self._allowed_type_names())))

7 years, 10 months

3845 FIX Added missing validation of host attribute values to WATO Web API calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 36e295ec16e9451d778ed4baba8efae542663149 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36e295ec16e945… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 29 10:20:13 2016 +0200 3845 FIX Added missing validation of host attribute values to WATO Web API calls --- .werks/3845 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 18 +++++++++++------- web/plugins/webapi/webapi.py | 16 +++++++++++++++- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.werks/3845 b/.werks/3845 new file mode 100644 index 0000000..c10a6fc --- /dev/null +++ b/.werks/3845 @@ -0,0 +1,9 @@ +Title: Added missing validation of host attribute values to WATO Web API calls +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1472458792 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e4b923e..7f1086f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -573,6 +573,7 @@ * 3757 FIX: Bulk import: Ensuring non ASCII characters are not imported into regular attributes * 3760 FIX: Cluster nodes can not be nodes of their own anymore * 3844 FIX: Fixed validation of host IPv4, IPv6 and management host address attributes... + * 3845 FIX: Added missing validation of host attribute values to WATO Web API calls Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index c758e5c..54b3647 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2408,25 +2408,29 @@ class Attribute: # Check if the value entered by the user is valid. # This method may raise MKUserError in case of invalid user input. - def validate_input(self, varprefix): + def validate_input(self, value, varprefix): pass + # If this attribute should be present in Nagios as # a host custom macro, then the value of that macro # should be returned here - otherwise None def to_nagios(self, value): return None + # Checks if the give value matches the search attributes # that are represented by the current HTML variables. def filter_matches(self, crit, value, hostname): return crit == value + # Host tags to set for this host def get_tag_list(self, value): return [] + # A simple text attribute. It is stored in # a Python unicode string class TextAttribute(Attribute): @@ -2457,8 +2461,7 @@ class TextAttribute(Attribute): value = "" return value.strip() - def validate_input(self, varprefix): - value = self.from_html_vars(varprefix) + def validate_input(self, value, varprefix): if self._mandatory and not value: raise MKUserError(varprefix + "attr_" + self.name(), _("Please specify a value for %s") % self.title()) @@ -2654,8 +2657,7 @@ class ValueSpecAttribute(Attribute): def from_html_vars(self, varprefix): return self._valuespec.from_html_vars(varprefix + self._name) - def validate_input(self, varprefix): - value = self.from_html_vars(varprefix) + def validate_input(self, value, varprefix): self._valuespec.validate_value(value, varprefix + self._name) @@ -2922,10 +2924,12 @@ def collect_attributes(for_what, do_validate = True, varprefix=""): if not html.var(for_what + "_change_%s" % attrname, False): continue + value = attr.from_html_vars(varprefix) + if do_validate and attr.needs_validation(for_what): - attr.validate_input(varprefix) + attr.validate_input(value, varprefix) - host[attrname] = attr.from_html_vars(varprefix) + host[attrname] = value return host #. diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 34387a7..a3de28c 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -31,17 +31,30 @@ def validate_request_keys(request, valid_keys): if key not in valid_keys: raise MKUserError(None, _("Invalid key: %s") % key) + # Check if the given attribute name exists, no type check def validate_general_host_attributes(host_attributes): - # inventory_failed and site are no "real" host_attributes + # inventory_failed and site are no "real" host_attributes (TODO: Clean this up!) all_host_attribute_names = map(lambda (x, y): x.name(), all_host_attributes()) + ["inventory_failed", "site"] for name, value in host_attributes.items(): if name not in all_host_attribute_names: raise MKUserError(None, _("Unknown attribute: %s") % html.attrencode(name)) + + # For real host attributes validate the values + try: + attr = host_attribute(name) + except KeyError: + attr = None + + if attr != None: + if attr.needs_validation("host"): + attr.validate_input(value, "") + # The site attribute gets an extra check if name == "site" and value not in config.allsites().keys(): raise MKUserError(None, _("Unknown site %s") % html.attrencode(value)) + # Check if the tag group exists and the tag value is valid def validate_host_tags(host_tags): for key, value in host_tags.items(): @@ -56,6 +69,7 @@ def validate_host_tags(host_tags): else: raise MKUserError(None, _("Unknown host tag group %s") % html.attrencode(key)) + def validate_host_attributes(attributes): validate_general_host_attributes(dict((key, value) for key, value in attributes.items() if not key.startswith("tag_"))) validate_host_tags(dict((key[4:], value) for key, value in attributes.items() if key.startswith("tag_")))

7 years, 10 months

Fix website resource fetching when using HTTPS

by Lars Michelsen

Module: check_mk Branch: master Commit: f381718fe0ecd7541239a71e4bd6d4534496e6b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f381718fe0ecd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 15:47:02 2016 +0200 Fix website resource fetching when using HTTPS --- tests/testlib/__init__.py | 55 +++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 908fe17..d8fc4ba 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -221,6 +221,13 @@ class Site(object): raise Exception("The site %s is not running completely after starting" % self.id) + def stop(self): + if self.is_running(): + assert omd(["stop", self.id]) == 0 + if self.is_running(): + raise Exception("The site %s is not completely stopped after stopping" % self.id) + + def exists(self): return os.path.exists("/omd/sites/%s" % self.id) @@ -229,9 +236,15 @@ class Site(object): return omd(["status", "--bare", self.id]) == 0 - def set_config(self, key, val): + def set_config(self, key, val, with_restart=False): + if with_restart: + self.stop() + assert omd(["config", self.id, "set", key, val]) == 0 + if with_restart: + self.start() + def get_config(self, key): p = self.execute(["omd", "config", "show", key], stdout=subprocess.PIPE) @@ -295,25 +308,26 @@ class WebSession(requests.Session): assert response.headers['Location'] == expected_target - def get(self, path, proto="http", expected_code=200, allow_errors=False, add_transid=False, **kwargs): - url = self.url(proto, path) + def get(self, *args, **kwargs): + return self._request("get", *args, **kwargs) - if add_transid: - url = self._add_transid(url) - response = super(WebSession, self).get(url, **kwargs) - self._handle_http_response(response, expected_code, allow_errors) - return response + def post(self, *args, **kwargs): + return self._request("post", *args, **kwargs) - def post(self, path, proto="http", expected_code=200, allow_errors=False, add_transid=False, **kwargs): + def _request(self, method, path, proto="http", expected_code=200, expect_redirect=None, allow_errors=False, add_transid=False, **kwargs): url = self.url(proto, path) if add_transid: url = self._add_transid(url) - response = super(WebSession, self).post(url, **kwargs) - self._handle_http_response(response, expected_code, allow_errors) + if method == "post": + response = super(WebSession, self).post(url, **kwargs) + else: + response = super(WebSession, self).get(url, **kwargs) + + self._handle_http_response(response, expected_code, allow_errors, expect_redirect) return response @@ -329,7 +343,7 @@ class WebSession(requests.Session): return url - def _handle_http_response(self, response, expected_code, allow_errors): + def _handle_http_response(self, response, expected_code, allow_errors, expect_redirect): assert "Content-Type" in response.headers # TODO: Copied from CMA tests. Needed? @@ -340,6 +354,11 @@ class WebSession(requests.Session): mime_type = self._get_mime_type(response) + + if expect_redirect: + expected_code, redirect_target = expect_redirect + assert response.headers["Location"] == redirect_target + assert response.status_code == expected_code, \ "Got invalid status code (%d != %d) for URL %s (Location: %s)" % \ (response.status_code, expected_code, @@ -379,7 +398,9 @@ class WebSession(requests.Session): def _check_html_page_resources(self, response): soup = BeautifulSoup(response.text) - base_url = urlparse(response.url).path + parsed_url = urlparse(response.url) + + base_url = parsed_url.path if ".py" in base_url: base_url = os.path.dirname(base_url) @@ -387,28 +408,28 @@ class WebSession(requests.Session): for img_url in self._find_resource_urls("img", "src", soup): assert not img_url.startswith("/") - req = self.get(base_url + "/" + img_url) + req = self.get(base_url + "/" + img_url, proto=parsed_url.scheme, verify=False) mime_type = self._get_mime_type(req) assert mime_type in [ "image/png" ] for script_url in self._find_resource_urls("script", "src", soup): assert not script_url.startswith("/") - req = self.get(base_url + "/" + script_url) + req = self.get(base_url + "/" + script_url, proto=parsed_url.scheme, verify=False) mime_type = self._get_mime_type(req) assert mime_type in [ "application/javascript" ] for css_url in self._find_resource_urls("link", "href", soup, filters=[("rel", "stylesheet")]): assert not css_url.startswith("/") - req = self.get(base_url + "/" + css_url) + req = self.get(base_url + "/" + css_url, proto=parsed_url.scheme, verify=False) mime_type = self._get_mime_type(req) assert mime_type in [ "text/css" ] for url in self._find_resource_urls("link", "href", soup, filters=[("rel", "shortcut icon")]): assert not url.startswith("/") - req = self.get(base_url + "/" + url) + req = self.get(base_url + "/" + url, proto=parsed_url.scheme, verify=False) mime_type = self._get_mime_type(req) assert mime_type in [ "image/vnd.microsoft.icon" ]

7 years, 10 months

Run livestatus tests with nagios enabled and with cmc enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 27a760ef38758221dbbbe9202f1e5a5cfaf1ad06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27a760ef387582… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 15:46:34 2016 +0200 Run livestatus tests with nagios enabled and with cmc enabled --- tests/livestatus/test_livestatus.py | 38 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/livestatus/test_livestatus.py b/tests/livestatus/test_livestatus.py index 670ad19..bb904a1 100644 --- a/tests/livestatus/test_livestatus.py +++ b/tests/livestatus/test_livestatus.py @@ -6,21 +6,28 @@ from testlib import web @pytest.fixture(scope="module") def default_cfg(web): - try: - web.add_host("livestatus-test-host", attributes={ - "ipaddress": "127.0.0.1", - }) + web.add_host("livestatus-test-host", attributes={ + "ipaddress": "127.0.0.1", + }) - web.discover_services("livestatus-test-host") + web.discover_services("livestatus-test-host") - web.activate_changes() - finally: - web.delete_host("livestatus-test-host") + web.activate_changes() + yield None + + # + # Cleanup code + # + + web.delete_host("livestatus-test-host") # Simply detects all tables by querying the columns table and then # queries each of those tables without any columns and filters -def test_tables(default_cfg, site): +(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +def test_tables(default_cfg, site, core): + site.set_config("CORE", core, with_restart=True) + existing_tables = set([]) for row in site.live.query_table_assoc("GET columns\n"): @@ -29,17 +36,26 @@ def test_tables(default_cfg, site): assert len(existing_tables) > 5 for table in existing_tables: + if core == "nagios" and table == "statehist": + continue # the statehist table in nagios can not be fetched without time filter + result = site.live.query("GET %s\n" % table) assert type(result) == list -def test_host_table(default_cfg, site): +(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +def test_host_table(default_cfg, site, core): + site.set_config("CORE", core, with_restart=True) + rows = site.live.query("GET hosts") assert type(rows) == list assert len(rows) >= 2 # header + min 1 host -def test_service_table(default_cfg, site): +(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) +def test_service_table(default_cfg, site, core): + site.set_config("CORE", core, with_restart=True) + rows = site.live.query("GET services\nFilter: host_name = livestatus-test-host\n" "Columns: description\n") assert type(rows) == list

7 years, 10 months

3844 FIX Fixed validation of host IPv4, IPv6 and management host address attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: b7e7211b701330a4cc4b643b1706dd92efeefb8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7e7211b701330… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 29 10:09:59 2016 +0200 3844 FIX Fixed validation of host IPv4, IPv6 and management host address attributes The values inserted in the WATO host address fields were not validated strictly enough. This has now been changed so that the IPv4 address field allows IPv4 addresses and host- or DNS names and the IPv6 address field allos IPv6 address and host- or DNS names. --- .werks/3844 | 11 ++++ ChangeLog | 1 + web/htdocs/valuespec.py | 86 ++++++++++++++++++++++++++++++++ web/plugins/wato/builtin_attributes.py | 43 ++++++++-------- 4 files changed, 121 insertions(+), 20 deletions(-) diff --git a/.werks/3844 b/.werks/3844 new file mode 100644 index 0000000..b7052a6 --- /dev/null +++ b/.werks/3844 @@ -0,0 +1,11 @@ +Title: Fixed validation of host IPv4, IPv6 and management host address attributes +Level: 2 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1472458101 +Class: fix + +The values inserted in the WATO host address fields were not validated strictly enough. +This has now been changed so that the IPv4 address field allows IPv4 addresses and host- +or DNS names and the IPv6 address field allos IPv6 address and host- or DNS names. diff --git a/ChangeLog b/ChangeLog index 512226d..e4b923e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -572,6 +572,7 @@ * 3756 FIX: Bulk import: Fixed exception when host name contained special characters * 3757 FIX: Bulk import: Ensuring non ASCII characters are not imported into regular attributes * 3760 FIX: Cluster nodes can not be nodes of their own anymore + * 3844 FIX: Fixed validation of host IPv4, IPv6 and management host address attributes... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3ebb50b..8ab3bd3 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -32,6 +32,7 @@ # - Checkbox -> rename to Boolean import math, os, time, re, sre_constants, urlparse, forms, tempfile +import socket from lib import * def type_name(v): @@ -621,6 +622,91 @@ class Hostname(TextAscii): if "allow_empty" not in kwargs: self._allow_empty = False + + +# Use this for all host / ip address input fields! +class HostAddress(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._allow_host_name = kwargs.get("allow_host_name", True) + self._allow_ipv4_address = kwargs.get("allow_ipv4_address", True) + self._allow_ipv6_address = kwargs.get("allow_ipv6_address", True) + + + def validate_value(self, value, varprefix): + if self._allow_host_name and self._is_valid_host_name(value): + pass + elif self._allow_ipv4_address and self._is_valid_ipv4_address(value): + pass + elif self._allow_ipv6_address and self._is_valid_ipv6_address(value): + pass + else: + raise MKUserError(varprefix, _("Invalid host address. You need to specify the address " + "either as %s." % ", ".join(self._allowed_type_names()))) + + ValueSpec.custom_validate(self, value, varprefix) + + + def _is_valid_host_name(self, hostname): + # http://stackoverflow.com/questions/2532053/validate-a-hostname-string/25323… + if len(hostname) > 255: + return False + + if hostname[-1] == ".": + hostname = hostname[:-1] # strip exactly one dot from the right, if present + + # must be not all-numeric, so that it can't be confused with an IPv4 address. + # Host names may start with numbers (RFC 1123 section 2.1) but never the final part, + # since TLDs are alphabetic. + if re.match(r"[\d.]+$", hostname): + return False + + allowed = re.compile("(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE) + return all(allowed.match(x) for x in hostname.split(".")) + + + def _is_valid_ipv4_address(self, address): + # http://stackoverflow.com/questions/319279/how-to-validate-ip-address-in-pyt… + try: + socket.inet_pton(socket.AF_INET, address) + except AttributeError: # no inet_pton here, sorry + try: + socket.inet_aton(address) + except socket.error: + return False + + return address.count('.') == 3 + + except socket.error: # not a valid address + return False + + return True + + + def _is_valid_ipv6_address(self, address): + # http://stackoverflow.com/questions/319279/how-to-validate-ip-address-in-pyt… + try: + socket.inet_pton(socket.AF_INET6, address) + except socket.error: # not a valid address + return False + return True + + + def _allowed_type_names(self): + allowed = [] + if self._allow_host_name: + allowed.append(_("Host- or DNS name")) + + if self._allow_ipv4_address: + allowed.append(_("IPv4 address")) + + if self._allow_ipv6_address: + allowed.append(_("IPv6 address")) + + return allowed + + + class AbsoluteDirname(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index fcc1c78..b5990a3 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -35,7 +35,7 @@ declare_host_attribute(NagiosTextAttribute("alias", "alias", _("Alias"), show_in_folder = False) declare_host_attribute(ValueSpecAttribute("ipaddress", - TextAscii( + HostAddress( title = _("IPv4 Address"), help = _("In case the name of the host is not resolvable via <tt>/etc/hosts</tt> " "or DNS by your monitoring server, you can specify an explicit IP " @@ -50,6 +50,7 @@ declare_host_attribute(ValueSpecAttribute("ipaddress", "each time the host is checked. Check_MKs DNS cache will NOT be queried. " "Use this only for hosts with dynamic IP addresses."), allow_empty = False, + allow_ipv6_address = False, )), show_in_table = True, show_in_folder = False, @@ -57,7 +58,7 @@ declare_host_attribute(ValueSpecAttribute("ipaddress", ) declare_host_attribute(ValueSpecAttribute("ipv6address", - TextAscii( + HostAddress( title = _("IPv6 Address"), help = _("In case the name of the host is not resolvable via <tt>/etc/hosts</tt> " "or DNS by your monitoring server, you can specify an explicit IPv6 " @@ -72,6 +73,7 @@ declare_host_attribute(ValueSpecAttribute("ipv6address", "each time the host is checked. Check_MKs DNS cache will NOT be queried. " "Use this only for hosts with dynamic IP addresses."), allow_empty = False, + allow_ipv4_address = False, )), show_in_table = True, show_in_folder = False, @@ -447,23 +449,24 @@ declare_host_attribute(ManagementTypeAttribute("management_protocol"), topic = _("Management Board") ) -declare_host_attribute(TextAttribute("management_address", _("Address"), - _("Address (IPv4 or IPv6) or dns name under which the " - "management board can be reached. If this is not set, " - "the same address as that of the Host will be used."), - allow_empty = False), - show_in_table = False, - show_in_folder = False, - topic = _("Management Board") - ) +declare_host_attribute(ValueSpecAttribute("management_address", + HostAddress( + title = _("Address"), + help = _("Address (IPv4 or IPv6) or dns name under which the " + "management board can be reached. If this is not set, " + "the same address as that of the Host will be used."), + allow_empty = False + )), + show_in_table = False, + show_in_folder = False, + topic = _("Management Board") +) declare_host_attribute(ValueSpecAttribute("management_snmp_community", - SNMPCredentials( - default_value = None, - ) - ), - show_in_table = False, - show_in_folder = False, - topic = _("Management Board") - ) - + SNMPCredentials( + default_value = None, + )), + show_in_table = False, + show_in_folder = False, + topic = _("Management Board") +)

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 36136ede56fa64e009c6b781c3c36252d8a1b734 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36136ede56fa64… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 26 16:25:34 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/TableEventConsoleEvents.cc | 6 +++--- livestatus/src/TableEventConsoleEvents.h | 10 +++++----- livestatus/src/TableEventConsoleHistory.cc | 2 +- livestatus/src/TableEventConsoleHistory.h | 6 +++--- livestatus/src/TableHosts.h | 9 +++++---- livestatus/src/TableHostsByGroup.h | 6 +++--- livestatus/src/TableLog.cc | 3 ++- livestatus/src/TableLog.h | 6 +++--- livestatus/src/TableServices.h | 9 +++++---- livestatus/src/TableServicesByGroup.h | 6 +++--- livestatus/src/TableServicesByHostGroup.h | 6 +++--- livestatus/src/TableStateHistory.cc | 4 ++-- livestatus/src/TableStateHistory.h | 6 +++--- 13 files changed, 41 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=36136ede56…

7 years, 10 months

3843 FIX Fixed reporting of crashes when using Nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: b418c7daa00409eb74927f19c548cffb26f7ecbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b418c7daa00409… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 14:04:11 2016 +0200 3843 FIX Fixed reporting of crashes when using Nagios core --- .werks/3843 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3843 b/.werks/3843 new file mode 100644 index 0000000..95563f5 --- /dev/null +++ b/.werks/3843 @@ -0,0 +1,10 @@ +Title: Fixed reporting of crashes when using Nagios core +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1472212981 + + diff --git a/ChangeLog b/ChangeLog index 274b00f..512226d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 3616 FIX: Fix cmk -I ignoring the option --cache... * 3617 FIX: cmk -I without host specification now (again) always uses cache files... * 3149 FIX: fixed rare crash if alert handling tried to long non-latin characters + * 3843 FIX: Fixed reporting of crashes when using Nagios core Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller

7 years, 10 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 768c38847dd23e74a5484a806f993a0ecd413074 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=768c38847dd23e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 14:02:44 2016 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ea1f766..7f5b8d7 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3843 +3863

7 years, 10 months

Fixed check crash reporting when using Nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: 0da069f0ea5a7e64579ad5d3d1343b87d026081d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0da069f0ea5a7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 14:02:13 2016 +0200 Fixed check crash reporting when using Nagios core --- modules/check_mk_base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2a900f6..8beb09a 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1584,6 +1584,10 @@ def prepare_crash_dump_directory(crash_dir): def is_manual_check(hostname, check_type, item): + # In case of nagios we don't have this information available (in precompiled mode) + if not "get_check_table" in globals(): + return None + manual_checks = get_check_table(hostname, remove_duplicates=True, world=opt_keepalive and "active" or "config", skip_autochecks=True)

7 years, 10 months

Cleaned up transid handling in web tests

by Lars Michelsen

Module: check_mk Branch: master Commit: d23b6d49c9ca544dd08dd81978db864e774fb77d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d23b6d49c9ca54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 26 13:16:34 2016 +0200 Cleaned up transid handling in web tests --- tests/testlib/__init__.py | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index a41bfd8..908fe17 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -282,10 +282,8 @@ class Site(object): class WebSession(requests.Session): - transids = {} - - def __init__(self, ident): - self.ident = ident + def __init__(self): + self.transids = [] super(WebSession, self).__init__() @@ -297,35 +295,40 @@ class WebSession(requests.Session): assert response.headers['Location'] == expected_target - def get(self, path, proto="http", expected_code=200, allow_errors=False, **kwargs): + def get(self, path, proto="http", expected_code=200, allow_errors=False, add_transid=False, **kwargs): url = self.url(proto, path) + if add_transid: + url = self._add_transid(url) + response = super(WebSession, self).get(url, **kwargs) self._handle_http_response(response, expected_code, allow_errors) return response - def post(self, path, proto="http", expected_code=200, allow_errors=False, **kwargs): + def post(self, path, proto="http", expected_code=200, allow_errors=False, add_transid=False, **kwargs): url = self.url(proto, path) - if kwargs.get("add_transid"): - del kwargs["add_transid"] - - transids = WebSession.transids.get(self.ident, []) - if not transids: - raise Exception('Tried to add a transid, but none available at the moment') - - if "?" in url: - url += "&" - else: - url += "?" - url += "_transid=" + transids.pop() + if add_transid: + url = self._add_transid(url) response = super(WebSession, self).post(url, **kwargs) self._handle_http_response(response, expected_code, allow_errors) return response + def _add_transid(self, url): + if not self.transids: + raise Exception('Tried to add a transid, but none available at the moment') + + if "?" in url: + url += "&" + else: + url += "?" + url += "_transid=" + self.transids.pop() + return url + + def _handle_http_response(self, response, expected_code, allow_errors): assert "Content-Type" in response.headers @@ -362,8 +365,7 @@ class WebSession(requests.Session): matches = re.findall('name="_transid" value="([^"]+)"', body) matches += re.findall('_transid=([0-9/]+)', body) for match in matches: - transids = WebSession.transids.setdefault(self.ident, []) - transids.append(match) + self.transids.append(match) def _find_errors(self, body, allow_errors): @@ -441,10 +443,9 @@ class WebSession(requests.Session): class CMKWebSession(WebSession): - def __init__(self, site): self.site = site - super(CMKWebSession, self).__init__(site.id) + super(CMKWebSession, self).__init__() # Computes a full URL inkl. http://... from a URL starting with the path.

7 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016