Martin Peřina has uploaded a new change for review. Change subject: aaa: Merge LogoutBySession and LogoutUser to LogoutSession ......................................................................
aaa: Merge LogoutBySession and LogoutUser to LogoutSession Merges LogoutBySessionCommand and LogoutUserCommand to LogoutSessionCommand, because LogoutBySessionCommand only calls LogoutUserCommand internally, otherwise commands are the same. Change-Id: I3eefaa64d3881d0a59233f3f39c8dd0ed790d1f4 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/RestApiSessionMgmtFilter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java 5 files changed, 8 insertions(+), 50 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/38485/1 diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/RestApiSessionMgmtFilter.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/RestApiSessionMgmtFilter.java index 090a95c..a33860d 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/RestApiSessionMgmtFilter.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/RestApiSessionMgmtFilter.java @@ -82,7 +82,7 @@ InitialContext ctx = new InitialContext(); try { FiltersHelper.getBackend(ctx).runAction( - VdcActionType.LogoutBySession, + VdcActionType.LogoutSession, new VdcActionParametersBase(engineSessionId) ); HttpSession session = req.getSession(false); 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 a59958f..7f49552 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 @@ -590,7 +590,7 @@ @Override public VdcReturnValueBase logoff(VdcActionParametersBase parameters) { - return runAction(VdcActionType.LogoutUser, parameters); + return runAction(VdcActionType.LogoutSession, parameters); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java deleted file mode 100644 index 0c20d15..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ovirt.engine.core.bll.aaa; - -import java.util.Collections; -import java.util.List; - -import org.ovirt.engine.core.bll.Backend; -import org.ovirt.engine.core.bll.CommandBase; -import org.ovirt.engine.core.bll.utils.PermissionSubject; -import org.ovirt.engine.core.common.action.VdcActionParametersBase; -import org.ovirt.engine.core.common.businessentities.aaa.DbUser; - -public class LogoutBySessionCommand<T extends VdcActionParametersBase> extends CommandBase<T> { - - private DbUser user; - - public LogoutBySessionCommand(T parameters) { - super(parameters); - user = SessionDataContainer.getInstance().getUser(parameters.getSessionId(), false); - } - - protected boolean canDoAction() { - return user != null; - } - - - @Override - protected void executeCommand() { - VdcActionParametersBase params = new VdcActionParametersBase(); - params.setSessionId(getParameters().getSessionId()); - setReturnValue(Backend.getInstance().logoff(params)); - } - - @Override - protected boolean isUserAuthorizedToRunAction() { - return true; - } - - @Override - public List<PermissionSubject> getPermissionCheckSubjects() { - return Collections.emptyList(); - - } - -} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java similarity index 90% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java index 4dbe784..4b36ab8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java @@ -12,8 +12,11 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.VdcActionParametersBase; -public class LogoutUserCommand<T extends VdcActionParametersBase> extends CommandBase<T> { - public LogoutUserCommand(T parameters) { +/** + * Tries to log out a user identified by its session id + */ +public class LogoutSessionCommand<T extends VdcActionParametersBase> extends CommandBase<T> { + public LogoutSessionCommand(T parameters) { super(parameters); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index 8969e91..bf580c1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -170,8 +170,7 @@ AttachUserToVmFromPoolAndRun(318, ActionGroup.VM_POOL_BASIC_OPERATIONS, QuotaDependency.VDS_GROUP), // UserAndGroupsCommands LoginUser(406, ActionGroup.LOGIN, false, QuotaDependency.NONE), - LogoutUser(408, false, QuotaDependency.NONE), - LogoutBySession(410, false, QuotaDependency.NONE), + LogoutSession(408, false, QuotaDependency.NONE), RemoveUser(409, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), RemoveGroup(415, ActionGroup.MANIPULATE_USERS, false, QuotaDependency.NONE), LoginAdminUser(418, ActionGroup.LOGIN, false, QuotaDependency.NONE), -- To view, visit https://gerrit.ovirt.org/38485 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3eefaa64d3881d0a59233f3f39c8dd0ed790d1f4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
