Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64380 discussions

Check_MK Git: check_mk: FIX: quote HTML variable names, fixes potential JS injection

by Mathias Kettner

Module: check_mk Branch: master Commit: d87d0215c125ee0b62e6224b809817955c359246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d87d0215c125ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 15:10:31 2012 +0100 FIX: quote HTML variable names, fixes potential JS injection --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index af25c4c..8f519a6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -330,7 +330,7 @@ class html: def hidden_field(self, var, value, id = None, add_var = False): if value != None: id = id and ' id="%s"' % id or '' - self.write("<input type=hidden name=%s value=\"%s\"%s>" % (var, attrencode(value), id)) + self.write("<input type=hidden name=\"%s\" value=\"%s\"%s>" % (attrencode(var), attrencode(value), id)) if add_var: self.add_form_var(var)

11 years, 9 months

Check_MK Git: check_mk: FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering)

by Mathias Kettner

Module: check_mk Branch: master Commit: e235658500bd98e102a7cd56606b2348fc43c80d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e235658500bd98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 14:32:02 2012 +0100 FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering) --- ChangeLog | 3 +++ livestatus/src/logger.c | 4 +++- livestatus/src/module.c | 1 + 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f34a68..05b7c21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -232,6 +232,9 @@ * FIX: performeter_temparature now returns unicode string, because of °C * FIX: output_format json in webservices now using " as quotes + Livestatus: + * FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering) + 1.2.0p3: Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index 3872e2c..82bb982 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -44,8 +44,10 @@ void open_logfile() void close_logfile() { - if (g_logfile) + if (g_logfile) { fclose(g_logfile); + g_logfile = 0; + } } void logger(int priority, const char *loginfo, ...) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 73bdcd8..94ac6c8 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -286,6 +286,7 @@ void terminate_threads() if (g_debug_level > 0) logger(LG_INFO, "Main thread + %u client threads have finished", g_num_clientthreads); g_thread_running = 0; + g_should_terminate = false; } free(g_clientthread_id); }

11 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: ae7c55b4332d45dfe48207996a673844fe9b8f00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae7c55b4332d45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 14:33:43 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: css: new td.odd0 td.even0 styles

by Andreas Boesl

