Staging - 4/10/24

.github/policies/moderatorTriggers.yml

@@ -90,8 +90,9 @@ configuration:
           reply: >-
               Hi @${issueAuthor}. It would be helpful for us if you could share your Dev Home logs. 
               These logs can be found at 
-              `%LOCALAPPDATA%\Packages\Microsoft.Windows.DevHome_8wekyb3d8bbwe\TempState` and 
-              `%LOCALAPPDATA%\Packages\Microsoft.Windows.DevHomeGitHubExtension_8wekyb3d8bbwe\TempState`. 
+              `%LOCALAPPDATA%\Packages\Microsoft.Windows.DevHome_8wekyb3d8bbwe\TempState`, 
+              `%LOCALAPPDATA%\Packages\Microsoft.Windows.DevHomeGitHubExtension_8wekyb3d8bbwe\TempState`, and
+              `%LOCALAPPDATA%\Packages\Microsoft.Windows.DevHomeAzureExtension_8wekyb3d8bbwe\TempState`. 
               You can share these folders via a OneDrive link or zip them and attach them to a 
               comment here. If you share this way, you may want to look through the logs in case 
               there are any details included that you would like to remove (for example, private 

.github/workflows/DevHome-CI.yml

@@ -72,7 +72,7 @@ jobs:
     - name: Compress_DevSetupAgent_x86
       if: ${{ matrix.platform != 'arm64' }}
       shell: pwsh
-      run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win10-x86\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\DevSetupAgent_x86.zip"
+      run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win-x86\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\DevSetupAgent_x86.zip"
 
     - name: Build_DevSetupAgent_arm64
       if: ${{ matrix.platform == 'arm64' }}
@@ -81,7 +81,7 @@ jobs:
     - name: Compress_DevSetupAgent_arm64
       if: ${{ matrix.platform == 'arm64' }}
       shell: pwsh
-      run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win10-arm64\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\DevSetupAgent_arm64.zip"
+      run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win-arm64\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\DevSetupAgent_arm64.zip"
 
     - name: Build_DevHome
       run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} DevHome.sln

Directory.Build.props

@@ -12,6 +12,7 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>Recommended</AnalysisMode>
     <PlatformTarget>$(Platform)</PlatformTarget>
+    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
 
 <!--
@@ -38,12 +39,5 @@
     <Compile Condition="$(MSBuildProjectName) == 'DevHomeStub'" Include="$(MSBuildThisFileDirectory)\codeAnalysis\StubSuppressions.cs" Link="GlobalSuppressions.cs" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
   </ItemGroup>
-  <!-- Needed for reverting back to pre-.NET 8 method of Host using the RID graph to determine assets  -->
-  <!-- https://learn.microsoft.com/en-us/dotnet/core/compatibility/deployment/8.0/rid-asset-list -->
-  <PropertyGroup>
-    <UseRidGraph>true</UseRidGraph>
-  </PropertyGroup>
-  <ItemGroup>
-    <RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
-  </ItemGroup>
+
 </Project>

HyperVExtension/BuildDevSetupAgentHelper.ps1

@@ -93,7 +93,7 @@ Try {
   & $msbuildPath $msbuildArgs
 
 # SDK version and .NEt version needs to stay in sync with ToolingVersion.props, DevSetupEngineIdl.vcxproj, and DevHome-CL.yaml
-  $binariesOutputPath = (Join-Path $env:Build_RootDirectory "HyperVExtension\src\DevSetupAgent\bin\$Platform\$Configuration\net8.0-windows10.0.22621.0\win10-$Platform\*")
+  $binariesOutputPath = (Join-Path $env:Build_RootDirectory "HyperVExtension\src\DevSetupAgent\bin\$Platform\$Configuration\net8.0-windows10.0.22621.0\win-$Platform\*")
   $zipOutputPath = (Join-Path $env:Build_RootDirectory "HyperVExtension\src\DevSetupAgent\bin\$Platform\$Configuration\DevSetupAgent_$Platform.zip")
 
   Compress-Archive -Force -Path $binariesOutputPath $zipOutputPath

HyperVExtension/src/DevSetupAgent/DevAgentService.cs

@@ -41,13 +41,13 @@ protected async override Task ExecuteAsync(CancellationToken stoppingToken)
                 }
                 catch (Exception ex)
                 {
-                    _log.Error($"Exception in DevAgentService.", ex);
+                    _log.Error(ex, $"Exception in DevAgentService.");
                 }
             }
         }
         catch (Exception ex)
         {
-            _log.Error($"Failed to run DevSetupAgent.", ex);
+            _log.Error(ex, $"Failed to run DevSetupAgent.");
             throw;
         }
         finally

HyperVExtension/src/DevSetupAgent/DevSetupAgent.csproj

@@ -6,8 +6,8 @@
     <UserSecretsId>dotnet-DevSetupAgent-674f51cd-70a6-4b78-8376-66efbf84c412</UserSecretsId>
     <BuildRing Condition="'$(BuildRing)'==''">Dev</BuildRing>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <PublishProfile Condition="'$(BuildingInsideVisualStudio)' != 'True'">Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <PublishProfile Condition="'$(BuildingInsideVisualStudio)' != 'True'">Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 

HyperVExtension/src/DevSetupAgent/HostRegistryChannel.cs

@@ -113,7 +113,7 @@ await Task.Run(
                 }
                 catch (Exception ex)
                 {
-                    _log.Error($"Could not write host message. Response ID: {responseMessage.ResponseId}", ex);
+                    _log.Error(ex, $"Could not write host message. Response ID: {responseMessage.ResponseId}");
                 }
             },
             stoppingToken);
@@ -130,7 +130,7 @@ await Task.Run(
                 }
                 catch (Exception ex)
                 {
-                    _log.Error($"Could not delete host message. Response ID: {responseId}", ex);
+                    _log.Error(ex, $"Could not delete host message. Response ID: {responseId}");
                 }
             },
             stoppingToken);
@@ -207,7 +207,7 @@ private RequestMessage TryReadMessage()
                         }
                         catch (Exception ex)
                         {
-                            _log.Error($"Could not read host message {valueName}", ex);
+                            _log.Error(ex, $"Could not read host message {valueName}");
                         }
 
                         MessageHelper.DeleteAllMessages(_registryHiveKey, _fromHostRegistryKeyPath, s[0]);
@@ -218,7 +218,7 @@ private RequestMessage TryReadMessage()
         }
         catch (Exception ex)
         {
-            _log.Error("Could not read host message.", ex);
+            _log.Error(ex, "Could not read host message.");
         }
 
         return requestMessage;

HyperVExtension/src/DevSetupAgent/Logging.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Windows.Storage;
+
+namespace HyperVExtension.DevSetupAgent;
+
+public class Logging
+{
+    public static readonly string LogExtension = ".dhlog";
+
+    public static readonly string LogFolderName = "Logs";
+
+    public static readonly string AppName = "DevSetupAgent";
+
+    public static readonly string DefaultLogFileName = "hyperv_setup";
+
+    private static readonly Lazy<string> _logFolderRoot = new(() => Path.Combine(Path.GetTempPath(), AppName, LogFolderName));
+
+    public static readonly string LogFolderRoot = _logFolderRoot.Value;
+}

HyperVExtension/src/DevSetupAgent/NativeMethods.txt

@@ -6,8 +6,14 @@ CLSCTX
 WIN32_ERROR
 S_OK
 E_FAIL
+E_UNEXPECTED
 LsaEnumerateLogonSessions
 LsaGetLogonSessionData
 Windows.Win32.Security.Authentication.Identity.LsaFreeReturnBuffer
 SECURITY_LOGON_TYPE
 STATUS_SUCCESS
+MakeAbsoluteSD
+ConvertStringSecurityDescriptorToSecurityDescriptor
+LocalAlloc
+LocalFree
+SDDL_REVISION_1

HyperVExtension/src/DevSetupAgent/Program.cs

@@ -1,41 +1,109 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.ComponentModel;
 using System.Runtime.InteropServices;
 using HyperVExtension.DevSetupAgent;
+using HyperVExtension.HostGuestCommunication;
 using Serilog;
 using Windows.Win32;
+using Windows.Win32.Foundation;
 using Windows.Win32.Security;
 using Windows.Win32.System.Com;
 
-unsafe
-{
-    // TODO: Set real security descriptor to allow access from System+Admns+Interactive Users
-    var hr = PInvoke.CoInitializeSecurity(
-                new(null),
-                -1,
-                null,
-                null,
-                RPC_C_AUTHN_LEVEL.RPC_C_AUTHN_LEVEL_DEFAULT,
-                RPC_C_IMP_LEVEL.RPC_C_IMP_LEVEL_IDENTIFY,
-                null,
-                EOLE_AUTHENTICATION_CAPABILITIES.EOAC_NONE);
-
-    if (hr < 0)
-    {
-        Marshal.ThrowExceptionForHR(hr);
-    }
-}
-
 // Set up Logging
-Environment.SetEnvironmentVariable("DEVHOME_LOGS_ROOT", Path.Join(HyperVExtension.DevSetupEngine.Logging.LogFolderRoot, "HyperV"));
+Environment.SetEnvironmentVariable("DEVHOME_LOGS_ROOT", Path.Join(Logging.LogFolderRoot, "HyperV"));
 var configuration = new ConfigurationBuilder()
     .AddJsonFile("appsettings_hypervsetupagent.json")
     .Build();
 Log.Logger = new LoggerConfiguration()
     .ReadFrom.Configuration(configuration)
     .CreateLogger();
 
+unsafe
+{
+    PSECURITY_DESCRIPTOR absolutSd = new(null);
+    PSID ownerSid = new(null);
+    PSID groupSid = new(null);
+    ACL* dacl = default;
+    ACL* sacl = default;
+
+    try
+    {
+        // O:PSG:BU  Owner Principal Self, Group Built-in Users
+        // (A;;0x3;;;SY)  Allow Local System
+        // (A;;0x3;;;IU)  Allow Interactive User
+        var accessPermission = "O:PSG:BUD:(A;;0x3;;;SY)(A;;0x3;;;IU)";
+        uint securityDescriptorSize;
+        PInvoke.ConvertStringSecurityDescriptorToSecurityDescriptor(accessPermission, PInvoke.SDDL_REVISION_1, out var securityDescriptor, &securityDescriptorSize);
+
+        uint absoluteSdSize = default;
+        uint daclSize = default;
+        uint saclSize = default;
+        uint ownerSize = default;
+        uint groupSize = default;
+
+        if (PInvoke.MakeAbsoluteSD(securityDescriptor, absolutSd, ref absoluteSdSize, null, ref daclSize, null, ref saclSize, ownerSid, ref ownerSize, groupSid, ref groupSize))
+        {
+            throw new HResultException(HRESULT.E_UNEXPECTED);
+        }
+
+        var error = Marshal.GetLastWin32Error();
+        if (error != (int)WIN32_ERROR.ERROR_INSUFFICIENT_BUFFER)
+        {
+            throw new Win32Exception(error);
+        }
+
+        absolutSd = new(PInvoke.LocalAlloc(Windows.Win32.System.Memory.LOCAL_ALLOC_FLAGS.LPTR, absoluteSdSize));
+        dacl = (ACL*)PInvoke.LocalAlloc(Windows.Win32.System.Memory.LOCAL_ALLOC_FLAGS.LPTR, daclSize);
+        sacl = (ACL*)PInvoke.LocalAlloc(Windows.Win32.System.Memory.LOCAL_ALLOC_FLAGS.LPTR, saclSize);
+        ownerSid = new(PInvoke.LocalAlloc(Windows.Win32.System.Memory.LOCAL_ALLOC_FLAGS.LPTR, ownerSize));
+        groupSid = new(PInvoke.LocalAlloc(Windows.Win32.System.Memory.LOCAL_ALLOC_FLAGS.LPTR, groupSize));
+
+        if (!PInvoke.MakeAbsoluteSD(securityDescriptor, absolutSd, ref absoluteSdSize, dacl, ref daclSize, sacl, ref saclSize, ownerSid, ref ownerSize, groupSid, ref groupSize))
+        {
+            throw new HResultException(Marshal.GetLastWin32Error());
+        }
+
+        var hr = PInvoke.CoInitializeSecurity(
+                    absolutSd,
+                    -1,
+                    null,
+                    null,
+                    RPC_C_AUTHN_LEVEL.RPC_C_AUTHN_LEVEL_DEFAULT,
+                    RPC_C_IMP_LEVEL.RPC_C_IMP_LEVEL_IDENTIFY,
+                    null,
+                    EOLE_AUTHENTICATION_CAPABILITIES.EOAC_NONE);
+
+        if (hr < 0)
+        {
+            Marshal.ThrowExceptionForHR(hr);
+        }
+    }
+    finally
+    {
+        if (sacl != default)
+        {
+            PInvoke.LocalFree((HLOCAL)sacl);
+        }
+
+        if (dacl != default)
+        {
+            PInvoke.LocalFree((HLOCAL)dacl);
+        }
+
+        if (groupSid != default)
+        {
+            PInvoke.LocalFree((HLOCAL)groupSid.Value);
+        }
+
+        if (ownerSid != default)
+        {
+            PInvoke.LocalFree((HLOCAL)ownerSid.Value);
+        }
+    }
+}
+
 var host = Host.CreateDefaultBuilder(args)
     .UseWindowsService(options =>
     {

HyperVExtension/src/DevSetupAgent/Properties/PublishProfiles/win10-arm64.pubxml → HyperVExtension/src/DevSetupAgent/Properties/PublishProfiles/win-arm64.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>arm64</Platform>
-    <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>

HyperVExtension/src/DevSetupEngine/Properties/PublishProfiles/win10-x64.pubxml → HyperVExtension/src/DevSetupAgent/Properties/PublishProfiles/win-x64.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x64</Platform>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>

HyperVExtension/src/DevSetupEngine/Properties/PublishProfiles/win10-x86.pubxml → HyperVExtension/src/DevSetupAgent/Properties/PublishProfiles/win-x86.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x86</Platform>
-    <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>

HyperVExtension/src/DevSetupAgent/RegistryWatcher.cs

@@ -76,14 +76,14 @@ public void Start()
                                 }
                                 catch (Exception ex)
                                 {
-                                    _log.Error("RegistryChanged delegate failed.", ex);
+                                    _log.Error(ex, "RegistryChanged delegate failed.");
                                 }
                             }
                         }
                     }
                     catch (Exception ex)
                     {
-                        _log.Error("Registry Watcher thread failed.", ex);
+                        _log.Error(ex, "Registry Watcher thread failed.");
                     }
                 });
                 _log.Information("Registry Watcher thread started.");

