Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2845 FIX LDAP: Fixed exception in connection test on complain issue during connection creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 445cd31e59f49fb4881ce55df5d3e959378a1f43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=445cd31e59f49f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 23 10:09:18 2015 +0100 #2845 FIX LDAP: Fixed exception in connection test on complain issue during connection creation --- .werks/2845 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2845 b/.werks/2845 new file mode 100644 index 0000000..7db5b34 --- /dev/null +++ b/.werks/2845 @@ -0,0 +1,10 @@ +Title: LDAP: Fixed exception in connection test on complain issue during connection creation +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1448269716 + + diff --git a/ChangeLog b/ChangeLog index 88fa85e..bfa1da5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,7 @@ * 2767 FIX: Fixed broken user list when non unicode mail addresses are loaded * 2791 FIX: Service parameter overview: Fixed problem displaying incorrect rule for classical checks... * 2793 FIX: Parameter Overview: Prevent python unicode warnings for services with umlauts... + * 2845 FIX: LDAP: Fixed exception in connection test on complain issue during connection creation Notifications: * 2728 FIX: Removed debug notification script (was not executable)... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 894db11..074e6a6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8056,7 +8056,7 @@ def mode_edit_ldap_connection(phase): html.write('</td><td style="padding-left:10px;">') html.write('<h2>' + _('Diagnostics') + '</h2>') - if not html.var('_test'): + if not html.var('_test') or not connection_id: html.message(HTML('<p>%s</p><p>%s</p>' % (_('You can verify the single parts of your ldap configuration using this ' 'dialog. Simply make your configuration in the form on the left side and '

8 years, 7 months

localization: Fixed issue not resetting language when switching back to default language

by Lars Michelsen

Module: check_mk Branch: master Commit: e7dac4164c0aef549f31b437b336a7035e68757f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7dac4164c0aef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 20 20:49:23 2015 +0100 localization: Fixed issue not resetting language when switching back to default language --- web/htdocs/i18n.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index a83a356..f7a5c30 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -123,9 +123,7 @@ def localize(lang, **kwargs): if translation: translation.install(unicode = True) else: - # Fallback to non localized multisite - # I'd prefer to fallback to multisite default language but can not import config module here - __builtin__.current_language = None + unlocalize() # Fallback to non localized multisite else: unlocalize()

8 years, 7 months

windows agent: fixed incorrect event type reported on some eventlog messages

by Sebastian Herbord

Module: check_mk Branch: master Commit: e3c3b942830d77d89861d527856151880e91a189 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3c3b942830d77… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Nov 23 09:34:44 2015 +0100 windows agent: fixed incorrect event type reported on some eventlog messages --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 5397569 -> 5397569 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 5397569 -> 5397569 bytes agents/windows/check_mk_agent.cc | 1 + agents/windows/check_mk_agent.exe | Bin 4257835 -> 4257835 bytes agents/windows/check_mk_agent.msi | Bin 9979904 -> 9979904 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 4257835 -> 4257835 bytes agents/windows/install_agent-64.exe | Bin 1288915 -> 1288918 bytes agents/windows/install_agent.exe | Bin 1169701 -> 1169708 bytes 9 files changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index eddc111..6a11833 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -652 +654 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index f2f44d9..81a60ca 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index f81b14f..ac08fba 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4a1926f..4f75370 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1005,6 +1005,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, break; case EVENTLOG_INFORMATION_TYPE: case EVENTLOG_AUDIT_SUCCESS: + case EVENTLOG_SUCCESS: type_char = level == 0 ? 'O' : '.'; this_state = 0; break; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ca63b45..2832bcb 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index ea68c9b..9db832e 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index c49bdc2..7f9542c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2798d57..76c1e2b 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 7cf166c..a8712ff 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 7 months

New optional parameter for interval WATO function

by Mathias Kettner