Module: check_mk Branch: master Commit: 9440305ff045784da30056970e919f24df9a8940 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9440305ff04578… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 20 14:07:21 2012 +0100 css: new td.odd0 td.even0 styles --- web/htdocs/status.css | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 2b79b87..b6ab766 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -218,8 +218,8 @@ td.statex { /* zero count */ tr.odd0 { background-color: #eee; } tr.even0 { background-color: #ddd; } -tr.odd0 { background-color: #eee; } -tr.even0 { background-color: #ddd; } +td.odd0 { background-color: #eee; } +td.even0 { background-color: #ddd; } tr.odd1 { background-color: #ffc; } tr.even1 { background-color: #ffa; }

11 years, 9 months

Check_MK Git: check_mk: Creating a new rule immediatlely opens the edit formular

by Andreas Boesl

Module: check_mk Branch: master Commit: 3ccfdeb8410015043169452e8554076a19d93596 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ccfdeb8410015… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 20 14:11:10 2012 +0100 Creating a new rule immediatlely opens the edit formular --- ChangeLog | 1 + web/htdocs/wato.py | 93 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 56 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50dce6a..c0db219 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * FIX: Fixed generated manual check definitions for checks without items like ntp_time and tcp_conn_stats * FIX: Persisting changing of folder titles when only the title has changed + * Add: Creating a new rule immediately opens its edit formular Event Console: * FIX: fix exception in rules that use facility local7 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 811706e..1244e84 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9642,9 +9642,10 @@ def create_new_rule_form(rulespec, hostname = None, item = None): label += _(" and %s '%s'") % (rulespec["itemname"], item) ty = rulespec["itemname"] - title = _("Create %s specific rule for: ") % ty html.write('<tr><td>') - html.button("_new_host_rule", title) + html.button("_new_host_rule", _("Create %s specific rule for: ") % ty) + html.hidden_field("host", hostname) + html.hidden_field("item", mk_repr(item)) html.write('</td><td style="vertical-align:middle">') html.write(label) html.write('</td></tr>\n') @@ -9652,9 +9653,11 @@ def create_new_rule_form(rulespec, hostname = None, item = None): html.write('<tr><td>') html.button("_new_rule", _("Create rule in folder: ")) html.write('</td><td>') - html.select("folder", folder_selection(g_root_folder)) + + html.select("rule_folder", folder_selection(g_root_folder)) html.write('</td></tr></table>\n') - html.hidden_fields() + html.hidden_field("varname", html.var("varname")) + html.hidden_field("mode", html.var("mode")) html.end_form() def mode_edit_ruleset(phase): @@ -9694,28 +9697,16 @@ def mode_edit_ruleset(phase): return elif phase == "action": + # The creation of any new rule is handled by the new_rule mode + if html.has_var("_new_host_rule") or html.has_var("_new_rule"): + return "new_rule" + # Folder for the rule actions is defined by _folder rule_folder = g_folders[html.var("_folder", html.var("folder"))] check_folder_permissions(rule_folder, "write", True) rulesets = load_rulesets(rule_folder) rules = rulesets.get(varname, []) - if html.var("_new_rule") or html.var("_new_host_rule"): - if html.check_transaction(): - if html.var("_new_rule"): - hostname = None - item = NO_ITEM - new_rule = create_rule(rulespec, hostname, item) - if hostname: - rules[0:0] = [new_rule] - else: - rules.append(new_rule) - save_rulesets(rule_folder, rulesets) - mark_affected_sites_dirty(rule_folder) - log_pending(AFFECTED, None, "edit-ruleset", - _("Created new rule in ruleset %s in folder %s") % (rulespec["title"], rule_folder["title"])) - return - rulenr = int(html.var("_rulenr")) # rule number relativ to folder action = html.var("_action") @@ -9797,12 +9788,14 @@ def mode_edit_ruleset(phase): "</tr>\n") odd = "odd" + folder_odd = "odd" alread_matched = False match_keys = set([]) # in case if match = "dict" last_folder = None for rulenr in range(0, len(ruleset)): folder, rule = ruleset[rulenr] if folder != last_folder: + folder_odd = folder_odd == "odd" and "even" or "odd" first_in_group = True rel_rulenr = 0 # Count how many of the following rules are located in the same @@ -9901,7 +9894,7 @@ def mode_edit_ruleset(phase): # Folder if first_in_group: alias_path = get_folder_aliaspath(folder, show_main = False) - html.write('<td rowspan=%d>%s</td>' % (row_span, alias_path)) + html.write('<td rowspan=%d class="%s0">%s</td>' % (row_span, folder_odd, alias_path)) # Value html.write('<td class=value>\n') @@ -10250,26 +10243,37 @@ def get_rule_conditions(ruleset): return tag_list, host_list, item_list -def mode_edit_rule(phase): - rulenr = int(html.var("rulenr")) + +def mode_edit_rule(phase, new = False): varname = html.var("varname") rulespec = g_rulespecs[varname] if phase == "title": - return _("Edit rule %s") % rulespec["title"] + return _("%s rule %s") % (new and _("New") or _("Edit"), rulespec["title"]) elif phase == "buttons": - html.context_button(_("Abort"), - make_link([("mode", "edit_ruleset"), - ("varname", varname), - ("host", html.var("host", "")), - ("item", html.var("item", "None"))]), "abort") + var_list = [("mode", "edit_ruleset"), ("varname", varname), ("host", html.var("host",""))] + if html.var("item"): + var_list.append( ("item", html.var("item")) ) + html.context_button(_("Abort"), make_link(var_list), "abort") return - folder = g_folders[html.var("rule_folder")] + folder = html.has_var("_new_host_rule") and g_folder or g_folders[html.var("rule_folder")] rulesets = load_rulesets(folder) - rules = rulesets[varname] - rule = rules[rulenr] + rules = rulesets[varname] + + if new: + host = None + item = NO_ITEM + if html.has_var("_new_host_rule"): + host = html.var("host") + item = html.has_var("item") and mk_eval(html.var("item")) or NO_ITEM + rule = create_rule(rulespec, host, item) + rulenr = len(rules) + else: + rulenr = int(html.var("rulenr")) + rule = rules[rulenr] + valuespec = rulespec.get("valuespec") value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule) @@ -10294,13 +10298,22 @@ def mode_edit_rule(phase): value = html.var("value") == "yes" rule = construct_rule(rulespec, value, tag_specs, host_list, item_list, rule_options) if new_rule_folder == folder: - rules[rulenr] = rule + if new: + rules.append(rule) + else: + rules[rulenr] = rule save_rulesets(folder, rulesets) mark_affected_sites_dirty(folder) - log_pending(AFFECTED, None, "edit-rule", _("Changed properties of rule %s in folder %s") % - (rulespec["title"], folder["title"])) + + if new: + log_pending(AFFECTED, None, "edit-rule", _("Created new rule in ruleset %s in folder %s") % + (rulespec["title"], new_rule_folder["title"])) + else: + log_pending(AFFECTED, None, "edit-rule", _("Changed properties of rule %s in folder %s") % + (rulespec["title"], new_rule_folder["title"])) else: # Move rule to new folder - del rules[rulenr] + if not new: + del rules[rulenr] save_rulesets(folder, rulesets) rulesets = load_rulesets(new_rule_folder) rules = rulesets.setdefault(varname, []) @@ -10311,8 +10324,11 @@ def mode_edit_rule(phase): log_pending(AFFECTED, None, "edit-rule", _("Changed properties of rule %s, moved rule from " "folder %s to %s") % (rulespec["title"], folder["title"], new_rule_folder["title"])) + else: + return "edit_ruleset" - return "edit_ruleset" + return ("edit_ruleset", _("%s rule in ruleset '%s' in folder %s") % + (new and _("Created new") or _("Edited"), rulespec["title"], new_rule_folder["title"])) html.help(rulespec["help"]) @@ -11753,7 +11769,8 @@ modes = { "ruleeditor" : (["rulesets"], mode_ruleeditor), "rulesets" : (["rulesets"], mode_rulesets), "edit_ruleset" : (["rulesets"], mode_edit_ruleset), - "edit_rule" : (["rulesets"], mode_edit_rule), + "new_rule" : (["rulesets"], lambda phase: mode_edit_rule(phase, True)), + "edit_rule" : (["rulesets"], lambda phase: mode_edit_rule(phase, False)), "host_groups" : (["groups"], lambda phase: mode_groups(phase, "host")), "service_groups" : (["groups"], lambda phase: mode_groups(phase, "service")), "contact_groups" : (["users"], lambda phase: mode_groups(phase, "contact")),

11 years, 9 months

Check_MK Git: check_mk: FIX: mkeventd: remove event pipe on program shutdown

by Andreas Boesl

Module: check_mk Branch: master Commit: 2974e58c73441211f12014389e34555dbeac0368 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2974e58c734412… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 20 13:40:40 2012 +0100 FIX: mkeventd: remove event pipe on program shutdown --- ChangeLog | 1 + mkeventd/bin/mkeventd | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ec8b7a..0c2e3e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * Speedup access to event history by earlier filtering and prefiltering with grep * New builtin syslog server! Please refer to online docu for details. * Icon to events of host links to view that has context button to host + * FIX: remove event pipe on program shutdown, prevents syslog freeze 1.2.1i3: Core: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 2cec2a3..642ab46 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -131,6 +131,21 @@ def open_logfile(): global g_logfile g_logfile = file(g_logfile_path, "a") + +def drain_pipe(pipe): + while True: + readable = select.select([ pipe ], [], [], 1)[0] + data = None + if pipe in readable: + try: + data = os.read(pipe, 4096) + if len(data) == 0: # END OF FILE! + break + except: + break # Error while reading + else: + break # No data available + def log(text): if type(text) == unicode: text = text.encode("utf-8") @@ -2654,6 +2669,15 @@ try: # We reach this point, if the server has been killed by # a signal or hitting Ctrl-C (in foreground mode) + # Remove event pipe and drain it, so that we make sure + # that processes (syslog, etc) will not hang when trying + # to write into the pipe. + log("Cleaning up event pipe") + pipe = g_event_server.open_pipe() # Open it + os.remove(g_pipe_path) # Remove pipe + drain_pipe(pipe) # Drain any data + os.close(pipe) # Close pipe + g_event_status.save_status() os.remove(g_socket_path) os.remove(g_pid_file)

11 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 92668bd7cb17b266eeb36044fcf75993ccbe58f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92668bd7cb17b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 20 13:40:57 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: WATO: Nicer error message in case of activation problem

by Mathias Kettner

Module: check_mk Branch: master Commit: f4182a10570f39c79db4ba1a79d0f2a04841ce69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4182a10570f39… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 13:07:44 2012 +0100 WATO: Nicer error message in case of activation problem --- web/htdocs/wato.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 676ee05..811706e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4085,8 +4085,10 @@ def check_mk_local_automation(command, args=[], indata=""): if exitcode != 0: if config.debug: log_audit(None, "automation", "Automation command %s failed with exit code %d: %s" % (" ".join(cmd), exitcode, outdata)) - raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % - (" ".join(cmd), exitcode, hilite_errors(outdata), outdata.lstrip().startswith('sudo:') and sudo_msg or '')) + raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % + (" ".join(cmd), exitcode, hilite_errors(outdata), outdata.lstrip().startswith('sudo:') and sudo_msg or '')) + else: + raise MKGeneralException("<h1>%s</h1>%s" % (_("Error"), hilite_errors(outdata))) # On successful "restart" command execute the activate changes hook @@ -7227,9 +7229,12 @@ def ajax_activation(): duration = time.time() - start update_replication_status(None, {}, { 'act': duration }) except Exception: - import traceback - raise MKUserError(None, "Error executing hooks: %s" % - traceback.format_exc().replace('\n', '<br />')) + if config.debug: + import traceback + raise MKUserError(None, "Error executing hooks: %s" % + traceback.format_exc().replace('\n', '<br />')) + else: + raise log_commit_pending() # flush logfile with pending actions log_audit(None, "activate-config", _("Configuration activated, monitoring server restarted"))