HyperVExtension/src/DevSetupAgent/RequestManager.cs

@@ -102,7 +102,7 @@ private void ProcessRequestQueue(CancellationToken stoppingToken)
             }
             catch (Exception ex)
             {
-                _log.Error($"Failed to execute request.", ex);
+                _log.Error(ex, $"Failed to execute request.");
             }
         }
     }

HyperVExtension/src/DevSetupAgent/Requests/ErrorRequest.cs

@@ -9,10 +9,11 @@ namespace HyperVExtension.DevSetupAgent;
 /// </summary>
 internal class ErrorRequest : IHostRequest
 {
-    public ErrorRequest(IRequestMessage requestMessage)
+    public ErrorRequest(IRequestMessage requestMessage, Exception? ex = null)
     {
         Timestamp = DateTime.UtcNow;
         RequestId = requestMessage.RequestId!;
+        Error = ex;
     }
 
     public virtual uint Version { get; set; } = 1;
@@ -27,6 +28,8 @@ public ErrorRequest(IRequestMessage requestMessage)
 
     public virtual IHostResponse Execute(ProgressHandler progressHandler, CancellationToken stoppingToken)
     {
-        return new ErrorResponse(RequestId);
+        return new ErrorResponse(RequestId, Error);
     }
+
+    private Exception? Error { get; }
 }

HyperVExtension/src/DevSetupAgent/Requests/RequestFactory.cs

@@ -42,7 +42,6 @@ public IHostRequest CreateRequest(IRequestContext requestContext)
                 {
                     if (_requestFactories.TryGetValue(requestType, out var createRequest))
                     {
-                        // TODO: Try/catch error.
                         requestContext.JsonData = requestJson!;
                         return createRequest(requestContext);
                     }
@@ -65,7 +64,7 @@ public IHostRequest CreateRequest(IRequestContext requestContext)
         {
             var messageId = requestContext.RequestMessage.RequestId ?? "<unknown>";
             var requestData = requestContext.RequestMessage.RequestData ?? "<unknown>";
-            _log.Error($"Error processing message. Message ID: {messageId}. Request data: {requestData}", ex);
+            _log.Error(ex, $"Error processing message. Message ID: {messageId}. Request data: {requestData}");
             return new ErrorRequest(requestContext.RequestMessage);
         }
     }