diff --git a/CHANGELOG b/CHANGELOG index 0620f3e..0c8aa62 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ -2020-10-23 Version 2.9.1 (stable) +2020-12-06 Version 2.9.1 (stable) + fixed an issue where the installer hangs due to enabling Windows features (via PowerShell) that prompt the user to restart or not while there is no UI to confirm + fixed a regression when hiding the toolbar from web.config fixed an issue into FreeRDP with a special copy&paste logic into MS Office applications which disconnected the session after a special paste when pressing the enter key the protocol scheme when sharing a session or creating a session URL is now determined by the HTTP_X_FORWARDED_PROTO http header if available, instead of the current http request, so that https is correctly detected after a redirection by a reverse proxy or a load-balancer + now rolling over display updates and audio block indexes if they reach max int value 2020-09-26 Version 2.9.0 (stable) added a virtual on-screen keyboard (multi-languages) diff --git a/Myrtille.Admin.Services/Properties/AssemblyInfo.cs b/Myrtille.Admin.Services/Properties/AssemblyInfo.cs index 7f184ac..c8cfbd9 100644 --- a/Myrtille.Admin.Services/Properties/AssemblyInfo.cs +++ b/Myrtille.Admin.Services/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Admin.Web/Properties/AssemblyInfo.cs b/Myrtille.Admin.Web/Properties/AssemblyInfo.cs index 3195957..ffcfd16 100644 --- a/Myrtille.Admin.Web/Properties/AssemblyInfo.cs +++ b/Myrtille.Admin.Web/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Common/Network/Buffer.cs b/Myrtille.Common/Network/Buffer.cs index a5e53b0..ebe3626 100644 --- a/Myrtille.Common/Network/Buffer.cs +++ b/Myrtille.Common/Network/Buffer.cs @@ -66,6 +66,9 @@ public void Stop() public void AddItem(T item) { + if (!_enabled) + return; + lock (_dataLock) { _data.Add(item); diff --git a/Myrtille.Common/Properties/AssemblyInfo.cs b/Myrtille.Common/Properties/AssemblyInfo.cs index 3a37f1e..8c6fba3 100644 --- a/Myrtille.Common/Properties/AssemblyInfo.cs +++ b/Myrtille.Common/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de révision et de build par défaut // en utilisant '*', comme indiqué ci-dessous : -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Enterprise/Properties/AssemblyInfo.cs b/Myrtille.Enterprise/Properties/AssemblyInfo.cs index eb2825e..b02ee78 100644 --- a/Myrtille.Enterprise/Properties/AssemblyInfo.cs +++ b/Myrtille.Enterprise/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.MFAProviders/Properties/AssemblyInfo.cs b/Myrtille.MFAProviders/Properties/AssemblyInfo.cs index 9b6d2ce..9b71d29 100644 --- a/Myrtille.MFAProviders/Properties/AssemblyInfo.cs +++ b/Myrtille.MFAProviders/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Printer/Properties/AssemblyInfo.cs b/Myrtille.Printer/Properties/AssemblyInfo.cs index b723498..b9e9158 100644 --- a/Myrtille.Printer/Properties/AssemblyInfo.cs +++ b/Myrtille.Printer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.SSH/Properties/AssemblyInfo.cs b/Myrtille.SSH/Properties/AssemblyInfo.cs index 41d6656..62c442a 100644 --- a/Myrtille.SSH/Properties/AssemblyInfo.cs +++ b/Myrtille.SSH/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Services.Contracts/Properties/AssemblyInfo.cs b/Myrtille.Services.Contracts/Properties/AssemblyInfo.cs index d6c88f6..b95f301 100644 --- a/Myrtille.Services.Contracts/Properties/AssemblyInfo.cs +++ b/Myrtille.Services.Contracts/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // en utilisant '*', comme indiqué ci-dessous : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Services/Properties/AssemblyInfo.cs b/Myrtille.Services/Properties/AssemblyInfo.cs index b4c91c8..38b6f9a 100644 --- a/Myrtille.Services/Properties/AssemblyInfo.cs +++ b/Myrtille.Services/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // en utilisant '*', comme indiqué ci-dessous : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Setup/Myrtille.Setup.vdproj b/Myrtille.Setup/Myrtille.Setup.vdproj index 21c36eb..9338904 100644 --- a/Myrtille.Setup/Myrtille.Setup.vdproj +++ b/Myrtille.Setup/Myrtille.Setup.vdproj @@ -268,7 +268,7 @@ "Entry" { "MsmKey" = "8:_83A15477F512314BC17E6D4FAEDDDF13" - "OwnerKey" = "8:_A002DF7CA2178B17132C6B5BA3AE60CF" + "OwnerKey" = "8:_A17DBF12B6A6522264FE8C544BE7637C" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -387,42 +387,6 @@ } "Entry" { - "MsmKey" = "8:_920F80B9B245488914C9DB3A7ED4CAB5" - "OwnerKey" = "8:_0A74AD687EED42B790D48F7F5F3AB404" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_920F80B9B245488914C9DB3A7ED4CAB5" - "OwnerKey" = "8:_DF64623992E0504E6E44F78E0DACDA36" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_920F80B9B245488914C9DB3A7ED4CAB5" - "OwnerKey" = "8:_EF7BA948A8A34B5CB515E968F9EFD966" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_920F80B9B245488914C9DB3A7ED4CAB5" - "OwnerKey" = "8:_E64EE02B3449434592136B3C178CD9B2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_920F80B9B245488914C9DB3A7ED4CAB5" - "OwnerKey" = "8:_6A00A4B5E0C64F48AF08EC529C41D062" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_920F80B9B245488914C9DB3A7ED4CAB5" - "OwnerKey" = "8:_653D6FBBA167416D9037981F1E63EC6A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_9240A03151B1609F69B0D890ADE451BC" "OwnerKey" = "8:_653D6FBBA167416D9037981F1E63EC6A" "MsmSig" = "8:_UNDEFINED" @@ -465,13 +429,13 @@ } "Entry" { - "MsmKey" = "8:_A002DF7CA2178B17132C6B5BA3AE60CF" + "MsmKey" = "8:_A17DBF12B6A6522264FE8C544BE7637C" "OwnerKey" = "8:_E76FFE893BD37BAA153E3EFB44999C4E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A002DF7CA2178B17132C6B5BA3AE60CF" + "MsmKey" = "8:_A17DBF12B6A6522264FE8C544BE7637C" "OwnerKey" = "8:_6A00A4B5E0C64F48AF08EC529C41D062" "MsmSig" = "8:_UNDEFINED" } @@ -591,6 +555,42 @@ } "Entry" { + "MsmKey" = "8:_DF0572015795804F70A9AA695417FBAB" + "OwnerKey" = "8:_0A74AD687EED42B790D48F7F5F3AB404" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF0572015795804F70A9AA695417FBAB" + "OwnerKey" = "8:_EF7BA948A8A34B5CB515E968F9EFD966" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF0572015795804F70A9AA695417FBAB" + "OwnerKey" = "8:_E64EE02B3449434592136B3C178CD9B2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF0572015795804F70A9AA695417FBAB" + "OwnerKey" = "8:_6A00A4B5E0C64F48AF08EC529C41D062" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF0572015795804F70A9AA695417FBAB" + "OwnerKey" = "8:_653D6FBBA167416D9037981F1E63EC6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DF0572015795804F70A9AA695417FBAB" + "OwnerKey" = "8:_DF64623992E0504E6E44F78E0DACDA36" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DF64623992E0504E6E44F78E0DACDA36" "OwnerKey" = "8:_0A74AD687EED42B790D48F7F5F3AB404" "MsmSig" = "8:_UNDEFINED" @@ -790,36 +790,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E76FFE893BD37BAA153E3EFB44999C4E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_51E1684E0AC9A2E6C91C688F2C9DD4B1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E385E6F4F7BC7295F537EC6B3C8250D3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DF64623992E0504E6E44F78E0DACDA36" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_990AC498687A0E2ED129023E9CC2D5B5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_EF7BA948A8A34B5CB515E968F9EFD966" "MsmSig" = "8:_UNDEFINED" } @@ -886,7 +856,19 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A002DF7CA2178B17132C6B5BA3AE60CF" + "OwnerKey" = "8:_E76FFE893BD37BAA153E3EFB44999C4E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A17DBF12B6A6522264FE8C544BE7637C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_51E1684E0AC9A2E6C91C688F2C9DD4B1" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -988,13 +970,31 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E385E6F4F7BC7295F537EC6B3C8250D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_DF64623992E0504E6E44F78E0DACDA36" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_C86279E0F97A6677B41B24460FBAF2B5" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_920F80B9B245488914C9DB3A7ED4CAB5" + "OwnerKey" = "8:_DF0572015795804F70A9AA695417FBAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_990AC498687A0E2ED129023E9CC2D5B5" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2142,37 +2142,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_920F80B9B245488914C9DB3A7ED4CAB5" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Web.Administration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_920F80B9B245488914C9DB3A7ED4CAB5" - { - "Name" = "8:Microsoft.Web.Administration.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.Web.Administration.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_FA146EB9AE2B44E2AB4B01E26999CAB2" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9240A03151B1609F69B0D890ADE451BC" { "AssemblyRegister" = "3:1" @@ -2235,14 +2204,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A002DF7CA2178B17132C6B5BA3AE60CF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A17DBF12B6A6522264FE8C544BE7637C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:OASIS.Integration, Version=1.7.0.0, Culture=neutral, PublicKeyToken=bf7fa19775bc8b36, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A002DF7CA2178B17132C6B5BA3AE60CF" + "_A17DBF12B6A6522264FE8C544BE7637C" { "Name" = "8:OASIS.Integration.dll" "Attributes" = "3:512" @@ -2561,6 +2530,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF0572015795804F70A9AA695417FBAB" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.Web.Administration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_DF0572015795804F70A9AA695417FBAB" + { + "Name" = "8:Microsoft.Web.Administration.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.Web.Administration.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_FA146EB9AE2B44E2AB4B01E26999CAB2" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF64623992E0504E6E44F78E0DACDA36" { "AssemblyRegister" = "3:1" @@ -2960,15 +2960,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Myrtille" - "ProductCode" = "8:{DE4FFD9F-65D4-418B-9A3F-9A6CBAB10BF8}" - "PackageCode" = "8:{5951CE05-B1EC-421C-B8AC-B84F6CBA864F}" + "ProductCode" = "8:{30535365-3110-429F-ADA0-28034FC580E4}" + "PackageCode" = "8:{71C7D3EE-9BE1-4069-AFAE-7BA6658B278C}" "UpgradeCode" = "8:{86A6145E-11DB-4EE7-9CE0-53F997050716}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:2.9.0" + "ProductVersion" = "8:2.9.1" "Manufacturer" = "8:Cedric Coste" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://cedrozor.github.io/myrtille" diff --git a/Myrtille.Web/Myrtille.Web.Install.ps1 b/Myrtille.Web/Myrtille.Web.Install.ps1 index ceed795..be16e66 100644 Binary files a/Myrtille.Web/Myrtille.Web.Install.ps1 and b/Myrtille.Web/Myrtille.Web.Install.ps1 differ diff --git a/Myrtille.Web/Properties/AssemblyInfo.cs b/Myrtille.Web/Properties/AssemblyInfo.cs index b14232b..822bf55 100644 --- a/Myrtille.Web/Properties/AssemblyInfo.cs +++ b/Myrtille.Web/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.9.0.0")] -[assembly: AssemblyFileVersion("2.9.0.0")] +[assembly: AssemblyVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.1.0")] diff --git a/Myrtille.Web/src/RemoteSessionManager.cs b/Myrtille.Web/src/RemoteSessionManager.cs index 45a2686..ef8cd8f 100644 --- a/Myrtille.Web/src/RemoteSessionManager.cs +++ b/Myrtille.Web/src/RemoteSessionManager.cs @@ -696,7 +696,7 @@ private void ProcessUpdate(byte[] data) var image = new RemoteSessionImage { //Idx = BitConverter.ToInt32(imgInfo, 0), - Idx = ++_imageIdx, + Idx = _imageIdx == int.MaxValue ? 1 : ++_imageIdx, PosX = BitConverter.ToInt32(imgInfo, 4), PosY = BitConverter.ToInt32(imgInfo, 8), Width = BitConverter.ToInt32(imgInfo, 12), @@ -963,7 +963,7 @@ private void ProcessAudio(byte[] data) { var audio = new RemoteSessionAudio { - Idx = ++_audioIdx, + Idx = _audioIdx == int.MaxValue ? 1 : ++_audioIdx, Format = RemoteSession.AudioFormat.HasValue ? RemoteSession.AudioFormat.Value : AudioFormat.MP3, Bitrate = RemoteSession.AudioBitrate.HasValue ? RemoteSession.AudioBitrate.Value : 128, Data = data