Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Sven Panne

Module: check_mk Branch: master Commit: ac630a658325d0723194b789b080e844b4ecea14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac630a658325d0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 28 16:12:01 2016 +0200 Fetched Livestatus from downstream. --- .../src/DynamicEventConsoleReplicationColumn.cc | 37 ++++-------- .../src/DynamicEventConsoleReplicationColumn.h | 18 ++---- livestatus/src/MonitoringCore.h | 46 +++++++++++++++ livestatus/src/Store.cc | 49 ++++++++-------- livestatus/src/Store.h | 5 +- livestatus/src/TableEventConsole.cc | 65 ++++------------------ livestatus/src/TableEventConsole.h | 20 +++---- livestatus/src/TableEventConsoleEvents.cc | 22 ++++---- livestatus/src/TableEventConsoleEvents.h | 11 ++-- livestatus/src/TableEventConsoleHistory.cc | 22 ++++---- livestatus/src/TableEventConsoleHistory.h | 11 ++-- livestatus/src/TableEventConsoleReplication.cc | 21 ++----- livestatus/src/TableEventConsoleReplication.h | 12 +--- livestatus/src/TableEventConsoleStatus.cc | 10 +--- livestatus/src/TableEventConsoleStatus.h | 12 +--- livestatus/src/module.cc | 26 +++++++-- 16 files changed, 174 insertions(+), 213 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac630a6583…

7 years, 11 months

Now really cleanup old sites

by Lars Michelsen

Module: check_mk Branch: master Commit: f1ade0aa0fc8291d6a8a2268650ad6c2b99b07db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1ade0aa0fc829… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 15:50:39 2016 +0200 Now really cleanup old sites --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 75567df..f98e23e 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -236,7 +236,7 @@ class Site(object): for site_id in os.listdir("/omd/sites"): if site_id != self.id and site_id.startswith(cleanup_pattern): print "Cleaning up old site: %s" % site_id - #self.rm(site_id) + self.rm(site_id) def start(self):

7 years, 11 months

Fixed issue in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: 3dfe923de8914806cd64d175997db8ee8a9eb101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dfe923de89148… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 15:13:29 2016 +0200 Fixed issue in last commit --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 72a3bb3..75567df 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -234,7 +234,7 @@ class Site(object): def cleanup_old_sites(self, cleanup_pattern): for site_id in os.listdir("/omd/sites"): - if site_id != self.id() and site_id.startswith(cleanup_pattern): + if site_id != self.id and site_id.startswith(cleanup_pattern): print "Cleaning up old site: %s" % site_id #self.rm(site_id)

7 years, 11 months

Fixed issue in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: cbe2f9b0b4ec6ca9fa98b8d3d6d0b317ad6f6cef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbe2f9b0b4ec6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 15:08:05 2016 +0200 Fixed issue in last commit --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index f6b5dd2..72a3bb3 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -234,7 +234,7 @@ class Site(object): def cleanup_old_sites(self, cleanup_pattern): for site_id in os.listdir("/omd/sites"): - if site_id != site.id() and site_id.startswith(cleanup_pattern): + if site_id != self.id() and site_id.startswith(cleanup_pattern): print "Cleaning up old site: %s" % site_id #self.rm(site_id)

7 years, 11 months

tests: optionally cleanup old test sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ca5570468e291a858e3228a5fd347f97611a730 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ca5570468e291… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 14:38:04 2016 +0200 tests: optionally cleanup old test sites --- tests/conftest.py | 5 +++++ tests/testlib/__init__.py | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 47ca8f8..79c83c2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -93,6 +93,11 @@ def site(request): site = testlib.Site(site_id=site_id(), version=site_version(), edition=site_edition(), reuse=reuse_site()) + + cleanup_pattern = os.environ.get("CLEANUP_OLD") + if cleanup_pattern: + site.cleanup_old_sites(cleanup_pattern) + site.cleanup_if_wrong_version() site.create() site.open_livestatus_tcp() diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 7a0593f..f6b5dd2 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -226,8 +226,17 @@ class Site(object): self.rm() - def rm(self): - assert omd(["-f", "rm", "--kill", self.id]) == 0 + def rm(self, site_id=None): + if site_id == None: + site_id = self.id + assert omd(["-f", "rm", "--kill", site_id]) == 0 + + + def cleanup_old_sites(self, cleanup_pattern): + for site_id in os.listdir("/omd/sites"): + if site_id != site.id() and site_id.startswith(cleanup_pattern): + print "Cleaning up old site: %s" % site_id + #self.rm(site_id) def start(self):

