Merge branch 'wsl-for-apps' into user/ptrivedi/cont-mgr

Author: Pooja Trivedi

.github/CODEOWNERS

@@ -1,4 +1,5 @@
 # File containing policy for file ownership
 
 # Reviewers for all files in the repository
-* @microsoft/wsl-maintainers
+* @microsoft/wsl-maintainers
+* @microsoft/wsla-team

msipackage/package.wix.in

@@ -263,13 +263,11 @@
                     <RegistryValue Name="AppId" Value="{E9B79997-57E3-4201-AECC-6A464E530DD2}" Type="string" />
                     <RegistryValue Value="WSLAVirtualMachine" Type="string" />
                 </RegistryKey>
-                
                 <!-- WSLASession -->
                 <RegistryKey Root="HKCR" Key="CLSID\{4877FEFC-4977-4929-A958-9F36AA1892A4}">
                     <RegistryValue Name="AppId" Value="{E9B79997-57E3-4201-AECC-6A464E530DD2}" Type="string" />
                     <RegistryValue Value="WSLASession" Type="string" />
                 </RegistryKey>
-                
                 <!-- IWSLAUserSession-->
                 <RegistryKey Root="HKCR" Key="Interface\{82A7ABC8-6B50-43FC-AB96-15FBBE7E8760}">
                     <RegistryValue Value="IWSLAUserSession" Type="string" />
@@ -301,7 +299,6 @@
                         <RegistryValue Value="{4EA0C6DD-E9FF-48E7-994E-13A31D10DC61}" Type="string" />
                     </RegistryKey>
                 </RegistryKey>
-                
                 <File Id="wslaservice.exe" Source="${BIN}/wslaservice.exe"  KeyPath="yes" />
                 <File Id="wslaserviceproxystub.dll" Name="wslaserviceproxystub.dll" Source="${BIN}/wslaserviceproxystub.dll" />
 

src/windows/wslaclient/CMakeLists.txt

@@ -5,4 +5,5 @@ add_library(wslaclient SHARED ${SOURCES} ${HEADERS} wslaclient.def)
 set_target_properties(wslaclient PROPERTIES EXCLUDE_FROM_ALL FALSE)
 add_dependencies(wslaclient wslaserviceidl)
 target_link_libraries(wslaclient ${COMMON_LINK_LIBRARIES} legacy_stdio_definitions common)
-target_precompile_headers(wslaclient REUSE_FROM common)
+target_precompile_headers(wslaclient REUSE_FROM common)
+set_target_properties(wslaclient PROPERTIES FOLDER windows)

src/windows/wslaclient/DllMain.cpp

@@ -18,24 +18,6 @@ Module Name:
 #include "wslrelay.h"
 #include "wslInstall.h"
 
