Changeset 33301 in vbox

Timestamp:

Oct 21, 2010 11:41:49 AM (14 years ago)

Author:

vboxsync

Message:

Guest Copy/VBoxManage+Main: Implemented first working "copyto" command (single file only, no progress), in development.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (9 diffs)
• Main/GuestImpl.cpp (modified) (9 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/GuestImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -80 +80 @@
                  "                            copyto <vmname>|<uuid>\n"
                  "                            <source on host> <destination on guest>\n"
+                 "                            --username <name> --password <password>\n"
                  "                            [--recursive] [--verbose] [--flags <flags>]\n"
 #endif
@@ -368 +369 @@
                     RTPrintf("Waiting for process to exit ...\n");
 
-                /* setup signal handling if cancelable */
+                /* Setup signal handling if cancelable. */
                 ASSERT(progress);
                 bool fCanceledAlready = false;
@@ -441 +442 @@
                     }
 
-#if 0
+#if 1
                     static int sent = 0;
                     if (sent < 1)
@@ -627 +628 @@
     Utf8Str Utf8Source(a->argv[1]);
     Utf8Str Utf8Dest(a->argv[2]);
-    uint32_t uFlags = 0;
+    Utf8Str Utf8UserName;
+    Utf8Str Utf8Password;
+    uint32_t uFlags = CopyFileFlag_None;
     bool fVerbose = false;
     bool fCopyRecursive = false;