7 years, 11 months

Edit description of Werk 3743

by Konstantin Büttner

Module: check_mk Branch: master Commit: be1e994000b4b980045e8dc379631130278ecb2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be1e994000b4b9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Oct 28 13:53:20 2016 +0200 Edit description of Werk 3743 --- .werks/3743 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/3743 b/.werks/3743 index aa07db4..230be49 100644 --- a/.werks/3743 +++ b/.werks/3743 @@ -1,4 +1,4 @@ -Title: mk_jolokia: Use JSON library to parse JSON output in lieu of eval() +Title: mk_jolokia: Fix possible code injection Level: 1 Component: checks Class: security @@ -7,6 +7,18 @@ State: unknown Version: 1.4.0i1 Date: 1472111893 -Previously, the mk_jolokia agent plugin would try to parse the JSON data -returned from jolokia with eval(). Now, the simplejson or json python -libraries are a prerequisite for the plugin to work. +The plugin now requires either the json or simplejson python library to work. + +Python 2.6 or higher ships with json, in this case, the plugin will work just +as before. + +simplejson is available for Python 2.5 and higher, installation of this package +is required for the plugin to work. + +Older python versions are not supported, please query your Jolokia instances +from another host in these cases (recommended) or continue to use the old version +of the plugin. (not recommended) + +In absence of the json or simplejson python libraries, the mk_jolokia plugin +would previously try to parse the Jolokia response with python eval(), allowing +a MITM attacker to inject arbitrary code.

7 years, 11 months

Added refactoring tools auto_build_test and auto_refactor.

by Roland Halbig