11 years, 9 months

Check_MK Git: check_mk: Fix layout of error messages

by Mathias Kettner

Module: check_mk Branch: master Commit: 352c2961f5d2461010f5fcda040a292799c32405 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=352c2961f5d246… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 12:57:33 2012 +0100 Fix layout of error messages --- web/htdocs/hooks.py | 2 +- web/htdocs/pages.css | 2 +- web/htdocs/wato.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/hooks.py b/web/htdocs/hooks.py index 7a93e98..abae1e3 100644 --- a/web/htdocs/hooks.py +++ b/web/htdocs/hooks.py @@ -54,6 +54,6 @@ def call(name, *args): txt = StringIO.StringIO() t, v, tb = sys.exc_info() traceback.print_exception(t, v, tb, None, txt) - html.show_error("<h3>" + _("Error executing hook") + " %s #%d: %s</h3>" + html.show_error("<h1>" + _("Error executing hook") + " %s #%d: %s</h1>" "<pre>%s</pre>" % (name, n, e, txt.getvalue())) raise diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index ed8267f..79cdbba 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -715,7 +715,7 @@ div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { font-size: 12pt; font-weight: bold; margin-bottom: 5px; - color: #000; + color: white; margin-left: 0px; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9e39df2..676ee05 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3439,7 +3439,7 @@ def mode_changelog(phase): if config.debug: raise else: - raise MKUserError(None, "<h3>%s</h3>%s" % (_("Cannot activate changes"), e)) + raise MKUserError(None, "<h1>%s</h1>%s" % (_("Cannot activate changes"), e)) sitestatus_do_async_replication = False # see below if html.has_var("_siteaction"): @@ -4061,7 +4061,7 @@ def check_mk_local_automation(command, args=[], indata=""): except Exception, e: if config.debug: raise - html.show_error("<h3>Cannot activate changes</h3>%s" % e) + html.show_error("<h1>Cannot activate changes</h1>%s" % e) return if config.debug:

11 years, 9 months

Check_MK Git: check_mk: Keep hook exceptions also in debug mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 884910bb0b867bcde05ac7eb91506402e0d71a92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=884910bb0b867b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 12:50:06 2012 +0100 Keep hook exceptions also in debug mode --- web/htdocs/hooks.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/hooks.py b/web/htdocs/hooks.py index 8e3ca04..7a93e98 100644 --- a/web/htdocs/hooks.py +++ b/web/htdocs/hooks.py @@ -56,5 +56,4 @@ def call(name, *args): traceback.print_exception(t, v, tb, None, txt) html.show_error("<h3>" + _("Error executing hook") + " %s #%d: %s</h3>" "<pre>%s</pre>" % (name, n, e, txt.getvalue())) - else: - raise + raise

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits