Skip to content

Commit 3e28b99

Browse files
enhance access control validation
1 parent 39df679 commit 3e28b99

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/ListConsoleSessionsCmd.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public class ListConsoleSessionsCmd extends BaseListCmd {
5050
@Inject
5151
private ConsoleAccessManager consoleAccessManager;
5252

53+
@ACL
5354
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ConsoleSessionResponse.class, description = "The ID of the console session.")
5455
private Long id;
5556

server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ protected long getBaseDomainIdToListConsoleSessions(Long domainId) {
268268

269269
@Override
270270
public ConsoleSession listConsoleSessionById(long id) {
271-
return consoleSessionDao.findById(id);
271+
return consoleSessionDao.findByIdIncludingRemoved(id);
272272
}
273273

274274
@Override

server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,6 @@ public void getBaseDomainIdToListConsoleSessionsTestPerformAccessValidationWhenD
309309
@Test
310310
public void listConsoleSessionByIdTestShouldCallDbLayer() {
311311
consoleAccessManager.listConsoleSessionById(1L);
312-
Mockito.verify(consoleSessionDaoMock).findById(1L);
312+
Mockito.verify(consoleSessionDaoMock).findByIdIncludingRemoved(1L);
313313
}
314314
}

0 commit comments

Comments
 (0)