Module: check_mk Branch: master Commit: e4363a984a463497660a4b6a634f4530d0d421d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4363a984a4634… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 21 23:00:01 2015 +0100 New optional parameter for interval WATO function needed for agent deployment --- web/htdocs/check_mk.css | 16 ---------------- web/htdocs/pages.css | 6 ++++++ web/htdocs/wato.py | 13 +++++++------ 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 2b5d787..9eb3b5f 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -693,19 +693,3 @@ td.nowiki table td, td.nowiki table th { border: 1px solid #888; } - -/*--Deployment-------------------------------------------------------------. -| ____ _ _ | -| | _ \ ___ _ __ | | ___ _ _ _ __ ___ ___ _ __ | |_ | -| | | | |/ _ \ '_ \| |/ _ \| | | | '_ ` _ \ / _ \ '_ \| __| | -| | |_| | __/ |_) | | (_) | |_| | | | | | | __/ | | | |_ | -| |____/ \___| .__/|_|\___/ \__, |_| |_| |_|\___|_| |_|\__| | -| |_| |___/ | -+--------------------------------------------------------------------------+ -| Styles for agent deployment (used in CEE only) | -'-------------------------------------------------------------------------*/ - -.wato div.agent_deployment img.iconbutton { - width: 60px; - height: 16px; -} diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 4d981d7..43245f0 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -465,6 +465,12 @@ img.iconbutton { padding: 0px 2px; } + +.wato a.checkbox img.iconbutton { + width: 60px; + height: 16px; +} + img.iconbutton:hover { opacity: 0.5; filter: alpha(opacity=50); /* For IE8 and earlier */ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a9f924d..894db11 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16308,18 +16308,19 @@ def load_rulesets(folder): # Load all rules of all folders into a dictionary that # has the rules' varnames as keys and a list of (folder, rule) # as values. -def load_rulesets_recursively(folder, all_rulesets): +def load_rulesets_recursively(folder, all_rulesets, only_varname=None): for subfolder in folder[".folders"].values(): - load_rulesets_recursively(subfolder, all_rulesets) + load_rulesets_recursively(subfolder, all_rulesets, only_varname) rs = load_rulesets(folder) for varname, rules in rs.items(): - all_rulesets.setdefault(varname, []) - all_rulesets[varname] += [ (folder, rule) for rule in rules ] + if only_varname == None or varname == only_varname: + all_rulesets.setdefault(varname, []) + all_rulesets[varname] += [ (folder, rule) for rule in rules ] -def load_all_rulesets(): +def load_all_rulesets(only_varname=None): all_rulesets = {} - load_rulesets_recursively(g_root_folder, all_rulesets) + load_rulesets_recursively(g_root_folder, all_rulesets, only_varname) return all_rulesets

8 years, 7 months

valuespec ListChoice: allow to specify text for "no elements defined"

by Mathias Kettner

Module: check_mk Branch: master Commit: 7c466c2382337cebbc23faa2b1c73aa8d961cea1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c466c2382337c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 20 18:08:41 2015 +0100 valuespec ListChoice: allow to specify text for "no elements defined" --- web/htdocs/config.py | 1 - web/htdocs/valuespec.py | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index f7aa6ca..0ed491c 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -41,7 +41,6 @@ except: # move all user related stuff there. e.g. html.user should also be moved # there. -#. # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | # | | _ \ ___ ___| | __ _ _ __ __ _| |_(_) ___ _ __ ___ | diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6992d39..268316b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1537,6 +1537,8 @@ class ListChoice(ValueSpec): lambda id, val: val) self._toggle_all = kwargs.get("toggle_all", False) self._render_orientation = kwargs.get("render_orientation", "horizontal") # other: vertical + self._no_elements_text = kwargs.get("no_elements_text", + _("There are no elements defined for this selection")) # In case of overloaded functions with dynamic elements def load_elements(self): @@ -1556,6 +1558,10 @@ class ListChoice(ValueSpec): def render_input(self, varprefix, value): self.load_elements() + if not self._elements: + html.write(self._no_elements_text) + return + if self._toggle_all: html.write("<a href=\"javascript:vs_list_choice_toggle_all('%s')\">%s</a>" % (varprefix, _("Check / Uncheck all")))

8 years, 7 months

Fixed exception in view editor after yesterdays change

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d6e7c922be3e9a2255fe75f272cd6ddf0888585 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d6e7c922be3e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 20 14:32:26 2015 +0100 Fixed exception in view editor after yesterdays change --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 98c582f..fe3c695 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1770,7 +1770,7 @@ def allowed_for_datasource(collection, datasourcename): allowed = {} for name, item in collection.items(): - columns = item["columns"] + columns = get_painter_columns(item) infos_needed = set([ c.split("_", 1)[0] for c in columns if c != "site" and c not in add_columns]) if len(infos_needed.difference(infos_available)) == 0: allowed[name] = item

8 years, 7 months

Updated bug entries #2323

by Lars Michelsen

Module: check_mk Branch: master Commit: 06ece77b19efec4c91813b3bf7eb19e86701bfcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06ece77b19efec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 20 14:11:16 2015 +0100 Updated bug entries #2323 --- .bugs/2323 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2323 b/.bugs/2323 new file mode 100644 index 0000000..a4b3dcd --- /dev/null +++ b/.bugs/2323 @@ -0,0 +1,10 @@ +Title: On clean sites "X unacknowledged" werks are shown +Component: multisite +State: open +Date: 2015-11-20 14:09:47 +Targetversion: 1.2.7 +Class: bug + +In fresh installed sites, all unacknowledged werks in this version need to be acknowledged +right from the start. It is useless to let the user confirm changes when there is nothing +whch has been changed because it is a clean new installation.

8 years, 7 months

windows agent: fixed two bugs introduced recently

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2f9d4e33e404bc2131ff17f713e861749f9a5bba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f9d4e33e404bc… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 20 10:52:46 2015 +0100 windows agent: fixed two bugs introduced recently first bug: related to incorrect casting of service nam strings second bug: incorrect printf format specifier thanks to Flavio Stanchina for reporting these bugs --- agents/windows/Configuration.cc | 2 +- agents/windows/Environment.cc | 5 +++-- agents/windows/ListenSocket.cc | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 5361545 -> 5397569 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 5361545 -> 5397569 bytes agents/windows/check_mk_agent.cc | 6 +++--- agents/windows/check_mk_agent.exe | Bin 4223010 -> 4257835 bytes agents/windows/check_mk_agent.msi | Bin 9908224 -> 9979904 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 4223010 -> 4257835 bytes agents/windows/install_agent-64.exe | Bin 1278681 -> 1288915 bytes agents/windows/install_agent.exe | Bin 1161640 -> 1169701 bytes 12 files changed, 9 insertions(+), 8 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 02f4aed..6169d64 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -30,7 +30,7 @@ #include <cassert> -extern void verbose(const char *format, ...); +extern void verbose(const char *format, ...) __attribute__ ((format (gnu_printf, 1, 2))); static const int CHECK_MK_AGENT_PORT = 6556; diff --git a/agents/windows/Environment.cc b/agents/windows/Environment.cc index 0c59011..a4d4ed8 100644 --- a/agents/windows/Environment.cc +++ b/agents/windows/Environment.cc @@ -33,7 +33,7 @@ using namespace std; -extern void crash_log(const char *format, ...); +extern void crash_log(const char *format, ...) __attribute__ ((format (gnu_printf, 1, 2))); // technically this is the limit for path names on windows, practically few applications and not @@ -99,7 +99,8 @@ string Environment::assignDirectory(const char *name) string result(_agent_directory + "\\" + name); if (!CreateDirectoryA(result.c_str(), NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) { - crash_log("Failed to create directory %s: %s", GetLastError(), get_win_error_as_string().c_str()); + crash_log("Failed to create directory %s: %s (%lu)", + name, get_win_error_as_string().c_str(), GetLastError()); } } return result; diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 7134952..12b0deb 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -31,7 +31,7 @@ #ifdef DEBUG -extern void debug(char *text); +extern void debug(char *text) __attribute__ ((format (gnu_printf, 1, 2))); #else #define debug(C) #endif diff --git a/agents/windows/build_version b/agents/windows/build_version index 775971e..eddc111 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -648 +652 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 840dbf5..f2f44d9 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index c76c4f2..f81b14f 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 668eb7a..4a1926f 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -563,9 +563,9 @@ void section_services(SOCKET &out) // in some cases it does. We replace them with _ in order // the keep it in one space-separated column. Since we own // the buffer, we can simply change the name inplace. - for (char *w=(char *)(service->lpServiceName); *w; w++) { - if (*w == ' ') - *w = '_'; + for (LPWSTR w=service->lpServiceName; *w; ++w) { + if (*w == L' ') + *w = L'_'; } output(out, "%ls %s/%s %s\n", diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 883c27d..ca63b45 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 0660837..ea68c9b 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 9ab3fe6..c49bdc2 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e3a792f..2798d57 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 51c127b..7cf166c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 7 months

added a small tool to help browse the wmi hierarchy

by Sebastian Herbord

Module: check_mk Branch: master Commit: 25001acf6d4233835a07d92b432b441f4575937f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25001acf6d4233… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 20 10:39:18 2015 +0100 added a small tool to help browse the wmi hierarchy --- agents/windows/wmitest.cc | 136 ++++++++++++++++++++++++++++++++++++++++++++ agents/windows/wmitest.exe | Bin 0 -> 1448856 bytes 2 files changed, 136 insertions(+) diff --git a/agents/windows/wmitest.cc b/agents/windows/wmitest.cc new file mode 100644 index 0000000..0830760 --- /dev/null +++ b/agents/windows/wmitest.cc @@ -0,0 +1,136 @@ +#include "wmiHelper.h" +#include "stringutil.h" +#include <string> +#include <algorithm> + + +void print_usage(const char *exe_name) +{ + printf("Usage: %s action [action specific parameters]" + "\n\ttree - print the whole wmi namespace tree" + "\n\tcsv <namespace> <class> - print the whole class table in csv format" + , exe_name); +} + + +void print_namespace(const std::wstring &path, int depth = 0) +{ + wmi::Helper helper(path.c_str()); + + std::string offset = std::string(depth * 2, ' '); + { + wmi::Result result = helper.query(L"SELECT name FROM __Namespace"); + bool more = result.valid(); + while (more) { + std::wstring name = result.get<std::wstring>(L"name"); + printf("%s%ls\n", offset.c_str(), name.c_str()); + try { + print_namespace(path + L"\\" + name, depth + 1); + } catch (const std::exception &e) { + printf("-- failed: %s\n", e.what()); + } + + more = result.next(); + } + } + { + wmi::Result result = helper.query(L"SELECT * FROM meta_class"); + bool more = result.valid(); + while (more) { + std::wstring name = result.get<std::wstring>(L"__CLASS"); + printf("%s> %ls\n", offset.c_str(), name.c_str()); + more = result.next(); + } + } +} + + +template <typename T> +std::basic_string<T> join(const std::vector<std::basic_string<T>> &input, + const T *sep) { + std::basic_ostringstream<T> stream; + bool first = true; + + + for (const std::basic_string<T> &val : input) { + if (!first) { + stream << sep; + } else { + first = false; + } + stream << val; + } + return stream.str(); +} + + +void print_table(const std::string &ns, const std::string &pattern) { + wmi::Helper helper(to_utf16(ns.c_str()).c_str()); + + wmi::Result result = helper.query(L"SELECT * FROM meta_class"); + bool more = result.valid(); + if (!more) { + printf("Invalid result for meta_class\n"); + } + while (more) { + std::wstring name = result.get<std::wstring>(L"__CLASS"); + try { + if (globmatch(pattern.c_str(), to_utf8(name.c_str()).c_str())) { + printf("<<<%ls>>>\n", name.c_str()); + wmi::Result sub_result = helper.query((std::wstring(L"SELECT * FROM ") + name).c_str()); + bool first = true; + bool sub_more = sub_result.valid(); + if (!sub_more) { + printf("Invalid result\n"); + } + while (sub_more) { + if (first) { + // print header + printf("%ls\n", join(sub_result.names(), L",").c_str()); + first = false; + } + std::vector<std::wstring> values = sub_result.names(); + // resolve all table keys to their value on this row. + std::transform(values.begin(), values.end(), values.begin(), + [&sub_result] (const std::wstring &name) { + return sub_result.get<std::wstring>(name.c_str()); + } + ); + printf("%ls\n", join(values, L",").c_str()); + + sub_more = sub_result.next(); + } + } + } catch (const std::exception &e) { + printf("Exception: %s\n", e.what()); + } + more = result.next(); + } +} + + +int main(int argc, char **argv) +{ + if (argc < 2) { + print_usage(argv[0]); + return 1; + } + + try { + if (strcmp(argv[1], "tree") == 0) { + print_namespace(L"Root"); + } + + if (strcmp(argv[1], "csv") == 0) { + if (argc < 4) { + print_usage(argv[0]); + return 1; + } + print_table(argv[2], argv[3]); + } + + return 0; + } catch (const std::exception &e) { + printf("Failed: %s\n", e.what()); + } +} diff --git a/agents/windows/wmitest.exe b/agents/windows/wmitest.exe new file mode 100755 index 0000000..ce6fc2b Binary files /dev/null and b/agents/windows/wmitest.exe differ

8 years, 7 months

windows agent: improvements and bugfixes to the wmi interface

by Sebastian Herbord

Module: check_mk Branch: master Commit: aa5c32a3b85f4f488b41ad3a464ad848632f488f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa5c32a3b85f4f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 20 08:43:36 2015 +0100 windows agent: improvements and bugfixes to the wmi interface --- agents/windows/stringutil.cc | 31 +++++++++++ agents/windows/stringutil.h | 3 ++ agents/windows/wmiHelper.cc | 120 ++++++++++++++++++++++++++---------------- agents/windows/wmiHelper.h | 5 +- 4 files changed, 112 insertions(+), 47 deletions(-) diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 04efb36..2f1c01a 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -10,6 +10,7 @@ using std::string; +using std::wstring; char *lstrip(char *s) @@ -154,6 +155,13 @@ int parse_boolean(char *value) } +string to_utf8(const char *input) +{ + // this isn't right, the input is most likely in locat 8-bit encoding + return std::string(input); +} + + string to_utf8(const wchar_t *input) { string result; @@ -176,6 +184,29 @@ string to_utf8(const wchar_t *input) } + +wstring to_utf16(const char *input) +{ + wstring result; + // preflight: how many bytes to we need? + int required_size = MultiByteToWideChar(CP_UTF8, 0, input, -1, NULL, 0); + if (required_size == 0) { + // conversion failure. What to do? + return wstring(); + } + result.resize(required_size); + + // real conversion + MultiByteToWideChar(CP_UTF8, 0, input, -1, &result[0], required_size); + + // strip away the zero termination. This is necessary, otherwise the stored string length + // in the string is wrong + result.resize(required_size - 1); + + return result; +} + + bool ci_compare_pred(unsigned char lhs, unsigned char rhs) { return std::tolower(lhs) == std::tolower(rhs); diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index 8c4376a..dbd4466 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -55,8 +55,11 @@ void lowercase(char *s); int parse_boolean(char *value); +std::string to_utf8(const char *input); std::string to_utf8(const wchar_t *input); +std::wstring to_utf16(const char *input); + // case insensitive compare bool ci_equal(const std::string &lhs, const std::string &rhs); diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 6dfe9e6..9137e07 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -36,22 +36,23 @@ using namespace wmi; using namespace std; -#ifdef UNICODE -ComException::ComException(const string &message, HRESULT result) - : runtime_error(message + ": " + to_utf8(_com_error(result, getErrorInfo()).ErrorMessage()) - + " (" + toStringHex(result) + ")") -{ +std::string ComException::resolveError(HRESULT result) +{ + switch (static_cast<ULONG>(result)) { + case WBEM_E_INVALID_NAMESPACE: return "Invalid Namespace"; + case WBEM_E_ACCESS_DENIED: return "Access Denied"; + case WBEM_E_INVALID_CLASS: return "Invalid Class"; + case WBEM_E_INVALID_QUERY: return "Invalid Query"; + default: return to_utf8(_com_error(result, getErrorInfo()).ErrorMessage()); + } } -#else + ComException::ComException(const string &message, HRESULT result) - : runtime_error(message + ": " + _com_error(result, getErrorInfo()).ErrorMessage() - + " (" + toStringHex(result) + ")") + : runtime_error(message + ": " + resolveError(result) + " (" + toStringHex(result) + ")") { } -#endif - ComTypeException::ComTypeException(const string &message) : runtime_error(message) @@ -268,6 +269,15 @@ template <> int Variant::get() } +template <> bool Variant::get() +{ + switch (_value.vt) { + case VT_BOOL: return _value.boolVal; + default: throw ComTypeException(string("wrong value type requested: ") + to_string(_value.vt)); + } +} + + template <> ULONG Variant::get() { switch (_value.vt) { @@ -300,17 +310,70 @@ template <> string Variant::get() template <> wstring Variant::get() { switch (_value.vt) { - case VT_BSTR: return wstring(_value.bstrVal); - default: throw ComTypeException(string("wrong value type requested: ") + to_string(_value.vt)); + case VT_BSTR: + return wstring(_value.bstrVal); + case VT_I1: + case VT_I2: + case VT_I4: + case VT_UI1: + case VT_UI2: + case VT_UI4: + return std::to_wstring(get<int>()); + case VT_UI8: + return std::to_wstring(get<ULONGLONG>()); + case VT_BOOL: + return std::to_wstring(get<bool>()); + case VT_NULL: + return L"<null>"; + default: + throw ComTypeException(string("wrong value type requested: ") + to_string(_value.vt)); } } +class COMManager { +public: + static void init() { + // this is apparently thread safe in C++11 and in gcc even before that + // see §6.4 in C++11 standard or §6.7 in C++14 + static COMManager s_Instance; + } + + ~COMManager() { + CoUninitialize(); + } +private: + COMManager() { + HRESULT res = CoInitializeEx(0, COINIT_MULTITHREADED); + if (FAILED(res)) { + throw ComException("Failed to initialize COM", res); + } + + res = CoInitializeSecurity( + NULL, // security descriptor + -1, // authentication + NULL, // authentication services + NULL, // reserved + RPC_C_AUTHN_LEVEL_DEFAULT, // authentication level + RPC_C_IMP_LEVEL_IMPERSONATE, // impersonation level + NULL, // authentication info + EOAC_NONE, // additional capabilities + NULL // reserved + ); + if (FAILED(res)) { + throw ComException("Failed to initialize COM security", res); + } + } +private: +}; + + Helper::Helper(LPCWSTR path) : _locator(NULL) , _path(path) { - initCOM(); + COMManager::init(); + _locator = getWBEMLocator(); _services = connectServer(_locator); } @@ -324,37 +387,6 @@ Helper::~Helper() if (_services != NULL) { _services->Release(); } - deinitCOM(); -} - - -void Helper::initCOM() -{ - HRESULT res = CoInitializeEx(0, COINIT_MULTITHREADED); - if (FAILED(res)) { - throw ComException("Failed to initialize COM", res); - } - - res = CoInitializeSecurity( - NULL, // security descriptor - -1, // authentication - NULL, // authentication services - NULL, // reserved - RPC_C_AUTHN_LEVEL_DEFAULT, // authentication level - RPC_C_IMP_LEVEL_IMPERSONATE, // impersonation level - NULL, // authentication info - EOAC_NONE, // additional capabilities - NULL // reserved - ); - if (FAILED(res)) { - throw ComException("Failed to initialize COM security", res); - } -} - - -void Helper::deinitCOM() -{ - CoUninitialize(); } diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 4baf86a..48ed235 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -43,6 +43,7 @@ namespace wmi { struct ComException : public std::runtime_error { ComException(const std::string &message, HRESULT result); private: + std::string resolveError(HRESULT result); IErrorInfo *getErrorInfo(); std::string toStringHex(HRESULT res); }; @@ -70,6 +71,7 @@ private: template <> int Variant::get(); +template <> bool Variant::get(); template <> ULONG Variant::get(); template <> ULONGLONG Variant::get(); template <> std::string Variant::get(); @@ -173,9 +175,6 @@ public: private: - void initCOM(); - void deinitCOM(); - // get a locator that is used to look up WMI namespaces IWbemLocator *getWBEMLocator();

8 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015