Alexander Wels has uploaded a new change for review. Change subject: webadmin: revert 65452f9dedea24d0acaa38177a987727a79bb7aa ......................................................................
webadmin: revert 65452f9dedea24d0acaa38177a987727a79bb7aa Commited to wrong branch, reverting. Change-Id: If318ed06e271c36ecd856b1fb01a8414f9ee6cea Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1206908 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/EngineSessionTimeoutData.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/RestApiSessionManager.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java 5 files changed, 16 insertions(+), 53 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/39456/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java index 568d089..9259930 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServlet.java @@ -13,9 +13,7 @@ import org.codehaus.jackson.node.ArrayNode; import org.codehaus.jackson.node.ObjectNode; -import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigCommon; -import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -58,8 +56,8 @@ request.setAttribute(ATTR_PLUGIN_DEFS, getPluginDefinitionsArray(pluginData)); // Set attribute for engineSessionTimeout object - request.setAttribute(ATTR_ENGINE_SESSION_TIMEOUT, getEngineSessionTimeoutObject(getUserSessionTimeout(), - getUserSessionHardTimeout())); + Integer engineSessionTimeout = getEngineSessionTimeout(getEngineSessionId(request)); + request.setAttribute(ATTR_ENGINE_SESSION_TIMEOUT, getEngineSessionTimeoutObject(engineSessionTimeout)); super.doGet(request, response); } @@ -112,18 +110,15 @@ return arr; } - protected Integer getUserSessionTimeout() { - return Config.<Integer> getValue(ConfigValues.UserSessionTimeOutInterval); + protected Integer getEngineSessionTimeout(String sessionId) { + return (Integer) runPublicQuery(VdcQueryType.GetConfigurationValue, + new GetConfigurationValueParameters(ConfigurationValues.UserSessionTimeOutInterval, + ConfigCommon.defaultConfigurationVersion), sessionId); } - protected Integer getUserSessionHardTimeout() { - return Config.<Integer> getValue(ConfigValues.UserSessionHardLimit); - } - - protected ObjectNode getEngineSessionTimeoutObject(Integer engineSessionTimeout, Integer userSessionHardLimit) { + protected ObjectNode getEngineSessionTimeoutObject(Integer engineSessionTimeout) { ObjectNode obj = createObjectNode(); - obj.put("sessionTimeout", String.valueOf(engineSessionTimeout)); //$NON-NLS-1$ - obj.put("sessionHardLimit", String.valueOf(userSessionHardLimit)); //$NON-NLS-1$ + obj.put("value", String.valueOf(engineSessionTimeout)); //$NON-NLS-1$ return obj; } diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java index 29300f0..5227e14 100644 --- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java +++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java @@ -93,7 +93,7 @@ public void testDoGet_ExtraAttributes_WithoutUserInfoObject() throws IOException, ServletException { doReturn(mockApplicationModeObject).when(testServlet).getApplicationModeObject(any(Integer.class)); doReturn(mockPluginDefinitionsArray).when(testServlet).getPluginDefinitionsArray(anyListOf(PluginData.class)); - doReturn(mockEngineSessionTimeoutObject).when(testServlet).getEngineSessionTimeoutObject(any(Integer.class), any(Integer.class)); + doReturn(mockEngineSessionTimeoutObject).when(testServlet).getEngineSessionTimeoutObject(any(Integer.class)); testServlet.doGet(mockRequest, mockResponse); verify(mockRequest).setAttribute(WebAdminHostPageServlet.ATTR_APPLICATION_MODE, mockApplicationModeObject); verify(mockRequest).setAttribute(WebAdminHostPageServlet.ATTR_PLUGIN_DEFS, mockPluginDefinitionsArray); @@ -141,9 +141,8 @@ @Test public void testGetEngineSessionTimeoutObject() { - ObjectNode result = testServlet.getEngineSessionTimeoutObject(30, 60); - assertEquals(result.get("sessionTimeout").asInt(), 30); //$NON-NLS-1$ - assertEquals(result.get("sessionHardLimit").asInt(), 60); //$NON-NLS-1$ + ObjectNode result = testServlet.getEngineSessionTimeoutObject(Integer.valueOf(30)); + assertEquals(result.get("value").asText(), "30"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/EngineSessionTimeoutData.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/EngineSessionTimeoutData.java index f0c89f8..92a3f35 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/EngineSessionTimeoutData.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/EngineSessionTimeoutData.java @@ -14,11 +14,8 @@ return $wnd.engineSessionTimeout; }-*/; - public native String getSessionTimeout() /*-{ - return this.sessionTimeout; + public native String getValue() /*-{ + return this.value; }-*/; - public native String getSessionHardLimit() /*-{ - return this.sessionHardLimit; - }-*/; } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/RestApiSessionManager.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/RestApiSessionManager.java index 6bc5090..f019b83 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/RestApiSessionManager.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/restapi/RestApiSessionManager.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.webadmin.plugin.restapi; -import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; @@ -75,22 +74,14 @@ private static final String ENGINE_AUTH_TOKEN_HEADER = "OVIRT-INTERNAL-ENGINE-AUTH-TOKEN"; //$NON-NLS-1$ private static final int DEFAULT_ENGINE_SESSION_TIMEOUT = 30; - private static final int DEFAULT_HARD_LIMIT = 600; - - private static final int MIN_IN_MS = 1000 * 60; // Heartbeat (delay) between REST API keep-alive requests - private static final int SESSION_HEARTBEAT_MS = MIN_IN_MS; + private static final int SESSION_HEARTBEAT_MS = 1000 * 60; // 1 minute private final EventBus eventBus; private final String restApiBaseUrl; private int restApiSessionTimeout; - - private Integer restApiSessionHardlimit; - //On logout the page reloads and this will be reset. - private Date restApiLoginTimePlusHardLimit; - private String restApiSessionId; private boolean refreshRestApiSession = false; @@ -110,8 +101,7 @@ @Override public void onEngineSessionRefreshed(EngineSessionRefreshedEvent event) { - if (restApiSessionId != null && (restApiLoginTimePlusHardLimit == null - || new Date().before(restApiLoginTimePlusHardLimit))) { + if (restApiSessionId != null) { refreshRestApiSession = true; } } @@ -130,22 +120,6 @@ // Because of that, Engine sessions can stay active up to 2 * UserSessionTimeOutInterval // so we adapt REST API session timeout accordingly. restApiSessionTimeout = 2 * engineSessionTimeout; - } - - public void setHardLimit(String sessionHardLimit) { - try { - restApiSessionHardlimit = Integer.valueOf(sessionHardLimit); //Minutes - } catch (NumberFormatException ex) { - restApiSessionHardlimit = DEFAULT_HARD_LIMIT; - } - } - - public void recordLoggedInTime() { - if (restApiSessionHardlimit > 0) { - restApiLoginTimePlusHardLimit = new Date(); - restApiLoginTimePlusHardLimit.setTime(restApiLoginTimePlusHardLimit.getTime() - + ((restApiSessionHardlimit.longValue() - 1) * MIN_IN_MS)); //Subtract one refresh cycle to be sure we stop. - } } /** diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java index 8421331..2df3460 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java @@ -78,8 +78,7 @@ // Check for Engine user session timeout configuration EngineSessionTimeoutData engineSessionTimeoutData = EngineSessionTimeoutData.instance(); if (engineSessionTimeoutData != null) { - restApiSessionManager.setSessionTimeout(engineSessionTimeoutData.getSessionTimeout()); - restApiSessionManager.setHardLimit(engineSessionTimeoutData.getSessionHardLimit()); + restApiSessionManager.setSessionTimeout(engineSessionTimeoutData.getValue()); } // Initiate transition to requested application place @@ -111,7 +110,6 @@ }); performLogin(loginModel); - restApiSessionManager.recordLoggedInTime(); } @Override -- To view, visit https://gerrit.ovirt.org/39456 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If318ed06e271c36ecd856b1fb01a8414f9ee6cea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5.2 Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
