Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

engine: Check concrete disk permissions firstly on TransferImageStatus #946

Merged
merged 1 commit into from
Jun 10, 2024
Merged

engine: Check concrete disk permissions firstly on TransferImageStatus #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions ...rc/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferImageStatusCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import javax.inject.Inject;

import org.apache.commons.lang3.ObjectUtils;
import org.ovirt.engine.core.bll.CommandBase;
import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler;
import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute;
Expand Down Expand Up @@ -104,16 +105,17 @@ protected void executeCommand() {

@Override
public List<PermissionSubject> getPermissionCheckSubjects() {
Guid objectId = getStorageDomainId();
if (objectId == null) {
objectId = getParameters().getStorageDomainId();
if (objectId != null) {
setStorageDomainId(objectId);
} else {
objectId = MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID;
}
// Set storage domain id for audit logs.
if (getStorageDomainId() == null && getParameters().getStorageDomainId() != null) {
setStorageDomainId(getParameters().getStorageDomainId());
}

Guid objectId = ObjectUtils.firstNonNull(
getParameters().getDiskId(),
getParameters().getStorageDomainId(),
MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID
);

// Only check generic permissions because the command and/or ImageUpload entity may be missing
return Collections.singletonList(new PermissionSubject(
objectId,
Expand Down
33 changes: 29 additions & 4 deletions ...est/java/org/ovirt/engine/core/bll/storage/disk/image/TransferImageStatusCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,22 @@
import static org.mockito.Mockito.when;

import java.util.List;
import java.util.stream.Stream;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.ovirt.engine.core.bll.BaseCommandTest;
import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler;
import org.ovirt.engine.core.bll.ValidateTestUtils;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.common.action.TransferImageStatusParameters;
Expand Down Expand Up @@ -46,7 +51,8 @@ public class TransferImageStatusCommandTest extends BaseCommandTest {
private TransferImageStatusCommand<TransferImageStatusParameters> command =
new TransferImageStatusCommand<>(new TransferImageStatusParameters(), null);

private Guid diskId = Guid.newGuid();
private static Guid diskId = Guid.newGuid();
private static Guid storageDomainId = Guid.newGuid();

@BeforeEach
public void setUp() {
Expand All @@ -57,14 +63,33 @@ public void setUp() {
}

@Test
public void testCorrectPermissionCheckSubjects() {
Guid storageDomainId = Guid.newGuid();
void testBaseExecution() {
command.getParameters().setStorageDomainId(storageDomainId);
command.getParameters().setDiskId(diskId);
List<PermissionSubject> subjects = command.getPermissionCheckSubjects();
PermissionSubject subject = subjects.get(0);
assertEquals(storageDomainId, subject.getObjectId());
assertEquals(diskId, subject.getObjectId());
ValidateTestUtils.runAndAssertValidateSuccess(command);
command.executeCommand();
}

@ParameterizedTest
@MethodSource("commandCheckPermissionTestParameters")
public void testCorrectPermissionCheckSubjects(Guid inputDiskId, Guid inputStorageDomainId, Guid expectedPermissionSubjectId) {
command.getParameters().setStorageDomainId(inputStorageDomainId);
command.getParameters().setDiskId(inputDiskId);

List<PermissionSubject> subjects = command.getPermissionCheckSubjects();
PermissionSubject subject = subjects.get(0);

assertEquals(expectedPermissionSubjectId, subject.getObjectId());
}

private static Stream<Arguments> commandCheckPermissionTestParameters() {
return Stream.of(
Arguments.of(diskId, storageDomainId, diskId),
Arguments.of(null, storageDomainId, storageDomainId),
Arguments.of(null, null, MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID)
);
}
}