Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4929 FIX Improved responsiveness of the GUI while loading hover graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: c1be1f71079047ce794fe0b6066426716cefe814 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1be1f71079047… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 15:03:38 2017 +0200 4929 FIX Improved responsiveness of the GUI while loading hover graphs Change-Id: I6f4699b7fcea1d6845e27c3eeac8e7d2ed8d9df8 --- .werks/4929 | 10 ++++++ web/htdocs/check_mk.css | 3 +- web/htdocs/js/checkmk.js | 81 +++++++++++++++++++++++++++++++++----------- web/plugins/icons/builtin.py | 19 +++++++---- 4 files changed, 87 insertions(+), 26 deletions(-) diff --git a/.werks/4929 b/.werks/4929 new file mode 100644 index 0000000..e1b3df4 --- /dev/null +++ b/.werks/4929 @@ -0,0 +1,10 @@ +Title: Improved responsiveness of the GUI while loading hover graphs +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498827788 +Class: fix + + diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index d964b18..b58abfd 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -739,7 +739,8 @@ div#hover_menu { color: #000; } -div#hover_menu div.error { +div#hover_menu div.error, +div#hover_menu div.message { width:350px; margin: 0; } diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 0fc4d75..24eef6f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -847,7 +847,8 @@ function create_pnp_graph(data, params) { urlvars = null; } -function render_pnp_graphs(container, site, host, service, pnpview, base_url, pnp_url, with_link, add_txt, from_ts, to_ts) { +function render_pnp_graphs(container, site, host, service, pnpview, base_url, pnp_url, with_link, add_txt, from_ts, to_ts) +{ from_ts = (typeof from_ts === 'undefined') ? null : from_ts; to_ts = (typeof to_ts === 'undefined') ? null : to_ts; @@ -867,37 +868,81 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn get_url(url, pnp_response_handler, data, pnp_error_response_handler, false); } -function hover_graph(site, host_name, service) +function show_hover_graphs(event, site_id, host_name, service_description, pnp_popup_url, force_pnp_graphing) +{ + var event = event || window.event; + + show_hover_menu(event, "<div class=\"message\">Loading...</div>"); + + if (force_pnp_graphing) + show_pnp_hover_graphs(pnp_popup_url); + else + show_check_mk_hover_graphs(site_id, host_name, service_description); + + return prevent_default_events(event); +} + +function show_check_mk_hover_graphs(site_id, host_name, service) { - var c = get_url_sync('host_service_graph_popup.py?site='+encodeURIComponent(site) - +'&host_name='+encodeURIComponent(host_name) - +'&service='+encodeURIComponent(service)); + var url = 'host_service_graph_popup.py?site='+encodeURIComponent(site_id) + +'&host_name='+encodeURIComponent(host_name) + +'&service='+encodeURIComponent(service); - if (c.indexOf('pnp4nagios') !== -1) { - // fallback to pnp graph handling (received an URL by the get_url_sync()) - return fetch_pnp_hover_contents(c); + call_ajax(url, { + response_handler : handle_check_mk_hover_graphs_response, + error_handler : handle_hover_graphs_error, + method : 'GET' + }); +} + +function show_pnp_hover_graphs(url) +{ + call_ajax(url, { + response_handler : handle_pnp_hover_graphs_response, + error_handler : handle_hover_graphs_error, + method : 'GET' + }); +} + +function handle_check_mk_hover_graphs_response(_unused, code) +{ + if (code.indexOf('pnp4nagios') !== -1) { + // fallback to pnp graph handling (received an URL with the previous ajax call) + show_pnp_hover_graphs(code); + return; } - return c; + g_hover_menu.innerHTML = code; + executeJSbyObject(g_hover_menu); } -function fetch_pnp_hover_contents(url) + +function handle_pnp_hover_graphs_response(_unused, code) { - var c = get_url_sync(url); + // In case of PNP hover graph handling: // It is possible that, if using multisite based authentication, pnp sends a 302 redirect // to the login page which is transparently followed by XmlHttpRequest. There is no chance // to catch the redirect. So we try to check the response content. If it does not contain // the expected code, simply display an error message. - if (c.indexOf('/image?') === -1) { + if (code.indexOf('/image?') === -1) { // Error! unexpected response - c = '<div class="error"> ' - + 'ERROR: Received an unexpected response ' - + 'while trying to display the PNP-Graphs. Maybe there is a problem with the ' - + 'authentication.</div>'; + code = '<div class="error"> ' + + 'ERROR: Received an unexpected response ' + + 'while trying to display the PNP Graphs. Maybe there is a problem with the ' + + 'authentication.</div>'; } - return c; + + g_hover_menu.innerHTML = code; + executeJSbyObject(g_hover_menu); +} + + +function handle_hover_graphs_error(_unused, status_code, error_msg) +{ + g_hover_menu.innerHTML = '<div class=error>Update failed (' + status_code + ')</div>'; } + //#. //# .-Reschedule---------------------------------------------------------. //# | ____ _ _ _ | @@ -3160,8 +3205,6 @@ function show_hover_menu(event, code) // out of sight if (hoverTop +g_hover_menu.clientHeight > pageHeight() && hoverTop -g_hover_menu.clientHeight >= 0) g_hover_menu.style.top = hoverTop -g_hover_menu.clientHeight - hoverSpacer + 'px'; - - return false; } function hover_menu_in_screen(hoverMenu, hoverSpacer) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index a4f11ba..5ec70cd 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -360,7 +360,7 @@ def pnp_icon(row, what): if not metrics.cmk_graphs_possible(row["site"]): # Directly ask PNP for all data, don't try to use the new graph fetching mechanism # to keep the number of single requests low - hover_content_func = 'fetch_pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) + force_pnp_graphing = True else: # Don't show the icon with Check_MK graphing. The hover makes no sense and there is no # mobile view for graphs, so the graphs on the bottom of the host/service view are enough @@ -368,11 +368,18 @@ def pnp_icon(row, what): if html.is_mobile(): return - hover_content_func = 'hover_graph(\'%s\', \'%s\', \'%s\')' % \ - (row['site'], row['host_name'], row.get('service_description', '_HOST_').replace("\\", "\\\\")) - - return '<a href="%s" onmouseover="show_hover_menu(event, %s)" ' \ - 'onmouseout="hide_hover_menu()">%s</a>' % (url, hover_content_func, html.render_icon('pnp', '')) + force_pnp_graphing = False + + return html.render_a(content=html.render_icon('pnp', ''), href=url, + onmouseout="hide_hover_menu()", + onmouseover="show_hover_graphs(event, %s, %s, %s, %s, %s);" % ( + json.dumps(row['site']), + json.dumps(row["host_name"]), + json.dumps(row.get('service_description', '_HOST_')), + json.dumps(pnp_popup_url(row, what)), + json.dumps(force_pnp_graphing) + ) + ) def paint_pnp_graph(what, row, tags, host_custom_vars):