Module: check_mk Branch: master Commit: fc2551c94074020c382a8f758063e511c57942e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc2551c9407402… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 28 13:25:51 2016 +0200 Added refactoring tools auto_build_test and auto_refactor. --- tests/web/auto_build_test.py | 107 ++++++++++++++++++++++++++++++++ tests/web/auto_refactor.py | 142 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+) diff --git a/tests/web/auto_build_test.py b/tests/web/auto_build_test.py new file mode 100644 index 0000000..ad51128 --- /dev/null +++ b/tests/web/auto_build_test.py @@ -0,0 +1,107 @@ +#!/usr/bin/python + +# +# This little script can be used to semi-automatically generate a test file for the +# refactoring process. +# It expects a 'git diff master refactored_file.py' printout and generates test functions +# for every individual replacement. +# It is semi-automativ, because the generated 'test_auto_refactored_file.py needs to be postprocessed +# by adding variables and adjusting the indent level for if clauses for example. +# then the file can be called using py.test -s -v test_auto_refactored_file.py +# + +import sys, re +import os.path + +header = ''' +#!/usr/bin/python +# call using +# > py.test -s -k test_html_generator.py + +# enable imports from web directory +from testlib import cmk_path +import sys +sys.path.insert(0, "%s/web/htdocs" % cmk_path()) + +# external imports +import re +from bs4 import BeautifulSoup as bs + +# internal imports +from classes import HTMLOrigTester, HTMLCheck_MKTester +from tools import compare_html , gentest, compare_and_empty +''' + +function_start = lambda x: ''' +def test_%d(): + old = HTMLOrigTester() + new = HTMLCheck_MKTester() + old.plug() + new.plug() +\n +''' % x + +function_end = ''' + compare_and_empty(old, new) + +''' + + +if __name__ == "__main__": + + if len(sys.argv) <= 1: + print "ERROR GIVE A FILE PLS" + exit(0) + + test_name = re.sub(r'\..*', '', sys.argv[1]) + test_name = re.sub(r'diff_', '', test_name) + autotest_filename = 'test_auto_%s.py' % test_name + + # Dialogue + if os.path.isfile(autotest_filename): + replace = raw_input("Do you want to replace the existing auto test file %s? [Y/N]" % autotest_filename) + while replace not in ['y', 'Y', 'n', 'N']: + replace = raw_input("Please enter either 'Y' of 'N'!") + if replace in ['n', 'N']: + print 'Aborting..' + exit(0) + + counter = 0 + + with open(autotest_filename, 'w') as auto: + auto.write(header) + with open(sys.argv[1], 'r') as diff: + for line in diff: + + if re.match(r'@@.*', line): + if counter > 0: + auto.write(function_end) + auto.write(function_start(counter)) + counter += 1 + continue + + elif counter == 0 or len(line) <= 1: + continue + + if not re.match(r'[+|-].+', line): + continue + + if not re.match(r'[+|-].+', line) and line[0] not in ['+', '-']: + auto.write(line[1:]) + + elif re.match(r'[+]{3}.*', line) or re.match(r'[-]{3}.*', line): + continue + + elif re.match(r'[-]\s*html\..*', line): + pattern = re.compile(r'[-]\s*html\.') + auto.write(re.sub(r'\s*html\.', ' old.', line[1:], count=1)) + + elif re.match(r'[+]\s*html\..*', line): + pattern = re.compile(r'\s*html\.') + auto.write(pattern.sub(' new.', line[1:], count=1)) + + else: + auto.write(line[1:]) + + if(counter > 0): + auto.write(function_end) diff --git a/tests/web/auto_refactor.py b/tests/web/auto_refactor.py new file mode 100644 index 0000000..144ed74 --- /dev/null +++ b/tests/web/auto_refactor.py @@ -0,0 +1,142 @@ +import re +import sys +from bs4 import BeautifulSoup as bs +from bs4 import NavigableString + + +def eval_tag(tag_str, next_one, next_inbetween): + + skip_next = False + children = list(bs(tag_str, 'html5lib').body.children) + + if tag_str[1] == '/': + addendum = "html.close_%s()" % re.sub("<|[/]|>", '' , tag_str) + +# elif '%' + 's' in tag_str: +# addendum = '' + + elif children and not isinstance(children[0], NavigableString): + tag_name = '' + attrs = '' + tag = children[0] + + tag_name = tag.name + for key, val in tag.attrs.iteritems(): + if key in ["class", "id", "type", "for"]: + key += '_' + if attrs and key and val: + attrs += ", " + if isinstance(val, list): + val = "[\"" + "\", \"".join(val) + "\"]" + attrs += "%s=%s" % (key, val) + else: + attrs += "%s=\"%s\"" % (key, val) + + # See if we can close the tag right away + if next_one and next_one[1] == '/' and next_one == ("</%s>" % tag_name): + addendum = "html.%s(%s%s)" % (tag_name, next_inbetween, ", " + attrs if attrs else '') + skip_next = True + elif tag_name in ['br', 'hr', 'img']: + addendum = "html.%s(%s)" % (tag_name, attrs) + else: + addendum = "html.open_%s(%s)" % (tag_name, attrs) + else: + tag_name = tag_str.lstrip(' ').lstrip('<').split(' ')[0].rstrip("/").rstrip(">") + attrs = tag_str.lstrip(' ').lstrip('<').rstrip(' ').rstrip('>').lstrip(tag_name) + addendum = "html.open_%s(%s)" % (tag_name, attrs) + + return addendum, skip_next + + +def append_to_html(html, indent, addendum): + return "%s\n%s%s" %(html, ' ' * indent, "%s" % addendum) + + +def split_html(text): + index = 1 + while index < len(text) and text[index - 1] != "(": + index += 1 + open_braces = 1 + while index < len(text) and open_braces > 0: + if text[index] == "(": + open_braces += 1 + elif text[index] == ")": + open_braces -= 1 + index += 1 + while index < len(text) and text[index] != "\n": + index += 1 + return text[:index], text[index:] + +# this function does a big chunk of the refactoring for me +def replace_tags(html, indent = 0): + + # I want to refactor only lines with html.write + if not html.lstrip(' ').startswith('html.write('): + return html + + # unbalanced paranthesis indicates sth that goes across line border + if html.count('(') != html.count(')'): + return html + + html, rest = split_html(html) + orig_html = html + + if len(html.split(" % ")) == 2: + html, string_input = html.split(" % ") + string_input = string_input.lstrip("(").rstrip("$").rstrip("\n").rstrip(' ').rstrip(")") + for input in string_input.split(","): + if ("%" + "s") in html: + html = re.sub("%" + "s", input, html, 1) + + tags = re.findall(r'<[^<]*>', html) + if len(tags) == 0: + return orig_html + rest + + inbetween = re.split(r'<[^<]*>', re.sub(r'\s*html\.write$[\'|"]?', '', html, 1)) + inbetween[-1] = ''.join(list(reversed(re.sub(r'\n$["|\']', '', ''.join(list(reversed(inbetween[-1]))), count=1)))) + + html = orig_html + "\n(new)" + + if inbetween[0].strip(' ') not in ['', '\n']: + html = append_to_html(html, indent, "html.write(%s)" % inbetween[0]) + + # Iterate all tags + counter = 0 + skip_next = False + while counter < len(tags): + tag_str = tags[counter] + next_one = tags[counter + 1] if counter + 1 < len(tags) else None + addendum, skip_next = eval_tag(tag_str, next_one, inbetween[counter + 1]) + if not skip_next and addendum.strip(' '): + html = append_to_html(html, indent, addendum) + + counter += 1 + + if not skip_next and inbetween[counter].strip(' ') not in ['', '\n']: + html = append_to_html(html, indent, "html.write(%s)" % inbetween[counter]) + + return html + rest + "\n(/new)" + + +import re +html = sys.argv[1] +if html.endswith('.py'): + whole_text = '' + with open(html, 'r') as rfile: + whole_text = "".join(line for line in rfile) + parts = whole_text.split("html.write(") + with open("refactored_file.py", "w") as wfile: + part = parts.pop(0) + wfile.write(part) + indent = 0 + while indent < len(part) and part[len(part) - 1 - indent] == ' ': + indent += 1 + for part in parts: + part = "html.write(" + part + wfile.write(replace_tags(part, indent)) + indent = 0 + while indent < len(part) and part[len(part) - 1 - indent] == ' ': + indent += 1 +else: + print replace_tags(html) +

