Changeset 59134 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Dec 15, 2015 2:55:18 PM (9 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Build up a UPN (User Principal Name) if a domain is given. Untested.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.h (modified) (1 diff)
• VBoxServiceControlProcess.cpp (modified) (4 diffs)
• VBoxServiceControlSession.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h

@@ -209 +209 @@
     /** Password of specified user name (account). */
     char szPassword[GUESTPROCESS_MAX_PASSWORD_LEN];
+    /** Domain to be used for authenticating the specified user name (account). */
+    char szDomain[GUESTPROCESS_MAX_DOMAIN_LEN];
     /** Time limit (in ms) of the process' life time. */
     uint32_t uTimeLimitMS;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -1204 +1204 @@
  * @param   pszAsUser                   User name (account) to start the process under.
  * @param   pszPassword                 Password of the specified user.
+ * @param   pszDomain                   Domain to use for authentication.
  * @param   phProcess                   Pointer which will receive the process handle after
  *                                      successful process start.
@@ -1209 +1210 @@
 static int vgsvcGstCtrlProcessCreateProcess(const char *pszExec, const char * const *papszArgs, RTENV hEnv, uint32_t fFlags,
                                             PCRTHANDLE phStdIn, PCRTHANDLE phStdOut, PCRTHANDLE phStdErr, const char *pszAsUser,
-                                            const char *pszPassword, PRTPROCESS phProcess)
+                                            const char *pszPassword, const char *pszDomain, PRTPROCESS phProcess)
 {
     AssertPtrReturn(pszExec, VERR_INVALID_PARAMETER);
@@ -1350 +1351 @@
             VGSvcVerbose(3, "Starting process '%s' ...\n", szExecExp);
 
+            const char *pszUser;
+#ifdef RT_OS_WINDOWS
+            /* If a domain name is given, construct an UPN (User Principle Name) with
+             * the domain name built-in, e.g. "[email protected]". */
+            char *pszUserUPN = NULL;
+            if (strlen(pszDomain))
+            {
+                int cbUserUPN = RTStrAPrintf(&pszUserUPN, "%s@%s", pszAsUser, pszDomain);
+                if (cbUserUPN > 0)
+                {
+                    pszUser = pszUserUPN;
+                    VGSvcVerbose(3, "Using UPN: %s\n", pszUserUPN);
+                }
+            }
+
+            if (!pszUserUPN) /* Fallback */
+#endif
+                pszUser = pszAsUser;
+
             /* Do normal execution. */
             rc = RTProcCreateEx(szExecExp, papszArgsExp, hEnv, uProcFlags,
                                 phStdIn, phStdOut, phStdErr,
-                                pszAsUser   && *pszAsUser   ? pszAsUser   : NULL,
+                                pszUser,
                                 pszPassword && *pszPassword ? pszPassword : NULL,
                                 phProcess);
-
+#ifdef RT_OS_WINDOWS
+            if (pszUserUPN)
+                RTStrFree(pszUserUPN);
+#endif
             VGSvcVerbose(3, "Starting process '%s' returned rc=%Rrc\n", szExecExp, rc);
 
@@ -1575 +1598 @@
                                                                  pProcess->StartupInfo.uFlags,
                                                                  phStdIn, phStdOut, phStdErr,
-                                                                 fNeedsImpersonation ? pProcess->StartupInfo.szUser : NULL,
+                                                                 fNeedsImpersonation ? pProcess->StartupInfo.szUser     : NULL,
                                                                  fNeedsImpersonation ? pProcess->StartupInfo.szPassword : NULL,
+                                                                 fNeedsImpersonation ? pProcess->StartupInfo.szDomain   : NULL,
                                                                  &pProcess->hProcess);
                                 if (RT_FAILURE(rc))

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1712 +1712 @@
             apszArgs[idxArg++] = "--user";
             apszArgs[idxArg++] = pSessionThread->StartupInfo.szUser;
+
+            if (strlen(pSessionThread->StartupInfo.szDomain))
+            {
+                apszArgs[idxArg++] = "--domain";
+                apszArgs[idxArg++] = pSessionThread->StartupInfo.szDomain;
+            }
         }
 
@@ -1836 +1842 @@
                 hStdOutAndErr.enmType = RTHANDLETYPE_FILE;
 
+                const char *pszUser;
+#ifdef RT_OS_WINDOWS
+                /* If a domain name is given, construct an UPN (User Principle Name) with
+                 * the domain name built-in, e.g. "[email protected]". */
+                char *pszUserUPN = NULL;
+                if (strlen(pSessionThread->StartupInfo.szDomain))
+                {
+                    int cbUserUPN = RTStrAPrintf(&pszUserUPN, "%s@%s",
+                                                 pSessionThread->StartupInfo.szUser,
+                                                 pSessionThread->StartupInfo.szDomain);
+                    if (cbUserUPN > 0)
+                    {
+                        pszUser = pszUserUPN;
+                        VGSvcVerbose(3, "Using UPN: %s\n", pszUserUPN);
+                    }
+                }
+
+                if (!pszUserUPN) /* Fallback */
+#endif
+                    pszUser = pSessionThread->StartupInfo.szUser;
+
                 rc = RTProcCreateEx(pszExeName, apszArgs, RTENV_DEFAULT, fProcCreate,
                                     &hStdIn, &hStdOutAndErr, &hStdOutAndErr,
-                                    !fAnonymous ? pSessionThread->StartupInfo.szUser : NULL,
+                                    !fAnonymous ? pszUser : NULL,
                                     !fAnonymous ? pSessionThread->StartupInfo.szPassword : NULL,
                                     &pSessionThread->hProcess);
-
+# ifdef RT_OS_WINDOWS
+                if (pszUserUPN)
+                    RTStrFree(pszUserUPN);
+# endif
                 RTFileClose(hStdOutAndErr.u.hFile);
             }