7 years

Cleaned up packaging of some commands

by Lars Michelsen

Module: check_mk Branch: master Commit: 4be38e8aa8736026df53e001a550d0125d5b3e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4be38e8aa87360… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 14:03:57 2017 +0200 Cleaned up packaging of some commands Change-Id: Ia8a8148692b2dc433d60e60eba14c720d77f7081 --- bin/cmk | 1 + bin/mkp | 2 ++ tests/omd/test_basic_commands.py | 17 +++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/bin/cmk b/bin/cmk new file mode 120000 index 0000000..74a4466 --- /dev/null +++ b/bin/cmk @@ -0,0 +1 @@ +check_mk \ No newline at end of file diff --git a/bin/mkp b/bin/mkp new file mode 100755 index 0000000..6a0cd85 --- /dev/null +++ b/bin/mkp @@ -0,0 +1,2 @@ +#!/bin/sh +exec check_mk -P "$@" diff --git a/tests/omd/test_basic_commands.py b/tests/omd/test_basic_commands.py new file mode 100644 index 0000000..04bdb94 --- /dev/null +++ b/tests/omd/test_basic_commands.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import os +import stat + +def test_basic_commands(site): + commands = [ + "bin/mkp", + "bin/check_mk", + "bin/cmk", + "bin/omd", + ] + + for rel_path in commands: + path = os.path.join(site.root, rel_path) + assert os.path.exists(path)

7 years

Fixed JS warning messages in firefox related to Connection/

by Lars Michelsen

