ofri masad has uploaded a new change for review. Change subject: core: Fix UpdateVm permissions check for Quota ......................................................................
core: Fix UpdateVm permissions check for Quota Quota permissions were checked regardless of the vm state (running/stopped), the quota enforcement mode (Audit/enforcing) and the change in quota selection box. CommandBase was change to check for quota consumption permissions only if the quota was changed & quota is Enforced & vm is running. Otherwise, User could edit vm without having quota consumption permissions. Change-Id: Ib55016efcbed22b003eaddf5c4f8f62aec88928e Bug-Url: https://bugzilla.redhat.com/904105 Signed-off-by: Ofri Masad <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/11418/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 0c87a30..aad90d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -907,13 +907,14 @@ public void addQuotaPermissionSubject(List<PermissionSubject> quotaPermissionList) { if (!isInternalExecution() && getStoragePool() != null - && getStoragePool().getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED) { + && getStoragePool().getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED + && getStoragePool().getQuotaEnforcementType() != QuotaEnforcementTypeEnum.SOFT_ENFORCEMENT) { List<QuotaConsumptionParameter> consumptionParameters = getQuotaConsumptionParameters(); if (consumptionParameters != null) { for (QuotaConsumptionParameter parameter : getQuotaConsumptionParameters()) { - if (parameter.getQuotaGuid() != null && parameter.getQuotaGuid() != Guid.Empty) { + if (parameter.getQuotaGuid() != null && parameter.getQuotaGuid() != Guid.Empty && parameter.getParameterType() != QuotaConsumptionParameter.ParameterType.SANITY) { quotaPermissionList.add(new PermissionSubject(parameter.getQuotaGuid(), VdcObjectType.Quota, ActionGroup.CONSUME_QUOTA)); } } -- To view, visit http://gerrit.ovirt.org/11418 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib55016efcbed22b003eaddf5c4f8f62aec88928e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
