Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-379640: Do not reset remote consoles if they're still attempting connection to a VM

Browse Source 
This prevents `AccessViolationException`s being called, as they're hit when two instances of `AxMSTSCLib.AxMsRdpClient9` call `Connect` on the same IP + Port combination, which results in the same memory being accessed in unmanaged code.

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
This commit is contained in:
Danilo Del Busso 2023-07-11 10:24:21 +01:00
parent 9ea0a53447
commit b8eb2b5549
No known key found for this signature in database
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
XenAdmin/ConsoleView/XSVNCScreen.cs
View File

@ -504,6 +504,9 @@ namespace XenAdmin.ConsoleView
}
}
private readonly object _rdpConnectionLock = new object();
/// <summary>
/// Creates the actual VNC or RDP client control.
/// </summary>
@ -519,15 +522,27 @@ namespace XenAdmin.ConsoleView
this.Controls.Clear();
//console size with some offset to accomodate focus rectangle
Size currentConsoleSize = new Size(this.Size.Width - CONSOLE_SIZE_OFFSET, this.Size.Height - CONSOLE_SIZE_OFFSET);
// Stop the old client.
if (RemoteConsole != null)
lock (_rdpConnectionLock)
{
wasFocused = RemoteConsole.ConsoleControl != null && RemoteConsole.ConsoleControl.Focused;
RemoteConsole.DisconnectAndDispose();
RemoteConsole = null;
this.vncPassword = null;
// Stop the old client.
if (RemoteConsole != null)
{
var preventResetConsole = false;
wasFocused = RemoteConsole.ConsoleControl != null && RemoteConsole.ConsoleControl.Focused;
if (RemoteConsole is RdpClient client && client.IsAttemptingConnection)
{
preventResetConsole = true;
}
if(!preventResetConsole)
{
RemoteConsole.DisconnectAndDispose();
RemoteConsole = null;
}
this.vncPassword = null;
}
}
// Reset
haveTriedLoginWithoutPassword = false;