Content-length headers Message-ID: <59563d8b.hQUc0RE2qQFwWk+L%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c815b0f866d8c887807a8c1475d59540c2eff87b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c815b0f866d8c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 13:49:18 2017 +0200 Fixed JS warning messages in firefox related to Connection/Content-length headers Change-Id: Ic9dfcf37338683de906e963823d15bfdd46046a1 --- web/htdocs/js/checkmk.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 601cd24..0fc4d75 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -482,8 +482,6 @@ function call_ajax(url, optional_args) if (args.method == "POST") { AJAX.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - AJAX.setRequestHeader("Content-length", args.post_data.length); - AJAX.setRequestHeader("Connection", "close"); } if (!args.sync) {

7 years

Cleaned up duplication of msi-update script

by Lars Michelsen

Module: check_mk Branch: master Commit: c978854ea5fc44e0a22aaff0c459ff10b0b4e9e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c978854ea5fc44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 13:57:55 2017 +0200 Cleaned up duplication of msi-update script Change-Id: I2c88326a99e8ced21129da63f2e5c411b55fb52f --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5d00ce0..90bd594 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,9 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME) - tar czf $(DISTNAME)/bin.tar.gz $(TAROPTS) -C bin $$(cd bin ; ls) + tar cf $(DISTNAME)/bin.tar $(TAROPTS) -C bin $$(cd bin ; ls) + tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update + gzip $(DISTNAME)/bin.tar pycompile lib ; \ tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) -C lib \ --transform 's|^|cmk/|g' $$(cd lib ; ls) ; \

7 years

some timeperiod code refactorings related to the latest modules-> cmk_base changes

by Andreas Boesl

Module: check_mk Branch: master Commit: 07ed3867166284a6632207292683416cab8922d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07ed3867166284… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 30 13:55:31 2017 +0200 some timeperiod code refactorings related to the latest modules->cmk_base changes Change-Id: I5198a2ab4178b857bf734e07b886b46ee628b515 --- cmk_base/core.py | 78 +++++++++++++++++++++++++++++------------------------- cmk_base/events.py | 5 ++-- cmk_base/utils.py | 2 +- 3 files changed, 45 insertions(+), 40 deletions(-) diff --git a/cmk_base/core.py b/cmk_base/core.py index 7f2c494..52d158d 100644 --- a/cmk_base/core.py +++ b/cmk_base/core.py @@ -35,6 +35,7 @@ import sys import cmk.paths import cmk.debug import cmk.tty as tty +import livestatus from cmk.exceptions import MKGeneralException import cmk_base.console as console @@ -42,6 +43,7 @@ import cmk_base.config as config import cmk_base.core_config as core_config import cmk_base.core_nagios as core_nagios from cmk_base.exceptions import MKTimeout +from cmk_base import config_cache try: import cmk_base.cee.core_cmc as core_cmc @@ -182,49 +184,53 @@ def do_core_action(action, quiet=False): # | Fetching timeperiods from the core | # '----------------------------------------------------------------------' -g_inactive_timerperiods = None # Cache for current state of timeperiods - -# Return plain response from local Livestatus - without any parsing -# TODO: Use livestatus module -def simple_livestatus_query(lql): - s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - s.connect(cmk.paths.livestatus_unix_socket) - # We just get the currently inactive timeperiods. All others - # (also non-existing) are considered to be active - s.send(lql) - s.shutdown(socket.SHUT_WR) - response = "" - while True: - chunk = s.recv(4096) - if not chunk: - break - response += chunk - return response - - # Check if a timeperiod is currently active. We have no other way than # doing a Livestatus query. This is not really nice, but if you have a better # idea, please tell me... def check_timeperiod(timeperiod): - global g_inactive_timerperiods # Let exceptions happen, they will be handled upstream. - if g_inactive_timerperiods == None: - try: - response = simple_livestatus_query("GET timeperiods\nColumns: name\nFilter: in = 0\n") - g_inactive_timerperiods = response.splitlines() - except MKTimeout: + try: + update_timeperiods_cache() + except MKTimeout: + raise + + except: + if cmk.debug.enabled(): raise - except: - if cmk.debug.enabled(): - raise - else: - # If the query is not successful better skip this check then fail - return True + # If the query is not successful better skip this check then fail + return True + + # Note: This also returns True when the timeperiod is unknown + # The following function timeperiod_active handles this differently + return config_cache.get_dict("timeperiods_cache").get(timeperiod, True) == True + + +# Returns +# True : match +# False: no match +# None : unable to connect to livestatus or timeperiod is unknown +def timeperiod_active(timeperiod): + try: + update_inactive_timeperiods() + return config_cache.get_dict("timeperiods_cache").get(timeperiod) + except: # socket.error / MKTimeout / ? + if cmk.debug.enabled(): + raise + return None + + +def update_timeperiods_cache(): + # { "last_update": 1498820128, "timeperiods": [{"24x7": True}] } + # The value is store within the config cache since we need a fresh start on reload + tp_cache = config_cache.get_dict("timeperiods_cache") + + if not tp_cache: + response = livestatus.LocalConnection().query("GET timeperiods\nColumns: name in") + for tp_name, tp_active in response: + tp_cache[tp_name] = bool(tp_active) - return timeperiod not in g_inactive_timerperiods +def cleanup_timeperiod_caches(): + config_cache.get_dict("timeperiods_cache").clear() -def cleanup_inactive_timeperiods(): - global g_inactive_timerperiods - g_inactive_timerperiods = None diff --git a/cmk_base/events.py b/cmk_base/events.py index 503f8ca..c55e788 100644 --- a/cmk_base/events.py +++ b/cmk_base/events.py @@ -59,9 +59,8 @@ def event_keepalive(event_function, log_function, call_every_loop=None, loop_int while True: try: - # Invalidate timeperiod cache - global g_inactive_timerperiods - g_inactive_timerperiods = None + # Invalidate timeperiod caches + core.cleanup_timeperiod_caches() # If the configuration has changed, we do a restart. But we do # this check just before the next event arrives. We must diff --git a/cmk_base/utils.py b/cmk_base/utils.py index 63d6428..720fbd8 100644 --- a/cmk_base/utils.py +++ b/cmk_base/utils.py @@ -177,7 +177,7 @@ def cleanup_globals(): import cmk_base.item_state cmk_base.item_state.cleanup_item_states() import cmk_base.core - cmk_base.core.cleanup_inactive_timeperiods() + cmk_base.core.cleanup_timeperiod_caches() import cmk_base.snmp cmk_base.snmp.cleanup_host_caches() import cmk_base.agent_data