@@ -635 +638 @@
     for (int i = 3; usageOK && i < a->argc; i++)
     {
-        if (!strcmp(a->argv[i], "--flags"))
+        if (   !strcmp(a->argv[i], "--username")
+            || !strcmp(a->argv[i], "--user"))
+        {
+            if (i + 1 >= a->argc)
+                usageOK = false;
+            else
+            {
+                Utf8UserName = a->argv[i + 1];
+                ++i;
+            }
+        }
+        else if (   !strcmp(a->argv[i], "--password")
+                 || !strcmp(a->argv[i], "--pwd"))
+        {
+            if (i + 1 >= a->argc)
+                usageOK = false;
+            else
+            {
+                Utf8Password = a->argv[i + 1];
+                ++i;
+            }
+        }
+        else if (!strcmp(a->argv[i], "--flags"))
         {
             if (i + 1 >= a->argc)
@@ -678 +703 @@
         return errorSyntax(USAGE_GUESTCONTROL,
                            "No destination specified!");
+
+    if (Utf8UserName.isEmpty())
+        return errorSyntax(USAGE_GUESTCONTROL,
+                           "No user name specified!");
 
     /* lookup VM. */
@@ -716 +745 @@
             /* Do the copy. */
             rc = guest->CopyToGuest(Bstr(Utf8Source).raw(), Bstr(Utf8Dest).raw(),
+                                    Bstr(Utf8UserName).raw(), Bstr(Utf8Password).raw(),
                                     uFlags, progress.asOutParam());
             if (FAILED(rc))
@@ -733 +763 @@
             else
             {
-                /* setup signal handling if cancelable */
+                /* Setup signal handling if cancelable. */
                 ASSERT(progress);
                 bool fCanceledAlready = false;
@@ -751 +781 @@
                 BOOL fCompleted = FALSE;
                 BOOL fCanceled = FALSE;
-                while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
+                while (   SUCCEEDED(progress->COMGETTER(Completed(&fCompleted)))
+                       && !fCompleted)
                 {
                     /* Process async cancelation */

trunk/src/VBox/Main/GuestImpl.cpp

@@ -34 +34 @@
 #include <iprt/cpp/utils.h>
 #include <iprt/dir.h>
+#include <iprt/file.h>
 #include <iprt/getopt.h>
 #include <iprt/list.h>
@@ -1521 +1522 @@
                             && fCompleted)
                         {
-                            PCALLBACKDATAEXECINSTATUS pData = (PCALLBACKDATAEXECINSTATUS)it->second.pvData;
+                            PCALLBACKDATAEXECINSTATUS pStatusData = (PCALLBACKDATAEXECINSTATUS)it->second.pvData;
                             Assert(it->second.cbData == sizeof(CALLBACKDATAEXECINSTATUS));
-                            AssertPtr(pData);
-
-                            *aBytesWritten = pData->cbProcessed;
+                            AssertPtr(pStatusData);
+
+                            *aBytesWritten = pStatusData->cbProcessed;
                         }
                     }
@@ -1930 +1931 @@
 #endif
 
-STDMETHODIMP Guest::CopyToGuest(IN_BSTR aSource, IN_BSTR aDest, ULONG aFlags,
-                                IProgress **aProgress)
+/** @todo For having a progress object which actually reports something,
+  *       the actual copy loop (see below) needs to go to some worker thread
+  *       so that this routine can return to the caller (and the caller then
+  *       can do display a progress). */
+STDMETHODIMP Guest::CopyToGuest(IN_BSTR aSource, IN_BSTR aDest,
+                                IN_BSTR aUserName, IN_BSTR aPassword,
+                                ULONG aFlags, IProgress **aProgress)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -1949 +1955 @@
 
     /* Validate flags. */
-    if (aFlags)
+    if (aFlags != CopyFileFlag_None)
     {
         if (   !(aFlags & CopyFileFlag_Recursive)
@@ -1963 +1969 @@
     try
     {
-        ULONG cObjectsToCopy = 0;
-        RTLISTNODE listEntries;
+        /*ULONG cObjectsToCopy = 0;
+        RTLISTNODE listEntries;*/
 
         Utf8Str Utf8Source(aSource);
         Utf8Str Utf8Dest(aDest);
-
-        char *pszSourceAbs = RTPathAbsDup(Utf8Source.c_str());
-        if (!pszSourceAbs)
-        {
-            rc = setError(VBOX_E_IPRT_ERROR,
-                          tr("Could not determine absolute path of \"%s\""), Utf8Source.c_str());
+        Utf8Str Utf8UserName(aUserName);
+        Utf8Str Utf8Password(aPassword);
+
+        /* Does our source file exist? */
+        if (!RTFileExists(Utf8Source.c_str()))
+        {
+            rc = setError(VBOX_E_FILE_ERROR,
+                          tr("Source file \"%s\" does not exist"), Utf8Source.c_str());
         }
         else
         {
+            RTFILE fileSource;
+            int vrc = RTFileOpen(&fileSource, Utf8Source.c_str(),
+                                 RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
+            if (RT_FAILURE(vrc))
+            {
+                rc = setError(VBOX_E_IPRT_ERROR,
+                              tr("Could not open source file \"%s\" for reading, rc=%Rrc"),
+                              Utf8Source.c_str(),  vrc);
+            }
+            else
+            {
+                uint64_t cbSize;
+                vrc = RTFileGetSize(fileSource, &cbSize);
+                if (RT_FAILURE(vrc))
+                {
+                    rc = setError(VBOX_E_IPRT_ERROR,
+                                  tr("Could not query file size of \"%s\", rc=%Rrc"),
+                                  Utf8Source.c_str(),  vrc);
+                }
+                else
+                {
+                    com::SafeArray<IN_BSTR> args;
+                    com::SafeArray<IN_BSTR> env;
+
+                    /*
+                     * Prepare tool command line.
+                     */
+                    args.push_back(Bstr("vbox_cat").raw()); /* The actual (internal) tool to use (as argv[0]). */
+                    args.push_back(Bstr("--output").raw()); /* We want to write a file ... */
+                    args.push_back(Bstr(Utf8Dest).raw());   /* ... which is specified here. */
+
+                    /*
+                     * Okay, since we gathered all stuff we need until now to start the
+                     * actual copying, start the guest part now.
+                     */
+                    ULONG uPID;
+                    ComPtr<IProgress> execProgress;
+                    rc = ExecuteProcess(Bstr("vbox_cat").raw(), 0 /* Flags */,
+                                        ComSafeArrayAsInParam(args),
+                                        ComSafeArrayAsInParam(env),
+                                        Bstr(Utf8UserName).raw(),
+                                        Bstr(Utf8Password).raw(), 0 /* Timeout */,
+                                        &uPID, execProgress.asOutParam());
+                    if (SUCCEEDED(rc))
+                    {
+                        /* Wait for process to exit ... */
+                        BOOL fCompleted = FALSE;
+                        BOOL fCanceled = FALSE;
+
+                        size_t cbRead;
+                        SafeArray<BYTE> aInputData(_64K);
+                        while (   SUCCEEDED(execProgress->COMGETTER(Completed(&fCompleted)))
+                               && !fCompleted)
+                        {
+                            vrc = RTFileRead(fileSource, (uint8_t*)aInputData.raw(), _64K, &cbRead);
+                            if (   cbRead == 0
+                                || vrc == VERR_EOF)
+                                break;
+
+                            aInputData.resize(cbRead);
+
+                            /* Did we reach the end of the content
+                             * we want to transfer (last chunk)? */
+                            ULONG uFlags = ProcessInputFlag_None;
+                            if (cbRead < _64K)
+                                uFlags |= ProcessInputFlag_EndOfFile;
+
+                            /* Transfer the current chunk ... */
+                            ULONG uBytesWritten;
+                            rc = SetProcessInput(uPID, uFlags,
+                                                 ComSafeArrayAsInParam(aInputData), &uBytesWritten);
+                            if (FAILED(rc))
+                                break;
+
+                            /* Progress canceled by Main API? */
+                            if (   SUCCEEDED(execProgress->COMGETTER(Canceled(&fCanceled)))
+                                && fCanceled)
+                            {
+                                break;
+                            }
+                        }
+
+                        if (SUCCEEDED(rc))
+                        {
+                            /* Return the progress to the caller. */
+                            execProgress.queryInterfaceTo(aProgress);
+                        }
+                    }
+                }
+                RTFileClose(fileSource);
+            }
+#if 0
+            /*
+             * Does the source directory exist?
+             */
             if (RTDirExists(pszSourceAbs))
             {
+                /* If no trailing slash is present, append. */
                 size_t cch = strlen(pszSourceAbs);
                 if (    cch > 1
@@ -1989 +2093 @@
                                       tr("Failed to extend source path, rc=%Rrc\n"), vrc);
                 }
+            }
+
+            if (SUCCEEDED(rc))
+            {
+#endif
+#if 0
+                /*
+                 * Create progress object.  Note that this is a multi operation
+                 * object to perform an operation per file object we just gathered
+                 * in our list above.
+                 *
+                 * Stages:
+                 * - 0: Starting copy process
+                 * - 1: Copying file
+                 * - 2: Finished
+                 */
+                ComObjPtr <Progress> progress;
+                rc = progress.createObject();
+                if (SUCCEEDED(rc))
+                {
+                    rc = progress->init(static_cast<IGuest*>(this),
+                                        Bstr(tr("Copying to guest")).raw(),
+                                        TRUE,
+                                        3,                                  /* Number of stages. */
+                                        Bstr(tr("Starting ...")).raw());    /* Description of first stage. */
+                }
+                if (FAILED(rc)) return rc;
+
+                rc = guest->ExecuteProcess(Bstr(Utf8Cmd).raw(), uFlags,
+                                           ComSafeArrayAsInParam(args),
+                                           ComSafeArrayAsInParam(env),
+                                           Bstr(Utf8UserName).raw(),
+                                           Bstr(Utf8Password).raw(), u32TimeoutMS,
+                                           &uPID, progress.asOutParam());
+                if (SUCCEEDED(rc))
+                {
+
+                }
+#endif
+#if 0
             }
 
@@ -2033 +2177 @@
                 }
                 if (FAILED(rc)) return rc;
+#endif
+#if 0
+                /*
+                 * Now copy all files in the list ...
+                 */
+                for (ULONG l=0; l < cObjectsToCopy; l++)
+                {
+                    rc = guest->ExecuteProcess(Bstr(Utf8Cmd).raw(), uFlags,
+                                       ComSafeArrayAsInParam(args),
+                                       ComSafeArrayAsInParam(env),
+                                       Bstr(Utf8UserName).raw(),
+                                       Bstr(Utf8Password).raw(), u32TimeoutMS,
+                                       &uPID, progress.asOutParam());
+                }
+#endif
 #if 0
                 if (SUCCEEDED(rc))
@@ -2079 +2238 @@
                 }
 #endif
-                /* Destroy list. */
+#if 0
+                /* Destroy file list. */
                 VBoxGuestDirEntry *pNode = RTListNodeGetFirst(&listEntries, VBoxGuestDirEntry, Node);
                 while (pNode)
@@ -2097 +2257 @@
                 }
             }
+#endif
         }
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7605 +7605 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="9a2d971f-62cb-4e84-b91a-c5adc2b7c6b8"
+     uuid="ed69cdce-2905-4275-872b-3c743a85c584"
      wsmap="managed"
      >
@@ -7911 +7911 @@
         <desc>
           Bar.
+        </desc>
+      </param>
+      <param name="userName" type="wstring" dir="in">
+        <desc>
+          User name under which the copy command will be executed; the
+          user has to exist and have the appropriate rights to write to
+          the destination path.
+        </desc>
+      </param>
+      <param name="password" type="wstring" dir="in">
+        <desc>
+          Password of the user account specified.
         </desc>
       </param>

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

@@ -101 +101 @@
     STDMETHOD(SetProcessInput)(ULONG aPID, ULONG aFlags, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten);
     STDMETHOD(GetProcessStatus)(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ULONG *aStatus);
-    STDMETHOD(CopyToGuest)(IN_BSTR aSource, IN_BSTR aDest, ULONG aFlags, IProgress **aProgress);
+    STDMETHOD(CopyToGuest)(IN_BSTR aSource, IN_BSTR aDest, IN_BSTR aUserName, IN_BSTR aPassword, ULONG aFlags, IProgress **aProgress);
     STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemShared, ULONG *aMemCache,