deal with inexistent provided domain ID

Author: bernardodemarco

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

@@ -28,7 +28,9 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.domain.Domain;
 import com.cloud.domain.dao.DomainDao;
+import com.cloud.exception.InvalidParameterValueException;
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.apache.cloudstack.api.ResponseObject;
 import org.apache.cloudstack.api.command.user.consoleproxy.ConsoleEndpoint;
@@ -255,7 +257,12 @@ protected long getBaseDomainIdToListConsoleSessions(Long domainId) {
             return caller.getDomainId();
         }
 
-        accountManager.checkAccess(caller, domainDao.findById(domainId));
+        Domain domain = domainDao.findById(domainId);
+        if (domain == null) {
+            throw new InvalidParameterValueException(String.format("Unable to find domain with ID [%s]. Verify the informed domain and try again.", domainId));
+        }
+
+        accountManager.checkAccess(caller, domain);
         return domainId;
     }
 

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

@@ -172,6 +172,7 @@ public void listConsoleSessionsInternalTestAdminsShouldBeAllowedToRetrieveOtherA
         try (MockedStatic<CallContext> callContextStaticMock = Mockito.mockStatic(CallContext.class)) {
             callContextStaticMock.when(CallContext::current).thenReturn(callContextMock);
             Mockito.when(listConsoleSessionsCmdMock.getDomainId()).thenReturn(callerDomainId);
+            Mockito.doReturn(callerDomainId).when(consoleAccessManager).getBaseDomainIdToListConsoleSessions(callerDomainId);
             Mockito.when(listConsoleSessionsCmdMock.getAccountId()).thenReturn(callerAccountId);
             Mockito.when(listConsoleSessionsCmdMock.getUserId()).thenReturn(callerUserId);
             Mockito.when(listConsoleSessionsCmdMock.isRecursive()).thenReturn(isRecursive);
@@ -199,6 +200,7 @@ public void listConsoleSessionsInternalTestShouldNotFetchConsoleSessionsRecursiv
         try (MockedStatic<CallContext> callContextStaticMock = Mockito.mockStatic(CallContext.class)) {
             callContextStaticMock.when(CallContext::current).thenReturn(callContextMock);
             Mockito.when(listConsoleSessionsCmdMock.getDomainId()).thenReturn(callerDomainId);
+            Mockito.doReturn(callerDomainId).when(consoleAccessManager).getBaseDomainIdToListConsoleSessions(callerDomainId);
             Mockito.when(listConsoleSessionsCmdMock.getAccountId()).thenReturn(callerAccountId);
             Mockito.when(listConsoleSessionsCmdMock.getUserId()).thenReturn(callerUserId);
             Mockito.when(listConsoleSessionsCmdMock.isRecursive()).thenReturn(isRecursive);
@@ -226,6 +228,7 @@ public void listConsoleSessionsInternalTestShouldFetchConsoleSessionsRecursively
         try (MockedStatic<CallContext> callContextStaticMock = Mockito.mockStatic(CallContext.class)) {
             callContextStaticMock.when(CallContext::current).thenReturn(callContextMock);
             Mockito.when(listConsoleSessionsCmdMock.getDomainId()).thenReturn(callerDomainId);
+            Mockito.doReturn(callerDomainId).when(consoleAccessManager).getBaseDomainIdToListConsoleSessions(callerDomainId);
             Mockito.when(listConsoleSessionsCmdMock.getAccountId()).thenReturn(callerAccountId);
             Mockito.when(listConsoleSessionsCmdMock.getUserId()).thenReturn(callerUserId);
             Mockito.when(listConsoleSessionsCmdMock.isRecursive()).thenReturn(isRecursive);