[ROBO-3413] fix rdp license leak (#33)

[ROBO-3413] fix rdp license leak

.ci/Scripts/PrepareFreeRdpDev.bat

@@ -1,3 +1,3 @@
-call .\getOpenSsl
-call .\buildOpenSsl
-call .\buildFreeRDP Debug
+call %~dp0\getOpenSsl
+call %~dp0\buildOpenSsl
+call %~dp0\buildFreeRDP Debug

.ci/Scripts/buildOpenSsl.bat

@@ -3,10 +3,6 @@ pushd .
 cd %freeRdpDir%\..\OpenSSL
 git clean -xdff
 
-pushd .
-call "%vsDir%\VC\Auxiliary\Build\vcvars64.bat"
-popd
-
 perl Configure VC-WIN64A no-asm no-shared no-module --prefix=%~dp0\..\..\..\OpenSSL-VC-64
 nmake
 nmake install_dev

.ci/Scripts/getOpenSsl.bat

@@ -6,7 +6,7 @@ cd %freeRdpDir%\..
 rem checkout openssl
 mkdir OpenSSL
 cd OpenSSL
-git clone https://github.com/openssl/openssl .
+git clone --no-checkout --filter=tree:0 --depth=1 --single-branch --branch=%openSSLTag% https://github.com/openssl/openssl .
 git branch buildOpenSSl %openSSLTag%
 git checkout buildOpenSSl
 popd

.ci/Scripts/getvars.bat

@@ -1,4 +1,6 @@
 @echo off
+if defined freeRdpDir (exit /b)
+
 set openSSLTag=openssl-3.0.12
 
 set freeRdpDir=%~dp0\..\..
@@ -14,4 +16,5 @@ for /f "usebackq delims=" %%i in (`%vswhere% -prerelease -latest -property insta
   set vsDir=%%i
 )
 
-call "%vsdir%\Common7\Tools\vsdevcmd.bat"
+call "%vsdir%\Common7\Tools\vsdevcmd.bat" -arch=amd64
+

.ci/main.yml

@@ -19,7 +19,7 @@ steps:
 - task: NuGetToolInstaller@1
   displayName: 'Use NuGet'
 
-- task: NuGetAuthenticate@0
+- task: NuGetAuthenticate@1
 
 - script: |
     call .ci\Scripts\getVars
@@ -110,5 +110,5 @@ steps:
   name: publishOpenSSL
   inputs:
     targetPath: '..\OpenSSL-VC-64' 
-    artifactName: 'openSSL' 
+    artifactName: 'OpenSSL-VC-64' 
     parallel: true

UiPath.FreeRdpClient/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<AppVersion>23.12.0</AppVersion>
+		<AppVersion>24.2.0</AppVersion>
 		<Product>UiPath</Product>
 		<Company>UiPath</Company>
 		<Authors>UiPath</Authors>

UiPath.FreeRdpClient/UiPath.FreeRdpClient.Tests/LoggingTests.cs

@@ -13,15 +13,10 @@ public class LoggingTests : TestsBase
     private readonly ConcurrentDictionary<string, ConcurrentBag<(LogLevel logLevel, string message)>> _logsByCategory = new();
     private readonly ConcurrentBag<object> _scopes = new();
     private readonly Mock<ILogger> _loggerMock = new();
-    private Wts WtsApi => Host.GetWts();
-
-    private IFreeRdpClient FreeRdpClient => Host.GetRequiredService<IFreeRdpClient>();
-    private ILogger Log => Host.GetRequiredService<ILogger<RdpClientTests>>();
 
     private async Task<IAsyncDisposable> Connect(RdpConnectionSettings connectionSettings)
     {
-        using var logScope = Log.BeginScope($"{NativeLoggingForwarder.ScopeName}", connectionSettings.ClientName + "_fromTest");
-        return await FreeRdpClient.Connect(connectionSettings);
+        return await Host.Connect(connectionSettings);
     }
 
     public LoggingTests(ITestOutputHelper output) : base(output)
@@ -63,14 +58,13 @@ public async Task ShouldProduceLogsFromFreerdp()
         var connectionSettings = user.ToRdpConnectionSettings();
 
         await using var sut = await Connect(connectionSettings);
-        var sessionId = WtsApi.FindFirstSessionByClientName(connectionSettings.ClientName)
-            .ShouldNotBeNull();
-        await WaitFor.Predicate(() => WtsApi.QuerySessionInformation(sessionId).ConnectState()
+        var sessionId = await Host.FindSession(connectionSettings);
+        await WaitFor.Predicate(() => Host.GetWts().QuerySessionInformation(sessionId).ConnectState()
                     is Windows.Win32.System.RemoteDesktop.WTS_CONNECTSTATE_CLASS.WTSActive
                     or Windows.Win32.System.RemoteDesktop.WTS_CONNECTSTATE_CLASS.WTSConnected);
 
         await sut.DisposeAsync();
-        await WaitFor.Predicate(() => WtsApi.FindFirstSessionByClientName(connectionSettings.ClientName) == null);
+        await Host.WaitNoSession(connectionSettings);
 
         const string acceptedDebugCategory = "com.freerdp.core.nego";
         var negoLogs = _logsByCategory.Where(kv => kv.Key.StartsWith(acceptedDebugCategory))
@@ -94,7 +88,7 @@ is Windows.Win32.System.RemoteDesktop.WTS_CONNECTSTATE_CLASS.WTSActive
         nonDebugFreeRdpLogs.ShouldContain(l => l.message.Contains("forwardFreeRdpLogs:true"));
 
         var scopes = _scopes.OfType<IReadOnlyList<KeyValuePair<string, object?>>>()
-            .Where(kvl => kvl.Any(kv => kv.Key == NativeLoggingForwarder.ScopeName && connectionSettings.ClientName.Equals(kv.Value)))
+            .Where(kvl => kvl.Any(kv => kv.Key == NativeLoggingForwarder.ScopeName && connectionSettings.ScopeName.Equals(kv.Value)))
             .ToArray();
         scopes.ShouldNotBeEmpty();
     }
@@ -139,6 +133,4 @@ public async Task ErrorLogsShouldBeFilteredAndTranslatedToWarn()
         testLogs.Where(l => l.logLevel is LogLevel.Error)
             .ShouldBeEmpty();
     }
-
-
 }