Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: Multisite connection: new button for cloning a connection

by Mathias Kettner

Module: check_mk Branch: master Commit: dfea1c33b8172194a4866d49e4e835baf9f838e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfea1c33b81721… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 21:16:34 2013 +0200 Multisite connection: new button for cloning a connection --- ChangeLog | 1 + web/htdocs/wato.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 694b7fd..9a16f9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ WATO: * Bulk inventory: speed up by use of cache files and doing stuff in groups of e.g. 10 hosts at once + * Multisite connection: new button for cloning a connection Checks & Agents: * Linux agent RPM: remove dependency to package "time". That package diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7507765..6f795ec 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6825,9 +6825,11 @@ def mode_sites(phase): table.row() # Buttons edit_url = make_link([("mode", "edit_site"), ("edit", id)]) + clone_url = make_link([("mode", "edit_site"), ("clone", id)]) delete_url = html.makeactionuri([("_delete", id)]) table.cell(_("Actions"), css="buttons") html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Clone this connection in order to create a new one"), "clone") html.icon_button(delete_url, _("Delete"), "delete") # Site-ID @@ -6898,7 +6900,8 @@ def mode_sites(phase): def mode_edit_site(phase): sites = load_sites() - siteid = html.var("edit", None) # missing -> new site + siteid = html.var("edit") # missing -> new site + cloneid = html.var("clone") new = siteid == None if phase == "title": if new: @@ -6910,7 +6913,9 @@ def mode_edit_site(phase): html.context_button(_("All Sites"), make_link([("mode", "sites")]), "back") return - if new: + if cloneid: + site = sites[cloneid] + elif new: site = {} else: site = sites.get(siteid, {}) @@ -7135,7 +7140,7 @@ def mode_edit_site(phase): forms.header(_("Basic settings")) forms.section(_("Site ID"), simple = not new) if new: - html.text_input("id", siteid) + html.text_input("id", siteid or cloneid) html.set_focus("id") else: html.write(siteid)

10 years, 11 months

Check_MK Git: check_mk: Create inventory check also for hosts without services

by Mathias Kettner