-/* namespace {
-
-void ConfigureComSecurity(IUnknown* Instance)
-{
-    wil::com_ptr_nothrow<IClientSecurity> clientSecurity;
-    THROW_IF_FAILED(Instance->QueryInterface(IID_PPV_ARGS(&clientSecurity)));
-
-    // Get the current proxy blanket settings.
-    DWORD authnSvc, authzSvc, authnLvl, capabilites;
-    THROW_IF_FAILED(clientSecurity->QueryBlanket(Instance, &authnSvc, &authzSvc, NULL, &authnLvl, NULL, NULL, &capabilites));
-
-    // Make sure that dynamic cloaking is used.
-    WI_ClearFlag(capabilites, EOAC_STATIC_CLOAKING);
-    WI_SetFlag(capabilites, EOAC_DYNAMIC_CLOAKING);
-    THROW_IF_FAILED(clientSecurity->SetBlanket(Instance, authnSvc, authzSvc, NULL, authnLvl, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, capabilites));
-}
-} // namespace */
-
 class DECLSPEC_UUID("7BC4E198-6531-4FA6-ADE2-5EF3D2A04DFF") CallbackInstance
     : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, ITerminationCallback, IFastRundown>
 {
@@ -74,7 +56,6 @@ try
     wil::com_ptr<IWSLAUserSession> session;
 
     THROW_IF_FAILED(CoCreateInstance(__uuidof(WSLAUserSession), nullptr, CLSCTX_LOCAL_SERVER, IID_PPV_ARGS(&session)));
-    // ConfigureComSecurity(session.get());
     wsl::windows::common::security::ConfigureForCOMImpersonation(session.get());
 
     /* wil::com_ptr<IWSLAVirtualMachine> virtualMachineInstance;
@@ -92,7 +73,6 @@ try
     settings.EnableGPU = UserSettings->GPU.Enable;
 
     THROW_IF_FAILED(session->CreateVirtualMachine(&settings, &virtualMachineInstance));
-    // ConfigureComSecurity(virtualMachineInstance.get());
     wsl::windows::common::security::ConfigureForCOMImpersonation(virtualMachineInstance.get());
 
     // Register termination callback, if specified
@@ -439,4 +419,4 @@ try
 {
     return reinterpret_cast<IWSLAVirtualMachine*>(VirtualMachine)->MountGpuLibraries(LibrariesMountPoint, DriversMountpoint, static_cast<DWORD>(Flags));
 }
-CATCH_RETURN();
+CATCH_RETURN();

src/windows/wslaservice/exe/WSLASession.cpp

@@ -1,22 +1,20 @@
-#include "C:/Users/trivedipooja/source/repos/WSL/src/windows/common/CMakeFiles/common.dir/Debug/cmake_pch.hxx"
-#include "WSLASession.h"
+/*++
 
-using wsl::windows::service::wsla::WSLASessionImpl;
-using wsl::windows::service::wsla::WSLASession;
+Copyright (c) Microsoft. All rights reserved.
 
-WSLASessionImpl::WSLASessionImpl()
-{
-}
+Module Name:
 
+    WSLASession.cpp
 
-WSLASessionImpl::~WSLASessionImpl()
-{
-}
+Abstract:
 
-wsl::windows::service::wsla::WSLASession::WSLASession(std::weak_ptr<WSLASessionImpl>&& Session) :
-    m_wslaSession(std::move(Session))
-{
-}
+    This file contains the implementation of the WSLASession COM class.
+
+--*/
+
+#include "WSLASession.h"
+
+using wsl::windows::service::wsla::WSLASession;
 
 HRESULT WSLASession::GetDisplayName(LPWSTR* DisplayName)
 {
@@ -26,4 +24,4 @@ HRESULT WSLASession::GetDisplayName(LPWSTR* DisplayName)
 
 WSLASession::WSLASession(const WSLA_SESSION_CONFIGURATION& SessionConfiguration) : m_sessionConfig(SessionConfiguration)
 {
-}
+}

src/windows/wslaservice/exe/WSLASession.h

@@ -11,37 +11,6 @@ Module Name:
     TODO
 
 --*/
-#pragma once
-#include "wslaservice.h"
-#include "INetworkingEngine.h"
-#include "hcs.hpp"
-#include "Dmesg.h"
-#include "WSLAApi.h"
-#include "WSLAVirtualMachine.h"
-
-namespace wsl::windows::service::wsla {
-
-class WSLAUserSessionImpl;
-
-class WSLASessionImpl
-{
-public:
-    WSLASessionImpl();
-    //WSLASessionImpl(WSLASessionImpl&&) = default;
-    //WSLASessionImpl& operator=(WSLASessionImpl&&) = default;
-
-    ~WSLASessionImpl();
-
-    /* HRESULT CreateVirtualMachine(const VIRTUAL_MACHINE_SETTINGS* Settings, IWSLAVirtualMachine** VirtualMachine);
-    void OnVmTerminated(WSLAVirtualMachine* machine);
-
-    void OnUserSessionTerminating(); */
-
-
-private:
-    WSLAVirtualMachine* m_vm;
-    // WSLAContainerManager m_containerManager;
-};
 
 class DECLSPEC_UUID("4877FEFC-4977-4929-A958-9F36AA1892A4") WSLASession
     : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, IWSLASession, IFastRundown>
@@ -72,4 +41,4 @@ class DECLSPEC_UUID("4877FEFC-4977-4929-A958-9F36AA1892A4") WSLASession
     WSLAUserSessionImpl* m_userSession;
     std::weak_ptr<WSLASessionImpl> m_wslaSession;
 };
-} // namespace wsl::windows::service::wsla
+} // namespace wsl::windows::service::wsla

src/windows/wslaservice/exe/WSLAUserSession.cpp

@@ -29,7 +29,7 @@ WSLAUserSessionImpl::~WSLAUserSessionImpl()
 
         for (auto* e : m_wslaSessions)
         {
-            //e->OnSessionTerminating();
+            e->OnSessionTerminating();
         }
     }
 }
@@ -55,6 +55,29 @@ HRESULT wsl::windows::service::wsla::WSLAUserSessionImpl::CreateSession(
 
     // session->Start();
     THROW_IF_FAILED(session.CopyTo(__uuidof(IWSLASession), (void**)WslaSession));
+    return S_OK;
+}
+
+void WSLAUserSessionImpl::OnVmTerminated(WSLAVirtualMachine* machine)
+{
+    std::lock_guard lock(m_lock);
+    auto pred = [machine](const auto* e) { return machine == e; };
+
+    // Remove any stale VM reference.
+    m_virtualMachines.erase(std::remove_if(m_virtualMachines.begin(), m_virtualMachines.end(), pred), m_virtualMachines.end());
+}
+
+HRESULT WSLAUserSessionImpl::CreateVirtualMachine(const VIRTUAL_MACHINE_SETTINGS* Settings, IWSLAVirtualMachine** VirtualMachine)
+{
+    auto vm = wil::MakeOrThrow<WSLAVirtualMachine>(*Settings, GetUserSid(), this);
+
+    {
+        std::lock_guard lock(m_lock);
+        m_virtualMachines.emplace_back(vm.Get());
+    }
+
+    vm->Start();
+    THROW_IF_FAILED(vm.CopyTo(__uuidof(IWSLAVirtualMachine), (void**)VirtualMachine));
 
     return S_OK;
 }
