Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: fix session timeout ......................................................................
aaa: fix session timeout The fix is done by the following ways: a. Public Queries which do not require user should not perform session refresh (they should be agnostic to it) b. The API resource should not perform refresh as well Change-Id: I6640beef3ca28f95def87ac5e29d41f75b0fddd8 Topic: AAA Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1168842 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java 4 files changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/35897/1 diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java index 1df5ee7..def793b 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java @@ -28,10 +28,10 @@ private boolean isSessionValid(String session) throws NamingException { InitialContext ctx = new InitialContext(); try { + VdcQueryParametersBase params = new VdcQueryParametersBase(session); VdcQueryReturnValue returnValue = FiltersHelper.getBackend(ctx) - .runPublicQuery(VdcQueryType.ValidateSession, - new VdcQueryParametersBase(session)); + .runPublicQuery(VdcQueryType.ValidateSession, params); return returnValue.getSucceeded(); } finally { ctx.close(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 1113c57..8b601a3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -594,6 +594,7 @@ case CheckDBConnection: case GetValueBySession: case ValidateSession: + parameters.setRefresh(false); return runQueryImpl(actionType, parameters, false); case GetConfigurationValue: GetConfigurationValueParameters configParameters = (GetConfigurationValueParameters) parameters; @@ -602,6 +603,7 @@ configParameters.getConfigValue() == ConfigurationValues.ApplicationMode || configParameters.getConfigValue() == ConfigurationValues.UserMessageOfTheDay || configParameters.getConfigValue() == ConfigurationValues.UserSessionTimeOutInterval) { + parameters.setRefresh(false); return runQueryImpl(actionType, parameters, false); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java index fe349bf..497650696 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java @@ -297,8 +297,10 @@ private HashMap<String, Integer> getSystemStatistics() { try { + GetSystemStatisticsQueryParameters params = new GetSystemStatisticsQueryParameters(-1); + params.setRefresh(false); VdcQueryReturnValue result = runQuery(VdcQueryType.GetSystemStatistics, - new GetSystemStatisticsQueryParameters(-1)); + params); if (!result.getSucceeded() || result.getReturnValue() == null) { String failure; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java index 301d792..179f4e6 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java @@ -327,9 +327,11 @@ } protected <T> T getConfigurationValueDefault(Class<T> clz, ConfigurationValues config) { + GetConfigurationValueParameters params = new GetConfigurationValueParameters(config, ConfigCommon.defaultConfigurationVersion); + params.setRefresh(false); return getEntity(clz, VdcQueryType.GetConfigurationValue, - new GetConfigurationValueParameters(config, ConfigCommon.defaultConfigurationVersion), + params, config.toString()); } -- To view, visit http://gerrit.ovirt.org/35897 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6640beef3ca28f95def87ac5e29d41f75b0fddd8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
