Module: check_mk Branch: master Commit: 2c468c48e98201cd6c091ea8779cb93c6de031b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c468c48e98201… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 7 08:06:47 2014 +0100 FIX Fix login loop bug in distributed environments with different auth secrets --- .werks/425 | 10 ++++++++++ ChangeLog | 2 +- web/htdocs/js/checkmk.js | 18 +++++++++++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.werks/425 b/.werks/425 new file mode 100644 index 0000000..8b39a2c --- /dev/null +++ b/.werks/425 @@ -0,0 +1,10 @@ +Title: Fix login loop bug in distributed environments with different auth secrets +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389078376 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index c84f1c0..762d9e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,6 @@ * 0354 FIX: Catch exception when check plugins do not return a state... * 0398 FIX: Tolerate debug output in check plugins when using CMC... * 0314 FIX: Fix CMC not executing any Check_MK checks after config reload... - * 0438 FIX: Remove test-code, Micro Core only worked once per host... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets @@ -99,6 +98,7 @@ * 0421 FIX: UserDB: Fixed lost passwords when changing users in large user databases... * 0423 FIX: Users are not logged out anymore during changing their own passwords... * 0424 FIX: Improved error handling in case of incorrect auth config in distributed WATO environments + * 0425 FIX: Fix login loop bug in distributed environments with different auth secrets WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c7b925f..84e460f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -119,19 +119,23 @@ function hilite_icon(oImg, onoff) { } -function get_url(url, handler, data, errorHandler) { +function get_url(url, handler, data, errorHandler, addAjaxId) { if (window.XMLHttpRequest) { var AJAX = new XMLHttpRequest(); } else { var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); } + var addAjaxId = (typeof addAjaxId === "undefined") ? true : addAjaxId; + // Dynamic part to prevent caching - var dyn = "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000); - if (url.indexOf('\?') !== -1) { - dyn = "&"+dyn; - } else { - dyn = "?"+dyn; + if (addAjaxId) { + var dyn = "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000); + if (url.indexOf('\?') !== -1) { + dyn = "&"+dyn; + } else { + dyn = "?"+dyn; + } } if (!AJAX) { @@ -517,7 +521,7 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn 'host': host, 'service': service, 'with_link': with_link, 'view': pnpview}; get_url(pnp_url + 'index.php/json?&host=' + encodeURIComponent(host) + '&srv=' + encodeURIComponent(service) + '&source=0&view=' + pnpview, - pnp_response_handler, data, pnp_error_response_handler); + pnp_response_handler, data, pnp_error_response_handler, false); } // Renders contents for the PNP hover menus