@@ -64,6 +87,20 @@ PSID WSLAUserSessionImpl::GetUserSid() const
     return m_tokenInfo->User.Sid;
 }
 
+HRESULT wsl::windows::service::wsla::WSLAUserSessionImpl::CreateSession(const WSLA_SESSION_SETTINGS* Settings, IWSLASession** Session)
+{
+    auto session = wil::MakeOrThrow<WSLASession>(*Settings);
+
+    {
+        std::lock_guard lock(m_lock);
+        m_sessions.emplace_back(session.Get());
+    }
+
+    THROW_IF_FAILED(session.CopyTo(__uuidof(IWSLASession), (void**)Session));
+
+    return S_OK;
+}
+
 wsl::windows::service::wsla::WSLAUserSession::WSLAUserSession(std::weak_ptr<WSLAUserSessionImpl>&& Session) :
     m_session(std::move(Session))
 {
@@ -87,4 +124,4 @@ try
 
     return session->CreateSession(Settings, VmSettings, WslaSession);
 }
-CATCH_RETURN();
+CATCH_RETURN();

src/windows/wslaservice/exe/WSLAUserSession.h

@@ -11,9 +11,10 @@ Module Name:
     TODO
 
 --*/
+
 #pragma once
+#include "WSLAVirtualMachine.h"
 #include "WSLASession.h"
-//#include "wslaservice.idl" // For WSLA_SESSION_CONFIGURATION and IWSLASession
 
 namespace wsl::windows::service::wsla {
 
@@ -28,6 +29,7 @@ class WSLAUserSessionImpl
 
     PSID GetUserSid() const;
 
+    HRESULT CreateVirtualMachine(const VIRTUAL_MACHINE_SETTINGS* Settings, IWSLAVirtualMachine** VirtualMachine);
     HRESULT CreateSession(const WSLA_SESSION_CONFIGURATION* WslaSessionConfig, const VIRTUAL_MACHINE_SETTINGS* VmSettings, IWSLASession** WslaSession);
 
     /* HRESULT ReleaseSession(const IWSLASession* WslaSession);
@@ -40,20 +42,21 @@ class WSLAUserSessionImpl
     wil::unique_tokeninfo_ptr<TOKEN_USER> m_tokenInfo;
 
     std::recursive_mutex m_wslaSessionsLock;
-    std::vector<WSLASession*> m_wslaSessions;
-
-    // std::vector<Microsoft::WRL::ComPtr<WSLASession>> m_wslaSessions;
+    // TODO-WSLA: Consider using a weak_ptr to easily destroy when the last client reference is released.
+    std::vector<Microsoft::WRL::ComPtr<WSLASession>> m_wslaSessions;
+    std::vector<WSLAVirtualMachine*> m_virtualMachines;
 };
 
 class DECLSPEC_UUID("a9b7a1b9-0671-405c-95f1-e0612cb4ce8f") WSLAUserSession
     : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, IWSLAUserSession, IFastRundown>
 {
 public:
     WSLAUserSession(std::weak_ptr<WSLAUserSessionImpl>&& Session);
-    //WSLAUserSession(const WSLAUserSession&) = delete;
-    //WSLAUserSession& operator=(const WSLAUserSession&) = delete;
+    WSLAUserSession(const WSLAUserSession&) = delete;
+    WSLAUserSession& operator=(const WSLAUserSession&) = delete;
 
     IFACEMETHOD(GetVersion)(_Out_ WSL_VERSION* Version) override;
+    IFACEMETHOD(CreateVirtualMachine)(const VIRTUAL_MACHINE_SETTINGS* Settings, IWSLAVirtualMachine** VirtualMachine) override;
     IFACEMETHOD(CreateSession)(const WSLA_SESSION_CONFIGURATION* WslaSessionConfig, const VIRTUAL_MACHINE_SETTINGS* VmSettings, IWSLASession** WslaSession);
     //IFACEMETHOD(ReleaseSession)(_In_ const IWSLASession* WslaSession) override;
     //IFACEMETHOD(ListSessions)(_Out_ std::vector<WSLASession*>& Sessions) override;

src/windows/wslaservice/exe/WSLAVirtualMachine.cpp

@@ -64,7 +64,7 @@ WSLAVirtualMachine::~WSLAVirtualMachine()
 
         if (m_userSession != nullptr)
         {
-            // m_userSession->OnVmTerminated(this);
+            m_userSession->OnVmTerminated(this);
         }
     }
 
@@ -1049,4 +1049,4 @@ try
     RETURN_IF_FAILED(Mount("none", LibrariesMountPoint, "overlay", options.c_str(), Flags));
     return S_OK;
 }
-CATCH_RETURN();
+CATCH_RETURN();