7 years, 11 months

Fixed views/painters.py so that it works with new HTML class.

by Roland Halbig

Module: check_mk Branch: master Commit: 62a8d4e26ded48d0a8b7de16306bc1555c205a3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62a8d4e26ded48… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 28 12:15:56 2016 +0200 Fixed views/painters.py so that it works with new HTML class. --- web/plugins/views/painters.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 0bd6d82..91b01a9 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -295,10 +295,14 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): raise result = ("alert", "%s" % e) - if result == None: + if result is None: continue - elif type(result) in [str,unicode]: + elif type(result) in [str, unicode, HTML]: + + if isinstance(result, HTML): + result = str(result) + # TODO: This is handling the deprecated API with 1.2.7. Remove this one day. if result[0] == '<': # seems like an old format icon (html code). In regular rendering

7 years, 11 months

Advances in to htmllib. (HTML class, removed sidebar functions)

by Roland Halbig

Module: check_mk Branch: master Commit: 5f1a275973e97d238ce2f4d2ebcec4f8cb37062f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f1a275973e97d… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 28 11:50:30 2016 +0200 Advances in to htmllib. (HTML class, removed sidebar functions) --- web/htdocs/htmllib.py | 512 +++++++++++++++++++++++++------------------------- 1 file changed, 256 insertions(+), 256 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f1a275973…

7 years, 11 months

Updated tests for htmllib

by Roland Halbig

Module: check_mk Branch: master Commit: 718da34e25c21d76c6054085e83f293a548ef2ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=718da34e25c21d… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 28 11:55:01 2016 +0200 Updated tests for htmllib --- tests/web/classes.py | 348 +++++++++++++++++++++++++--------- tests/web/test_htmllib_integration.py | 57 ++++-- tests/web/tools.py | 121 +++++++----- 3 files changed, 373 insertions(+), 153 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=718da34e25…

7 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016