7 years

4928 FIX Views: Toggle all checkboxes in row select was missing last row in grouped views

by Lars Michelsen

Module: check_mk Branch: master Commit: 962d5ef7404d22f299b2d22196ac230425c18658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=962d5ef7404d22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 13:45:35 2017 +0200 4928 FIX Views: Toggle all checkboxes in row select was missing last row in grouped views Change-Id: Icbd843226e767801a156cc14a83aa055c71f4145 --- .werks/4928 | 11 +++++++++++ web/htdocs/js/checkmk.js | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4928 b/.werks/4928 new file mode 100644 index 0000000..fd48a77 --- /dev/null +++ b/.werks/4928 @@ -0,0 +1,11 @@ +Title: Views: Toggle all checkboxes in row select was missing last row in grouped views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498823113 + + diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 18c59ba..601cd24 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1553,7 +1553,7 @@ function toggle_group_rows(checkbox) { } else { // Found the start of our group. Now search for the end if(rows[i].className === 'groupheader') { - group_end = i - 1; + group_end = i; break; } }

7 years

Views: Fixed use of add_columns during livestatus queries

by Lars Michelsen

Module: check_mk Branch: master Commit: 162d4b38d11410e8884cab23278bf0b5d30fcb52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=162d4b38d11410… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 13:05:54 2017 +0200 Views: Fixed use of add_columns during livestatus queries Change-Id: I7031005872e6927d646c2c313db50feec413b99a --- 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 d1c0bd6..282e6a3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2245,7 +2245,7 @@ def query_data(datasource, columns, add_columns, add_headers, def do_query_data(query, columns, add_columns, merge_column, add_headers, only_sites, limit, auth_domain): - query += "Columns: %s\n" % " ".join(columns) + query += "Columns: %s\n" % " ".join(columns + add_columns) query += add_headers sites.live().set_prepend_site(True)

7 years

4927 FIX LDAP: Use port 636 instead of 389 by default when enabling SSL

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c70a38757178416861f8b6a9e01481faebb2ee6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c70a387571784… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 11:14:36 2017 +0200 4927 FIX LDAP: Use port 636 instead of 389 by default when enabling SSL When not explicitly setting a port in the LDAP connection the default LDAP SSL port 636 is used when enabling SSL. Change-Id: I197957f2525cc6bc7d6be8aa0776fc70c53a5d55 --- .werks/4927 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/4927 b/.werks/4927 new file mode 100644 index 0000000..3b465cb --- /dev/null +++ b/.werks/4927 @@ -0,0 +1,12 @@ +Title: LDAP: Use port 636 instead of 389 by default when enabling SSL +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498814017 + +When not explicitly setting a port in the LDAP connection the default +LDAP SSL port 636 is used when enabling SSL.

7 years

4926 FIX LDAP: Use Check_MK trusted certificate authorities for validating certificates

by Lars Michelsen

Module: check_mk Branch: master Commit: eaabcd13a85e8897a4ce8f78355a747bb4f6987b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaabcd13a85e88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 30 11:15:17 2017 +0200 4926 FIX LDAP: Use Check_MK trusted certificate authorities for validating certificates When using SSL encrypted SSL connections the trusted certificate authorities configured in the global setting are now used. Change-Id: I318823d98bfbbbe8f1a97a4e87fd1278c4954170 --- .werks/4926 | 12 ++++++++++++ web/htdocs/wato.py | 12 +++++------- web/plugins/userdb/ldap.py | 20 ++++++++++++++++++-- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.werks/4926 b/.werks/4926 new file mode 100644 index 0000000..0b6522c --- /dev/null +++ b/.werks/4926 @@ -0,0 +1,12 @@ +Title: LDAP: Use Check_MK trusted certificate authorities for validating certificates +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498813939 + +When using SSL encrypted SSL connections the trusted certificate authorities configured +in the global setting are now used. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4666224..fcc4a11 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6237,13 +6237,10 @@ def vs_ldap_connection(new, connection_id): )), ("use_ssl", FixedValue( title = _("Use SSL"), - help = _("Connect to the LDAP server with a SSL encrypted connection. You might need " - "to configure the OpenLDAP installation on your monitoring server to accept " - "the certificates of the LDAP server. This is normally done via system wide " - "configuration of the CA certificate which signed the certificate of the LDAP " - "server. Please refer to the <a target=\"_blank\" " - "href=\"https://mathias-kettner.com/checkmk_multisite_ldap_integration.html\">" - "documentation</a> for details."), + help = _("Connect to the LDAP server with a SSL encrypted connection. The " + "<a href=\"wato.py?mode=edit_configvar&site=&varname=trusted_certificate_authorities\">trusted " + "certificates authorities</a> configured in Check_MK will be used to validate the " + "certificate provided by the LDAP server."), value = True, totext = _("Encrypt the network connection using SSL."), )), @@ -6705,6 +6702,7 @@ def mode_edit_ldap_connection(phase): except Exception, e: state = False msg = _('Exception: %s') % html.render_text(e) + log_exception() if state: img = html.render_icon("success", _('Success')) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index cc68ed9..d0776dc 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -193,10 +193,20 @@ class LDAPUserConnector(UserConnector): if self.is_active_directory(): conn.set_option(ldap.OPT_REFERRALS, 0) + conn.set_option(ldap.OPT_X_TLS_CACERTFILE, + "%s/var/ssl/ca-certificates.crt" % cmk.paths.omd_root) + self.default_bind(conn) return conn, None + except (ldap.SERVER_DOWN, ldap.TIMEOUT, ldap.LOCAL_ERROR, ldap.LDAPError), e: - return None, '%s: %s' % (uri, e[0].get('info', e[0].get('desc', ''))) + if type(e[0]) == dict: + msg = e[0].get('info', e[0].get('desc', '')) + else: + msg = "%s" % e + + return None, "%s: %s" % (uri, msg) + except MKLDAPException, e: return None, "%s" % e @@ -206,7 +216,13 @@ class LDAPUserConnector(UserConnector): uri = 'ldaps://' else: uri = 'ldap://' - return uri + '%s:%d' % (server, self._config.get('port', 389)) + + if "port" in self._config: + port_spec = ":%d" % self._config["port"] + else: + port_spec = "" + + return uri + server + port_spec def connect(self, enforce_new = False, enforce_server = None):

7 years

Fixed werk

by Simon Betz

Module: check_mk Branch: master Commit: ff0d1f56ea7049d070d5c5e2e77f8d8b442152f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff0d1f56ea7049… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 30 10:08:00 2017 +0200 Fixed werk Change-Id: Ie5bb414d3f8a317dabc2914b47727ec55151ea2d --- .werks/4883 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4883 b/.werks/4883 index a372113..a98755a 100644 --- a/.werks/4883 +++ b/.werks/4883 @@ -5,7 +5,7 @@ Class: fix Compatible: compat Edition: cre State: unknown -Version: 1.4.0p8 +Version: 1.5.0i1 Date: 1498808308

7 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017