Yaniv Dary has uploaded a new change for review. Change subject: ovirt-reports: Reports should use current sessionID ......................................................................
ovirt-reports: Reports should use current sessionID Reports should use the new sessionID to get session user from engine if the sessionID has changed Change-Id: I2e7a83b80144696639228889494a929fe4480d0a Bug-Url: https://bugzilla.redhat.com/1116851 Signed-off-by: Ravi Nori <rn...@redhat.com> Signed-off-by: Yaniv Dary <yd...@redhat.com> (cherry picked from commit 8a7a818c0dbb53e7c499002e662c948beeffa85c) --- M ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/12/33512/1 diff --git a/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java index e69c5e7..57b6e7b 100644 --- a/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java +++ b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java @@ -168,7 +168,14 @@ // Checking if we need to re-check the session, and acting accordingly if (userDetails.isRecheckSessionIdNeeded()) { logger.debug("Rechecking session is needed"); - UsernamePasswordAuthenticationToken token = getAuthRequest(request, userDetails.getUserSessionID()); + // if the sessionID has changed + String reqSessionID = request.getParameter("sessionID"); + String sessionID = userDetails.getUserSessionID(); + if (reqSessionID != null && !sessionID.equals(reqSessionID)) { + logger.debug("sessionID has changed, using new sessionID."); + sessionID = reqSessionID; + } + UsernamePasswordAuthenticationToken token = getAuthRequest(request, sessionID); // if the token is null then it means we failed authentication if (token == null) { logger.debug("Returned token is null. Session was not valid. Setting authenticated to false"); diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py index 1e6d61f..4d4fbc6 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py @@ -52,6 +52,9 @@ '${{ENGINE_REPORTS_BASE_URL}}' '/flow.html?_flowId=viewReportFlow' '&viewAsDashboardFrame=true\n' + 'ENGINE_REPORTS_RIGHTCLICK_URL=' + '${{ENGINE_REPORTS_BASE_URL}}' + '/flow.html?_flowId=viewReportFlow\n' 'ENGINE_REPORTS_PROXY_URL=' '${{ENGINE_REPORTS_BASE_URL}}/ovirt/reports-interface\n' 'ENGINE_REPORTS_VERIFY_HOST=true\n' -- To view, visit http://gerrit.ovirt.org/33512 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e7a83b80144696639228889494a929fe4480d0a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-engine-reports-3.5 Gerrit-Owner: Yaniv Dary <yd...@redhat.com> Gerrit-Reviewer: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
