Skip to content

Commit cf050aa

Browse files
persist console endpoint creator IP address
1 parent 8c0bb2b commit cf050aa

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ private ConsoleEndpoint composeConsoleAccessEndpoint(String rootUrl, VirtualMach
389389
String url = generateConsoleAccessUrl(rootUrl, param, token, vncPort, vm, hostVo, details);
390390

391391
logger.debug("Adding allowed session: " + sessionUuid);
392-
persistConsoleSession(sessionUuid, vm.getId(), hostVo.getId());
392+
persistConsoleSession(sessionUuid, vm.getId(), hostVo.getId(), addr);
393393
managementServer.setConsoleAccessForVm(vm.getId(), sessionUuid);
394394

395395
ConsoleEndpoint consoleEndpoint = new ConsoleEndpoint(true, url);
@@ -403,13 +403,14 @@ private ConsoleEndpoint composeConsoleAccessEndpoint(String rootUrl, VirtualMach
403403
return consoleEndpoint;
404404
}
405405

406-
protected void persistConsoleSession(String sessionUuid, long instanceId, long hostId) {
406+
protected void persistConsoleSession(String sessionUuid, long instanceId, long hostId, String consoleEndpointCreatorAddress) {
407407
ConsoleSessionVO consoleSessionVo = new ConsoleSessionVO();
408408
consoleSessionVo.setUuid(sessionUuid);
409409
consoleSessionVo.setAccountId(CallContext.current().getCallingAccountId());
410410
consoleSessionVo.setUserId(CallContext.current().getCallingUserId());
411411
consoleSessionVo.setInstanceId(instanceId);
412412
consoleSessionVo.setHostId(hostId);
413+
consoleSessionVo.setConsoleEndpointCreatorAddress(consoleEndpointCreatorAddress);
413414
consoleSessionDao.persist(consoleSessionVo);
414415
}
415416

0 commit comments

Comments
 (0)