Changeset 69783 in vbox

Timestamp:

Nov 20, 2017 6:58:25 PM (7 years ago)

Author:

vboxsync

Message:

Main: SDS plan B it is.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (4 diffs)
• include/VirtualBoxImpl.h (modified) (2 diffs)
• src-client/VirtualBoxClientImpl.cpp (modified) (5 diffs)
• src-server/win/svcmain.cpp (modified) (5 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -278 +278 @@
  PROGRAMS += VBoxSDS
  VBoxSDS_TEMPLATE = VBOXMAINEXE
- VBoxSDS_DEFS = $(if-expr defined(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
  VBoxSDS_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
  VBoxSDS_DEFS.win += _WIN32_WINNT=0x0510
@@ -368 +367 @@
         $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \
         $(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
-        $(if-expr defined(VBOX_WITH_SDS) && defined(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
+        $(if-expr defined(VBOX_WITH_SDS),VBOX_WITH_SDS,)
 ifdef VBOX_WITH_USB
  VBoxSVC_DEFS += \
@@ -764 +763 @@
         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
         $(if $(VBOX_WITH_VRDEAUTH_IN_VBOXSVC),VBOX_WITH_VRDEAUTH_IN_VBOXSVC,) \
-        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
-        $(if-expr defined(VBOX_WITH_SDS) && defined(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
+        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
 ifdef VBOX_WITH_CRHGSMI
  VBoxC_DEFS += VBOX_WITH_CRHGSMI
@@ -1196 +1194 @@
  VBoxProxyStub_TEMPLATE = VBOXMAINCOMP
  VBoxProxyStub_DEFS     = REGISTER_PROXY_DLL PROXY_CLSID_IS="$(VBOX_MIDL_PROXY_CLSID_IS)" \
-        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
-        $(if-expr defined(VBOX_WITH_SDS) && defined(VBOX_WITH_SDS_PLAN_B),VBOX_WITH_SDS_PLAN_B,)
+        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
  VBoxProxyStub_DEFS.win.x86 = WIN32
  VBoxProxyStub_SDKS     = VBOX_NTDLL

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -60 +60 @@
 
 
-#if defined(VBOX_WITH_SDS_PLAN_B) && !defined(VBOX_WITH_XPCOM)
+#if defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_XPCOM)
 class VirtualBoxClassFactory; /* See ../src-server/win/svcmain.cpp  */
 #endif
@@ -81 +81 @@
 
 #ifndef VBOX_WITH_XPCOM
-# ifdef VBOX_WITH_SDS_PLAN_B
+# ifdef VBOX_WITH_SDS
     DECLARE_CLASSFACTORY_EX(VirtualBoxClassFactory)
 # else

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -66 +66 @@
 // public initializer/uninitializer for internal purposes only
 /////////////////////////////////////////////////////////////////////////////
-
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
-
-HRESULT CreateVirtualBoxThroughSDS(ComPtr<IVirtualBox> &aVirtualBox, ComPtr<IToken> &aToken)
-{
-    ComPtr<IVirtualBoxSDS> aVirtualBoxSDS;
-    HRESULT hrc = CoCreateInstance(CLSID_VirtualBoxSDS, /* the VirtualBoxSDS object */
-                                   NULL,                /* no aggregation */
-                                   CLSCTX_LOCAL_SERVER, /* the object lives in the current process */
-                                   IID_IVirtualBoxSDS,  /* IID of the interface */
-                                   (void **)aVirtualBoxSDS.asOutParam());
-    AssertComRCReturn(hrc, hrc);
-
-    hrc = aVirtualBoxSDS->GetVirtualBox(aVirtualBox.asOutParam(), aToken.asOutParam());
-    AssertComRC(hrc);
-
-    return hrc;
-}
-
-
-int VirtualBoxClient::getServiceAccount(const wchar_t *pwszServiceName, wchar_t *pwszAccountName, size_t cwcAccountName)
-{
-    AssertPtr(pwszServiceName);
-    AssertPtr(pwszAccountName);
-    Assert(cwcAccountName);
-    *pwszAccountName = '\0';
-
-    int vrc;
-
-    // Get a handle to the SCM database.
-    SC_HANDLE hSCManager = OpenSCManagerW(NULL /*pwszMachineName*/, NULL /*pwszDatabaseName*/, SC_MANAGER_ALL_ACCESS);
-    if (hSCManager != NULL)
-    {
-        SC_HANDLE hService = OpenServiceW(hSCManager, pwszServiceName, SERVICE_QUERY_CONFIG);
-        if (hService != NULL)
-        {
-            DWORD cbNeeded = sizeof(QUERY_SERVICE_CONFIGW) + 256;
-            if (!QueryServiceConfigW(hService, NULL, 0, &cbNeeded))
-            {
-                Assert(GetLastError() == ERROR_INSUFFICIENT_BUFFER);
-                LPQUERY_SERVICE_CONFIGW pSc = (LPQUERY_SERVICE_CONFIGW)RTMemTmpAllocZ(cbNeeded);
-                if (pSc)
-                {
-                    DWORD cbNeeded2 = 0;
-                    if (QueryServiceConfigW(hService, pSc, cbNeeded, &cbNeeded2))
-                    {
-                        vrc = RTUtf16Copy(pwszAccountName, cwcAccountName, pSc->lpServiceStartName);
-                        if (RT_FAILURE(vrc))
-                            LogRel(("Error: SDS service name is too long (%Rrc): %ls\n", vrc, pSc->lpServiceStartName));
-                    }
-                    else
-                    {
-                        int dwError = GetLastError();
-                        vrc = RTErrConvertFromWin32(dwError);
-                        LogRel(("Error: Failed querying service config: %Rwc (%u) -> %Rrc; cbNeeded=%d cbNeeded2=%d\n",
-                                dwError, dwError, vrc, cbNeeded, cbNeeded2));
-                    }
-                    RTMemTmpFree(pSc);
-                }
-                else
-                {
-                    LogRel(("Error: Failed allocating %#x bytes of memory for service config!\n", cbNeeded));
-                    vrc = VERR_NO_TMP_MEMORY;
-                }
-            }
-            else
-            {
-                AssertLogRelMsgFailed(("Error: QueryServiceConfigW returns success with zero buffer!\n"));
-                vrc = VERR_IPE_UNEXPECTED_STATUS;
-            }
-            CloseServiceHandle(hService);
-        }
-        else
-        {
-            int dwError = GetLastError();
-            vrc = RTErrConvertFromWin32(dwError);
-            LogRel(("Error: Could not open service: %Rwc (%u) -> %Rrc\n", dwError, dwError, vrc));
-        }
-        CloseServiceHandle(hSCManager);
-    }
-    else
-    {
-        int dwError = GetLastError();
-        vrc = RTErrConvertFromWin32(dwError);
-        LogRel(("Error: Could not open SCM: %Rwc (%u) -> %Rrc\n", dwError, dwError, vrc));
-    }
-    return vrc;
-}
-
-
-HRESULT VirtualBoxClient::isServiceDisabled(const wchar_t *pwszServiceName, bool* pOutIsDisabled)
-{
-    Assert(pOutIsDisabled);
-    Assert(pwszServiceName);
-    ComPtr<IWbemLocator> aLocator;
-    ComPtr<IWbemServices> aService;
-
-    HRESULT hr = CoCreateInstance(CLSID_WbemLocator, 0,
-        CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID *)aLocator.asOutParam());
-    if (FAILED(hr))
-    {
-        LogRel(("Error: Cannot instantiate WbemLocator: %Rhrc", hr));
-        return hr;
-    }
-
-    hr = aLocator->ConnectServer(
-        com::Bstr(L"ROOT\\CIMV2").raw(), // Object path of WMI namespace
-        NULL,                    // User name. NULL = current user
-        NULL,                    // User password. NULL = current
-        0,                       // Locale. NULL indicates current
-        NULL,                    // Security flags.
-        0,                       // Authority (for example, Kerberos)
-        0,                       // Context object
-        aService.asOutParam()    // pointer to IWbemServices proxy
-    );
-    if (FAILED(hr))
-    {
-        LogRel(("Error: Cannot connect to Wbem Service: %Rhrc\n", hr));
-        return hr;
-    }
-
-    // query settings for VBoxSDS windows service
-    ComPtr<IEnumWbemClassObject> aEnumerator;
-    hr = aService->ExecQuery(
-        com::Bstr("WQL").raw(),
-        com::BstrFmt("SELECT * FROM Win32_Service WHERE Name='%ls'", pwszServiceName).raw(),
-        WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
-        NULL,
-        aEnumerator.asOutParam());
-    if (FAILED(hr) || aEnumerator == NULL)
-    {
-        LogRel(("Error: querying service settings from WMI: %Rhrc\n", hr));
-        return hr;
-    }
-
-    ULONG uReturn = 0;
-    ComPtr<IWbemClassObject> aVBoxSDSObj;
-    hr = aEnumerator->Next(WBEM_INFINITE, 1, aVBoxSDSObj.asOutParam(), &uReturn);
-    if (FAILED(hr))
-    {
-        LogRel(("Error: Cannot get Service WMI record: %Rhrc\n", hr));
-        return hr;
-    }
-    if (aVBoxSDSObj == NULL || uReturn == 0)
-    {
-        LogRel(("Error: Service record didn't exist in WMI: %Rhrc\n", hr));
-        return hr;
-    }
-
-    VARIANT vtProp;
-    VariantInit(&vtProp);
-
-    // Get "StartMode" property
-    hr = aVBoxSDSObj->Get(L"StartMode", 0, &vtProp, 0, 0);
-    if (FAILED(hr) || (vtProp.vt & VT_NULL) == VT_NULL)
-    {
-        LogRel(("Error: Didn't found StartMode property: %Rhrc\n", hr));
-        return hr;
-    }
-
-    Assert((vtProp.vt & VT_BSTR) == VT_BSTR);
-
-    *pOutIsDisabled = RTUtf16Cmp((RTUTF16*)vtProp.bstrVal,
-                                 (RTUTF16*)L"Disabled") == 0;
-
-    LogRel(("Service start mode is '%ls' \n", vtProp.bstrVal));
-
-    VariantClear(&vtProp);
-
-    return S_OK;
-}
-
-#endif /* RT_OS_WINDOWS && VBOX_WITH_SDS && !VBOX_WITH_SDS_PLAN_B */
 
 /**
@@ -289 +116 @@
         mData.m_SemEvWatcher = NIL_RTSEMEVENT;
 
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
-        rc = CreateVirtualBoxThroughSDS(mData.m_pVirtualBox, mData.m_pToken);
-#else
         rc = mData.m_pVirtualBox.createLocalObject(CLSID_VirtualBox);
-#endif
         if (FAILED(rc))
 #ifdef RT_OS_WINDOWS
@@ -382 +205 @@
      */
     IUnknown *pUnknown = NULL;
-
-# if defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
-    // Check the VBOXSDS service running account name is SYSTEM
-    wchar_t wszBuffer[256];
-    int vrc = getServiceAccount(L"VBoxSDS", wszBuffer, RT_ELEMENTS(wszBuffer));
-    if (RT_FAILURE(vrc))
-        return setError(hrcCaller,
-                        tr("Failed to instantiate CLSID_VirtualBox using VBoxSDS: The VBoxSDS is unavailable: %Rrc"), vrc);
-
-    LogRelFunc(("VBoxSDS service is running under the '%ls' account.\n", wszBuffer));
-
-    if (RTUtf16Cmp(wszBuffer, L"LocalSystem") != 0)
-        return setError(hrcCaller,
-                        tr("VBoxSDS should be run under SYSTEM account, but it started under '%ls' account:\n"
-                           "Change VBoxSDS Windows Service Logon parameters in Service Control Manager. \n%Rhrc"),
-                        wszBuffer, hrcCaller);
-
-    bool fIsVBoxSDSDisabled = false;
-    HRESULT hrc = isServiceDisabled(L"VBoxSDS", &fIsVBoxSDSDisabled);
-    if (FAILED(hrc))
-    {
-        LogRelFunc(("Warning: Failed to get information about VBoxSDS using WMI:: %Rhrc & %Rhrc", hrcCaller, hrc));
-        fIsVBoxSDSDisabled = false;
-        //return setError(hrcCaller, tr("Failed to get information about VBoxSDS using WMI:: %Rhrc & %Rhrc"), hrcCaller, hrc);
-    }
-    if (fIsVBoxSDSDisabled)
-    {
-        return setError(hrcCaller,
-                        tr("Completely failed to instantiate CLSID_VirtualBox using VBoxSDS: "
-                           "VBoxSDS windows service disabled.\n"
-                           "Enable VBoxSDS Windows Service using Windows Service Management Console.\n %Rhrc"), hrcCaller);
-    }
-
-    // Check the VBoxSDS windows service is enabled
-    ComPtr<IVirtualBox> aVirtualBox;
-    ComPtr<IToken> aToken;
-    hrc = CreateVirtualBoxThroughSDS(aVirtualBox, aToken);
-    if (FAILED(hrc))
-    {
-        if (hrc == hrcCaller)
-            return setError(hrcCaller, tr("Completely failed to instantiate CLSID_VirtualBox using VBoxSDS: %Rhrc"), hrcCaller);
-        return setError(hrcCaller, tr("Completely failed to instantiate CLSID_VirtualBox using VBoxSDS: %Rhrc & %Rhrc"), hrcCaller, hrc);
-    }
-
-    hrc = aVirtualBox.queryInterfaceTo<IUnknown>(&pUnknown);
-    if (FAILED(hrc))
-    {
-        if (hrc == hrcCaller)
-            return setError(hrcCaller, tr("Completely failed to instantiate CLSID_VirtualBox using VBoxSDS: %Rhrc"), hrcCaller);
-        return setError(hrcCaller, tr("Completely failed to instantiate CLSID_VirtualBox using VBoxSDS: %Rhrc & %Rhrc"), hrcCaller, hrc);
-    }
-# else
     HRESULT hrc = CoCreateInstance(CLSID_VirtualBox, NULL, CLSCTX_LOCAL_SERVER, IID_IUnknown, (void **)&pUnknown);
     if (FAILED(hrc))
@@ -441 +212 @@
         return setError(hrcCaller, tr("Completely failed to instantiate CLSID_VirtualBox: %Rhrc & %Rhrc"), hrcCaller, hrc);
     }
-# endif
 
     /*
@@ -746 +516 @@
                 ComPtr<IVirtualBox> pVirtualBox;
                 ComPtr<IToken> pToken;
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS) && !defined(VBOX_WITH_SDS_PLAN_B)
-                rc = CreateVirtualBoxThroughSDS(pVirtualBox, pToken);
-#else
                 rc = pVirtualBox.createLocalObject(CLSID_VirtualBox);
-#endif
                 if (FAILED(rc))
                     cMillies = 3 * VBOXCLIENT_DEFAULT_INTERVAL;

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -78 +78 @@
 HWND        g_hMainWindow = NULL;
 HINSTANCE   g_hInstance   = NULL;
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
 /** This is set if we're connected to SDS and should discount a server lock
  * that it is holding when deciding whether we're idle or not. */
@@ -121 +121 @@
 /*static*/ bool CExeModule::isIdleLockCount(LONG cLocks)
 {
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
     if (g_fRegisteredWithVBoxSDS)
         return cLocks <= 1;
@@ -185 +185 @@
 
 
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
 class VBoxSVCRegistration;
 
@@ -473 +473 @@
 }
 
-#endif /* VBOX_WITH_SDS_PLAN_B */
+#endif /* VBOX_WITH_SDS */
 
 
@@ -807 +807 @@
                                     RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
                                     VBOXSVC_LOG_DEFAULT, "VBOXSVC_RELEASE_LOG",
-#ifdef VBOX_WITH_SDS_PLAN_B
+#ifdef VBOX_WITH_SDS
                                     RTLOGDEST_FILE | RTLOGDEST_F_DELAY_FILE,
 #else