Module: check_mk Branch: master Commit: 3163b096f08117921423571ee814875491ad7cf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3163b096f08117… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 20:54:04 2013 +0200 Create inventory check also for hosts without services --- ChangeLog | 4 ++++ modules/check_mk.py | 49 +++++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1802f05..694b7fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.3i4: + Core: + * Create inventory check also for hosts without services, if they + have *no* ping tag. + WATO: * Bulk inventory: speed up by use of cache files and doing stuff in groups of e.g. 10 hosts at once diff --git a/modules/check_mk.py b/modules/check_mk.py index 34a57a0..f30f7a2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2043,28 +2043,6 @@ define service { %s service_description\t\tCheck_MK } """ % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK"))) - # Inventory checks - if user has configured them. Not for clusters. - if inventory_check_interval and not is_cluster(hostname) \ - and not service_ignored(hostname,None,'Check_MK inventory'): - outfile.write(""" -define service { - use\t\t\t\t%s - host_name\t\t\t%s - normal_check_interval\t\t%d - retry_check_interval\t\t%d -%s service_description\t\tCheck_MK inventory -} - -define servicedependency { - use\t\t\t\t%s - host_name\t\t\t%s - service_description\t\tCheck_MK - dependent_host_name\t\t%s - dependent_service_description\tCheck_MK inventory -} -""" % (inventory_check_template, hostname, inventory_check_interval, inventory_check_interval, - extra_service_conf_of(hostname, "Check_MK inventory"), - service_dependency_template, hostname, hostname)) # legacy checks via legacy_checks legchecks = host_extra_conf(hostname, legacy_checks) @@ -2218,6 +2196,33 @@ define service { # write service dependencies for custom checks outfile.write(get_dependencies(hostname,description)) + # Inventory checks - if user has configured them. Not for clusters. + if inventory_check_interval and not is_cluster(hostname) \ + and not service_ignored(hostname, None, 'Check_MK inventory') \ + and not "ping" in tags_of_host(hostname): + outfile.write(""" +define service { + use\t\t\t\t%s + host_name\t\t\t%s + normal_check_interval\t\t%d + retry_check_interval\t\t%d +%s service_description\t\tCheck_MK inventory +} +""" % (inventory_check_template, hostname, inventory_check_interval, + inventory_check_interval, + extra_service_conf_of(hostname, "Check_MK inventory"))) + + if have_at_least_one_service: + outfile.write(""" +define servicedependency { + use\t\t\t\t%s + host_name\t\t\t%s + service_description\t\tCheck_MK + dependent_host_name\t\t%s + dependent_service_description\tCheck_MK inventory +} +""" % (service_dependency_template, hostname, hostname)) + # Levels for host check if is_cluster(hostname): ping_command = 'check-mk-ping-cluster'

10 years, 11 months

Check_MK Git: check_mk: Linux agent: remove dependency to "time" package

by Mathias Kettner

Module: check_mk Branch: master Commit: 7f6a232c50a28ed330d17cb7f1e773bbfab2db7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f6a232c50a28e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 18:22:29 2013 +0200 Linux agent: remove dependency to "time" package This causes more trouble then it helps. --- ChangeLog | 7 ++++++- check_mk.spec | 12 +++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec06b87..1802f05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ * Bulk inventory: speed up by use of cache files and doing stuff in groups of e.g. 10 hosts at once + Checks & Agents: + * Linux agent RPM: remove dependency to package "time". That package + is just needed for the binary mk-job, which is useful but not + neccessary. + 1.2.3i3: Core: * FIX: fixed typo in core startup message "logging initial states" @@ -20,7 +25,7 @@ * FIX: cleanup environment from notifications (needed for CMC) Checks & Agents: - * windows_agent: increased maximum plugin output buffer size to 2MB + * Windows agent: increased maximum plugin output buffer size to 2MB * check_icmp: New WATO rule for custom PING checks * agent_vsphere: now able to handle < > & ' " in login credentials * if/if64 and friends: add 95% percentiles to graphs diff --git a/check_mk.spec b/check_mk.spec index 858be6a..2568d65 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -43,7 +43,11 @@ This package is only needed on the Nagios server. %package agent Group: System/Monitoring -Requires: xinetd, time +# Requires: xinetd, time +# Better do not depend on time. It's just needed for the mk-job +# Binary, which is useful but not neccessary to run the agent. +# This dependency could cause more trouble then it helps. +Requires: xinetd Summary: Linux-Agent for check_mk AutoReq: off AutoProv: off @@ -55,7 +59,8 @@ xinetd to run this agent. %package agent-scriptless Group: System/Monitoring -Requires: xinetd, time +# Requires: xinetd, time +Requires: xinetd Summary: Linux-Agent for check_mk AutoReq: off AutoProv: off @@ -69,7 +74,8 @@ own. %package caching-agent Group: System/Monitoring -Requires: xinetd, time +# Requires: xinetd, time +Requires: xinetd Summary: Caching Linux-Agent for check_mk AutoReq: off AutoProv: off

10 years, 11 months

Check_MK Git: check_mk: Bulk inventory: speed up by use of cache files and grouping

by Mathias Kettner

Module: check_mk Branch: master Commit: 1107afa25c2f46c60d5fec8acc1af4ea2361dae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1107afa25c2f46… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 18:00:37 2013 +0200 Bulk inventory: speed up by use of cache files and grouping --- ChangeLog | 3 ++ modules/automation.py | 84 +++++++++++++++++++++++++++------------------- web/htdocs/js/wato.js | 2 +- web/htdocs/wato.py | 89 ++++++++++++++++++++++++++++++++++++------------- 4 files changed, 119 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1107afa25c…

10 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0984

by Mathias Kettner

Module: check_mk Branch: master Commit: 308ec8747198de4761793b36f1f9d4041283dae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=308ec8747198de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 11 16:33:48 2013 +0200 Updated bug entries #0984 --- .bugs/984 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/984 b/.bugs/984 new file mode 100644 index 0000000..aee8564 --- /dev/null +++ b/.bugs/984 @@ -0,0 +1,16 @@ +Title: Better error message when site cannot be deleted +Component: wato +State: open +Date: 2013-10-11 16:32:01 +Targetversion: 1.2.3i3 +Class: nastiness + +When you are using D-WATO and want to delete a site, this +is prohibited if folders or hosts are assigned to that site. +If you try, then an error message is printed. But there is +no list of the affected host and folders in question. It +can be very hard to find that in a larger installation +(e.g. some empty folder that has the site in its properties). + +Resolution: print out the exakt name of affected hosts an +folders and the error message.

10 years, 12 months

Check_MK Git: check_mk: Added new section

by Lars Michelsen

Module: check_mk Branch: master Commit: 29f53c9bbd65bbe569c018478c04d996038fd770 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29f53c9bbd65bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 11 15:24:55 2013 +0200 Added new section --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 51c8a21..474a383 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.3i4: + 1.2.3i3: Core: * FIX: fixed typo in core startup message "logging initial states"

10 years, 12 months

Check_MK Git: check_mk: Added missing auth.serials entry in rpm specfile

by Lars Michelsen

Module: check_mk Branch: master Commit: 338a1eadb0e9ed86765f482106563d97bbbd0ab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=338a1eadb0e9ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 11 14:53:13 2013 +0200 Added missing auth.serials entry in rpm specfile --- check_mk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/check_mk.spec b/check_mk.spec index f8af9b6..858be6a 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -155,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/check_mk/multisite.mk /etc/check_mk/conf.d/README %config(noreplace) /etc/nagios/objects/* +%config(noreplace) /etc/nagios/auth.serials /usr/bin/check_mk /usr/bin/cmk /usr/bin/mkp

10 years, 12 months

Check_MK Git: check_mk: Generated files for version 1.2.3i3

by Lars Michelsen

Module: check_mk Branch: master Commit: 56ef851a237faf9c07952526c242391867df9fe1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56ef851a237faf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 11 14:44:28 2013 +0200 Generated files for version 1.2.3i3 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent-64.exe | Bin 179200 -> 0 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 149312 -> 0 bytes agents/windows/install_agent.exe | Bin 146754 -> 146753 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- doc/treasures/mknotifyd | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 23 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 79f4c14..0690a44 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.3i2 +VERSION = 1.2.3i3 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 867f30a..2b777ff 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,7 +48,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index ae31418..34a4ee1 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 5be05c5..1cf318e 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cfdce00..6853795 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -89,7 +89,7 @@ function run_cached () { } echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index ff35902..206662e 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 771016d..d8a3d12 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 9232602..993b35a 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index e3c03f4..a879e2c 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.3i2" +$say "Version: 1.2.3i3" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 81bd515..c475ccb 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -49,7 +49,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i2 +echo Version: 1.2.3i3 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe deleted file mode 100755 index 74dd1a6..0000000 Binary files a/agents/windows/check_mk_agent-64.exe and /dev/null differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ea1508c..b2a39f7 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.3i2" +#define CHECK_MK_VERSION "1.2.3i3" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a4ed862..a750ec0 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index cb7ac24..df6e46e 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe deleted file mode 100755 index 0d91fdb..0000000 Binary files a/agents/windows/install_agent-64.exe and /dev/null differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 27b9726..14c36a4 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index cec02b4..c537c5a 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.3i2" +!define CHECK_MK_VERSION "1.2.3i3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index fcdddaf..4a5c861 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index ac92112..473c59d 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.3i2-1_all.deb net optional +check-mk_1.2.3i3-1_all.deb net optional diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 1c39ab0..4c1308f 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -30,7 +30,7 @@ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i2" +VERSION="1.2.3i3" # .--Helper functions----------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 4be097d..c24682f 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.3i2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.3i3], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 4f95e3d..6bf1434 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i2" +VERSION="1.2.3i3" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index 71ace8a..38216b7 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.3i2 +VERSION=1.2.3i3 NAME=check_mk LANG= LC_ALL=

10 years, 12 months

Check_MK Git: check_mk: Again, trying to prevent race conditions in auth. php generating hook

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f3f9446930c2fa4bad1a811142fc0b37c46f99a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f3f9446930c2f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 11 14:11:41 2013 +0200 Again, trying to prevent race conditions in auth.php generating hook --- web/plugins/userdb/hook_auth.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index a1c36ec..15392c6 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -90,9 +90,17 @@ def create_php_file(callee, users, role_permissions, folder_permissions): for username in users: users[username].setdefault('language', config.default_language) + # need an extra lock file, since we move the auth.php.tmp file later + # to auth.php. This move is needed for not having loaded incomplete + # files into php. + tempfile = g_auth_base_dir + '/auth.php.tmp' + lockfile = g_auth_base_dir + '/auth.php.state' + file(lockfile, "a") + aquire_lock(lockfile) + # First write a temp file and then do a move to prevent syntax errors # when reading half written files during creating that new file - file(g_auth_base_dir + '/auth.php.tmp', 'w').write('''<?php + file(tempfile, 'w').write('''<?php // Created by Multisite UserDB Hook (%s) global $mk_users, $mk_roles, $mk_folders; $mk_users = %s; @@ -186,7 +194,9 @@ function may($username, $need_permission) { ?> ''' % (callee, format_php(users), format_php(role_permissions), format_php(folder_permissions))) # Now really replace the file - os.rename(g_auth_base_dir + '/auth.php.tmp', g_auth_base_dir + '/auth.php'); + os.rename(tempfile, g_auth_base_dir + '/auth.php') + + release_lock(lockfile) def create_auth_file(callee, users): make_nagios_directory(g_auth_base_dir)

10 years, 12 months

Check_MK Git: check_mk: WATO: Fixed some input validation problems in snapshot module

by Lars Michelsen

Module: check_mk Branch: master Commit: 053b7cd7a52c0c482c5bf45f9caabb6e72738716 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=053b7cd7a52c0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 11 11:32:42 2013 +0200 WATO: Fixed some input validation problems in snapshot module * FIX: Fixed some output encoding problem in snapshot restore / deletion code * FIX: Improved user provided variable validation in snapshot handling code Conflicts: web/htdocs/wato.py --- ChangeLog | 2 ++ web/htdocs/wato.py | 35 ++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a841b6..d5d8e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -465,6 +465,8 @@ of a distributed WATO setup * FIX: avoid Python exception for invalid parameters even in debug mode * FIX: check_ldap: Removed duplicate "-H" definition + * FIX: Fixed some output encoding problem in snapshot restore / deletion code + * FIX: Improved user provided variable validation in snapshot handling code Event Console: * FIX: apply rewriting of application/hostname also when cancelling events diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 208afaf..14a4dc1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5197,19 +5197,23 @@ def mode_snapshot(phase): make_action_link([("mode", "snapshot"),("_factory_reset","Yes")]), "factoryreset") return - elif phase == "action": + snapshots = [] + if os.path.exists(snapshot_dir): + for f in os.listdir(snapshot_dir): + snapshots.append(f) + snapshots.sort(reverse=True) + + if phase == "action": if html.has_var("_download_file"): download_file = html.var("_download_file") - if not download_file.startswith('wato-snapshot') and download_file != 'latest': - raise MKUserError(None, _("Invalid download file specified.")) # Find the latest snapshot file if download_file == 'latest': - snapshots = os.listdir(snapshot_dir) - snapshots.sort() if not snapshots: return False download_file = snapshots[-1] + elif download_file not in snapshots: + raise MKUserError(None, _("Invalid download file specified.")) download_path = os.path.join(snapshot_dir, download_file) if os.path.exists(download_path): @@ -5238,9 +5242,13 @@ def mode_snapshot(phase): # delete file elif html.has_var("_delete_file"): delete_file = html.var("_delete_file") + + if delete_file not in snapshots: + raise MKUserError(None, _("Invalid file specified.")) + c = wato_confirm(_("Confirm deletion of snapshot"), _("Are you sure you want to delete the snapshot <br><br>%s?") % - delete_file + htmllib.attrencode(delete_file) ) if c: os.remove(os.path.join(snapshot_dir, delete_file)) @@ -5251,14 +5259,18 @@ def mode_snapshot(phase): # restore snapshot elif html.has_var("_restore_snapshot"): snapshot_file = html.var("_restore_snapshot") + + if snapshot_file not in snapshots: + raise MKUserError(None, _("Invalid file specified.")) + c = wato_confirm(_("Confirm restore snapshot"), _("Are you sure you want to restore the snapshot <br><br>%s ?") % - snapshot_file + htmllib.attrencode(snapshot_file) ) if c: multitar.extract_from_file(snapshot_dir + snapshot_file, backup_paths) log_pending(SYNCRESTART, None, "snapshot-restored", - _("Restored snapshot %s") % snapshot_file) + _("Restored snapshot %s") % htmllib.attrencode(snapshot_file)) return None, _("Successfully restored snapshot.") elif c == False: # not yet confirmed return "" @@ -5278,13 +5290,6 @@ def mode_snapshot(phase): return None else: - snapshots = [] - if os.path.exists(snapshot_dir): - for f in os.listdir(snapshot_dir): - snapshots.append(f) - snapshots.sort(reverse=True) - - table.begin("snapshots", _("Snapshots"), empty_text=_("There are no snapshots available.")) for name in snapshots: table.row()

10 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits