Checkmk git commits January 2011

checkmk-commits@lists.checkmk.com

3 participants
114 discussions

Check_MK Git: check_mk: Added code to handle multiple vars of same name as lists

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8a6b784069a720bbc1a6aa93e18823fd5e030be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a6b784069a720… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 4 16:45:20 2011 +0100 Added code to handle multiple vars of same name as lists --- web/htdocs/htmllib.py | 3 +++ web/htdocs/index.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index aeba1c8..1b4b8a5 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -471,6 +471,9 @@ class html: def var(self, varname, deflt = None): return self.req.vars.get(varname, deflt) + def multivar(self, varname, deflt = None): + return self.req.multivars.get(varname, deflt) + def var_utf8(self, varname, deflt = None): return unicode(self.req.vars.get(varname, deflt), "utf-8") diff --git a/web/htdocs/index.py b/web/htdocs/index.py index c6b0cc8..765e05b 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -48,13 +48,14 @@ if defaults.omd_root: execfile(local_pagehandlers_dir + "/" + fn) def read_get_vars(req): + req.multivars = {} req.vars = {} if req.args: req.rawvars = util.parse_qs(req.args, True) for (key,values) in req.rawvars.items(): if len(values) >= 1: req.vars[key] = values[-1] - + req.multivars[key] = values def connect_to_livestatus(html): html.site_status = {}

13 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2094e67437d25a2098e206f9ca036c7a43a377bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2094e67437d25a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 4 17:24:10 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 8 months

Check_MK Git: check_mk: Livestatus: check string lengths

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9258f94590e83467ecce49b0da58e88251a7258c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9258f94590e834… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 14:45:12 2011 +0100 Livestatus: check string lengths (Thanks to Oliver Hauer) --- ChangeLog | 3 +++ livestatus/src/module.c | 8 ++++---- livestatus/src/pnp4nagios.cc | 10 +++++----- livestatus/src/unixcat.c | 1 + 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30948db..96a4194 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ Multisite: * New reschedule icon now also works for non-local sites. + Livestatus: + * Check for buffer overflows (replace strcat with strncat, etc.) + 1.1.9i3: INCOMPATIBLE CHANGES: * You need a current version of Livestatus for Multisite to work! diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 46c2e81..2f55de6 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -493,7 +493,7 @@ void check_pnp_path() void livestatus_parse_arguments(const char *args_orig) { /* set default socket path */ - strcpy(g_socket_path, DEFAULT_SOCKET_PATH); + strncpy(g_socket_path, DEFAULT_SOCKET_PATH, sizeof(g_socket_path) - 1); /* there is no default PNP path */ g_pnp_path[0] = 0; @@ -510,7 +510,7 @@ void livestatus_parse_arguments(const char *args_orig) char *left = next_token(&part, '='); char *right = next_token(&part, 0); if (!right) { - strncpy(g_socket_path, left, sizeof(g_socket_path)); + strncpy(g_socket_path, left, sizeof(g_socket_path) - 1); } else { if (!strcmp(left, "debug")) { @@ -582,9 +582,9 @@ void livestatus_parse_arguments(const char *args_orig) } } else if (!strcmp(left, "pnp_path")) { - strcpy(g_pnp_path, right); + strncpy(g_pnp_path, right, sizeof(g_pnp_path) - 1); if (right[strlen(right) - 1] != '/') - strcat(g_pnp_path, "/"); // make sure, that trailing slash is always there + strncat(g_pnp_path, "/", sizeof(g_pnp_path) - strlen(g_pnp_path) - 1 ); // make sure, that trailing slash is always there check_pnp_path(); } else { diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index 84ae30d..20fd289 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -44,19 +44,19 @@ int pnpgraph_present(char *host, char *service) return -1; char path[4096]; - strcpy(path, g_pnp_path); + strncpy(path, g_pnp_path, sizeof(path) - 1); char *end = path + strlen(path); - strcpy(end, host); + strncpy(end, host, sizeof(end) - 1); cleanup_pnpname(end); - strcat(end, "/"); + strncat(end, "/", sizeof(end) - strlen(end) - 1); end = end + strlen(end); if (service) { - strcat(end, service); + strncat(end, service, sizeof(end) - strlen(end) - 1); cleanup_pnpname(end); strcat(end, ".xml"); } else - strcat(end, "_HOST_.xml"); + strncat(end, "_HOST_.xml", sizeof(end) - strlen(end) - 1); if (0 == access(path, R_OK)) return 1; diff --git a/livestatus/src/unixcat.c b/livestatus/src/unixcat.c index 2d61d74..e98e4a8 100644 --- a/livestatus/src/unixcat.c +++ b/livestatus/src/unixcat.c @@ -29,6 +29,7 @@ #include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <pthread.h> #include <unistd.h> #include <signal.h>

13 years, 8 months

Check_MK Git: check_mk: Multisite: fix reschedule bugs for non-local sites

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66dbd3bfdb3360682162d5f4768bac6a5b5c86f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66dbd3bfdb3360… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 14:31:44 2011 +0100 Multisite: fix reschedule bugs for non-local sites --- ChangeLog | 3 +++ web/.f12 | 2 +- web/htdocs/.f12 | 2 +- web/htdocs/actions.py | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7169b3..30948db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * added missing 'register 0' to host template * setup: fix creation of symlink cmk if already existing + Multisite: + * New reschedule icon now also works for non-local sites. + 1.1.9i3: INCOMPATIBLE CHANGES: * You need a current version of Livestatus for Multisite to work! diff --git a/web/.f12 b/web/.f12 index 8c90ab2..c49acf6 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,2 @@ sudo cp -prv * /omd/versions/default/share/check_mk/web/ -sudo su - -c 'omd reload wato apache' +sudo su - -c 'omd reload eins apache' diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index c52f4b1..85d9910 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -4,4 +4,4 @@ sudo cp -r images *.css *.py js /omd/versions/default/share/check_mk/web/htdocs sudo cp ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ sudo cp ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ sudo cp ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ -sudo omd restart wato apache +sudo omd restart eins apache diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 10b3f2f..301e207 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -62,9 +62,9 @@ def action_reschedule(): add_filter = "" try: - html.live.set_only_sites([site]) now = int(time.time()) - html.live.command("[%d] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (now, cmd, spec, now)) + html.live.command("[%d] SCHEDULE_FORCED_%s_CHECK;%s;%d" % (now, cmd, spec, now), site) + html.live.set_only_sites([site]) row = html.live.query_row( "GET %ss\n" "WaitObject: %s %s\n"

13 years, 8 months

Check_MK Git: check_mk: Fix the fix of cmk link

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1460ccd35762e1bdbfd9f6c408c4cc582662d7a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1460ccd35762e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 13:50:38 2011 +0100 Fix the fix of cmk link --- scripts/setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 0aa1b79..b8dcf47 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -664,7 +664,7 @@ do rm -f $DESTDIR$bindir/check_mk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py "'"$@"' > $DESTDIR$bindir/check_mk && chmod 755 $DESTDIR$bindir/check_mk && - ln -sns check_mk $DESTDIR$bindir/cmk && + ln -snf check_mk $DESTDIR$bindir/cmk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && chmod 755 $DESTDIR$bindir/mkp && sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg &&

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 87733ade908ae97b3b07fa50b59c06a8335b73b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87733ade908ae9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 13:52:23 2011 +0100 Updated bug entries --- .bugs/88 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/88 b/.bugs/88 new file mode 100644 index 0000000..324f498 --- /dev/null +++ b/.bugs/88 @@ -0,0 +1,11 @@ +Title: Move check_mk_templates.cfg to /usr/share/check_mk +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-01-04 13:51:15 +Class: cleanup + +The directory /usr/share/doc is not optimal since the templates +are no longer an example but a vital part - usually never changed +by the admin.

13 years, 8 months

Check_MK Git: check_mk: gb: add missing newline

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a3ac7ca72b9fd82d21de226acb73c11501d8c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a3ac7ca72b9fd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 13:52:48 2011 +0100 gb: add missing newline --- gb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gb b/gb index f48ef6e..9e562f8 100755 --- a/gb +++ b/gb @@ -425,7 +425,7 @@ def main_commit(args): for id in g_modified: list_bug(g_bugs[id]) if 0 == os.system("git commit -m 'Updated bug entries' ."): - sys.stdout.write("--> Successfully committed %d bugs." % len(g_modified)) + sys.stdout.write("--> Successfully committed %d bugs.\n" % len(g_modified)) else: bail_out("Cannot commit.")

13 years, 8 months

Check_MK Git: check_mk: setup: fix creation of symlink cmk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03d2f6ea129bef0efbd0439b75eaecc43c9e83fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03d2f6ea129bef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 13:46:15 2011 +0100 setup: fix creation of symlink cmk --- ChangeLog | 1 + scripts/setup.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97f1b7c..f7169b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.9i4: Core, Setup, etc.: * added missing 'register 0' to host template + * setup: fix creation of symlink cmk if already existing 1.1.9i3: INCOMPATIBLE CHANGES: diff --git a/scripts/setup.sh b/scripts/setup.sh index a356062..0aa1b79 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -664,7 +664,7 @@ do rm -f $DESTDIR$bindir/check_mk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py "'"$@"' > $DESTDIR$bindir/check_mk && chmod 755 $DESTDIR$bindir/check_mk && - ln -s check_mk $DESTDIR$bindir/cmk && + ln -sns check_mk $DESTDIR$bindir/cmk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && chmod 755 $DESTDIR$bindir/mkp && sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg &&

13 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b63f067802b2afa37568b6232640bf35e5a9a202 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b63f067802b2af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 4 13:44:21 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 8 months

Check_MK Git: check_mk: added missing 'register 0' to host template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1f6de364a585c6c4828a6fd0e05670c01734b6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1f6de364a585c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 2 13:04:46 2011 +0100 added missing 'register 0' to host template --- ChangeLog | 4 ++++ doc/check_mk_templates.cfg | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c479e2a..bbd953d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.9i4: + Core, Setup, etc.: + * added missing 'register 0' to host template + 1.1.9i3: INCOMPATIBLE CHANGES: * You need a current version of Livestatus for Multisite to work! diff --git a/doc/check_mk_templates.cfg b/doc/check_mk_templates.cfg index 5f7195e..80b96c5 100644 --- a/doc/check_mk_templates.cfg +++ b/doc/check_mk_templates.cfg @@ -52,6 +52,7 @@ define contactgroup { # with check_mk define host { name check_mk_default + register 0 notifications_enabled 1 event_handler_enabled 0 flap_detection_enabled 1

13 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2011