Changeset 47963 in vbox for trunk/src/VBox

Timestamp:

Aug 21, 2013 10:59:34 AM (11 years ago)

Author:

vboxsync

Message:

pr6022. Additional checks during OVA/OVF import. Deleting temporary files. Using small memory buffer for copying ISO images with simultaneously calculating SHA digest.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImplPrivate.h (modified) (1 diff)
• src-server/ApplianceImplIO.cpp (modified) (4 diffs)
• src-server/ApplianceImplImport.cpp (modified) (11 diffs)

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

@@ -244 +244 @@
 int ShaWriteBuf(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pIfIo, void *pvUser);
 int decompressImageAndSave(const char *pcszFullFilenameIn, const char *pcszFullFilenameOut, PVDINTERFACEIO pIfIo, void *pvUser);
+int copyFileAndCalcShaDigest(const char *pcszSourceFilename, const char *pcszTargetFilename, PVDINTERFACEIO pIfIo, void *pvUser);
 #endif // !____H_APPLIANCEIMPLPRIVATE
 

trunk/src/VBox/Main/src-server/ApplianceImplIO.cpp

@@ -1098 +1098 @@
 
     size_t cbAllRead = 0;
+    size_t cbAvail = 0;
     for (;;)
     {
@@ -1103 +1104 @@
         if (cbAllRead == cbRead)
             break;
-        size_t cbAvail = RTCircBufUsed(pInt->pCircBuf);
+
+        cbAvail = RTCircBufUsed(pInt->pCircBuf);
+
         if (    cbAvail == 0
             &&  pInt->fEOF
             && !RTCircBufIsWriting(pInt->pCircBuf))
         {
+            rc = VINF_EOF;
             break;
         }
+
         /* If there isn't enough data make sure the worker thread is fetching
          * more. */
@@ -1150 +1155 @@
     /* Signal the thread to read more data in the mean time. */
     if (   RT_SUCCESS(rc)
+        && rc != VINF_EOF
         && RTCircBufFree(pInt->pCircBuf) >= (RTCircBufSize(pInt->pCircBuf) / 2))
         rc = shaSignalManifestThread(pInt, STATUS_READ);
@@ -1416 +1422 @@
 }
 
-
+int copyFileAndCalcShaDigest(const char *pcszSourceFilename, const char *pcszTargetFilename, PVDINTERFACEIO pIfIo, void *pvUser)
+{ 
+    /* Validate input. */ 
+    AssertPtrReturn(pIfIo, VERR_INVALID_POINTER); 
+ 
+    PSHASTORAGE pShaStorage = (PSHASTORAGE)pvUser;
+    void *pvStorage;
+
+    int rc = pIfIo->pfnOpen(pvUser, pcszSourceFilename, 
+                            RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE, 0, 
+                            &pvStorage); 
+    if (RT_FAILURE(rc)) 
+        return rc; 
+
+    /* Turn the source file handle/whatever into a VFS stream. */
+    RTVFSIOSTREAM hVfsIosSrc;
+
+    rc = VDIfCreateVfsStream(pIfIo, pvStorage, RTFILE_O_READ, &hVfsIosSrc);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Create the output file, including necessary paths.
+         * Any existing file will be overwritten.
+         */
+        rc = VirtualBox::ensureFilePathExists(Utf8Str(pcszTargetFilename), true /*fCreate*/);
+        if (RT_SUCCESS(rc))
+        {
+            RTVFSIOSTREAM hVfsIosDst;
+            rc = RTVfsIoStrmOpenNormal(pcszTargetFilename,
+                                       RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_ALL,
+                                       &hVfsIosDst);
+            if (RT_SUCCESS(rc))
+            {
+                /*
+                 * Pump the bytes thru. If we fail, delete the output file.
+                 */
+                RTMANIFEST hFileManifest = NIL_RTMANIFEST;
+                rc = RTManifestCreate(0 /*fFlags*/, &hFileManifest);
+                if (RT_SUCCESS(rc))
+                {
+                    RTVFSIOSTREAM hVfsIosMfst;
+
+                    uint32_t digestType = (pShaStorage->fSha256 == true) ? RTMANIFEST_ATTR_SHA256: RTMANIFEST_ATTR_SHA1;
+
+                    rc = RTManifestEntryAddPassthruIoStream(hFileManifest,
+                                                            hVfsIosSrc,
+                                                            "ovf import",
+                                                            digestType,
+                                                            true /*read*/, &hVfsIosMfst);
+                    if (RT_SUCCESS(rc))
+                    {
+                        rc = RTVfsUtilPumpIoStreams(hVfsIosMfst, hVfsIosDst, 0);
+                    }
+
+                    RTVfsIoStrmRelease(hVfsIosMfst);
+                }
+
+                RTVfsIoStrmRelease(hVfsIosDst);
+            }
+        }
+
+        RTVfsIoStrmRelease(hVfsIosSrc);
+
+    }
+
+    pIfIo->pfnClose(pvUser, pvStorage);
+    return rc; 
+} 

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -1008 +1008 @@
                     vrc = RTManifestVerifyDigestType(pBuf, cbRead, &digestType);
 
+                    if (pBuf)
+                        RTMemFree(pBuf);
+
                     if (RT_FAILURE(vrc))
                     {
-                        if (pBuf)
-                            RTMemFree(pBuf);
                         throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not verify supported digest types in the manifest file '%s' (%Rrc)"),
@@ -1568 +1569 @@
 
             size_t cbCertSize = 0;
-            Utf8Str manifestShaDigest;
+
+            /* Save the SHA digest of the manifest file for the next validation */
+            Utf8Str manifestShaDigest = storage.strDigest;
+
             Utf8Str strCertFile = Utf8Str(pTask->locInfo.strPath).stripExt().append(".cert");
             if (RTFileExists(strCertFile.c_str()))
@@ -1574 +1578 @@
                 rc = readFileToBuf(strCertFile, &pvCertBuf, &cbCertSize, false, pShaIo, &storage);
                 if (FAILED(rc)) throw rc;
-
-                /* Save the SHA digest of the manifest file for the next validation */
-                manifestShaDigest = storage.strDigest;
 
                 /* verify Certificate */
@@ -2276 +2277 @@
     else
     {
+        bool fGzipUsed = !(di.strCompression.compare("gzip",Utf8Str::CaseInsensitive)); 
         /* check read file to GZIP compression */
         try
         {
-            if (di.strCompression.compare("gzip",Utf8Str::CaseInsensitive) == 0)
+            if (fGzipUsed == true)
             {
                 /*
-                 * 1. extract a file to the local/temporary folder
-                 * 2. apply GZIP decompression for the file
-                 * 3. replace the value of strSrcFilePath with a new path to the file
-                 * 4. replace SHA-TAR I/O interface with File I/O interface
-                 * 5. save calculated SHA digest of GZIPed file for later validation
-                 */
+                 * Create the necessary file access interfaces.
+                 * For the next step:
+                 * We need to replace the previously created chain of SHA-TAR or SHA-FILE interfaces
+                 * with simple FILE interface because we don't need SHA or TAR interfaces here anymore.
+                 * But we mustn't delete the chain of SHA-TAR or SHA-FILE interfaces.
+                 */ 
 
                 /* Decompress the GZIP file and save a new file in the target path */
@@ -2308 +2310 @@
 
                 /* Create the necessary file access interfaces. */
-
                 pFileIo = FileCreateInterface();
                 if (!pFileIo)
@@ -2322 +2323 @@
                                    tr("Creation of the VD interface failed (%Rrc)"), vrc);
 
+                /* Correct the source and the target with the actual values */ 
                 strSrcFilePath = strTargetDir;
                 strTargetDir = strTargetDir.stripFilename();
@@ -2333 +2335 @@
             Utf8Str strTrgFormat = "VMDK";
             ULONG lCabs = 0;
+            char *pszExt = NULL; 
 
             if (RTPathHaveExt(strTargetPath->c_str()))
             {
-                char *pszExt = RTPathExt(strTargetPath->c_str());
+                pszExt = RTPathExt(strTargetPath->c_str());
                 /* Figure out which format the user like to have. Default is VMDK. */
                 ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(&pszExt[1]);
@@ -2366 +2369 @@
                 strTrgFormat = Utf8Str(bstrFormatName);
             }
+            else
+            {
+                throw setError(VBOX_E_FILE_ERROR, 
+                               tr("The target disk '%s' has no extension "), 
+                               strTargetPath->c_str(), VERR_INVALID_NAME);
+            }
 
             /* Create an IMedium object. */
@@ -2377 +2386 @@
                 try
                 {
-                    /* Read the ISO file into a memory buffer */
-                    vrc = ShaReadBuf(strSrcFilePath.c_str(), &pvTmpBuf, &cbSize, pCallbacks, pRealUsedStorage);
-
-                    if ( RT_FAILURE(vrc) || !pvTmpBuf)
-                        throw setError(VBOX_E_FILE_ERROR,
-                                       tr("Could not read ISO file '%s' listed in the OVF file (%Rrc)"),
-                                       RTPathFilename(strSourceOVF.c_str()), vrc);
-
-                    if (RTFileExists(strTargetPath->c_str()) == false)
+                    if (fGzipUsed == true)
                     {
-
-                        /* ensure the directory exists */
-                        if (lCabs & MediumFormatCapabilities_File)
-                        {
-                            rc = VirtualBox::ensureFilePathExists(*strTargetPath, true);
-                            if (FAILED(rc))
-                                throw rc;
-                        }
-
-                        // create a new file and copy raw data into one from buffer pvTmpBuf
-                        RTFILE pFile = NULL;
-                        vrc = RTFileOpen(&pFile,
-                                         strTargetPath->c_str(),
-                                         RTFILE_O_OPEN_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-
-                        if (RT_SUCCESS(vrc) && pFile != NULL)
-                        {
-                            size_t cbWritten = 0;
-
-                            vrc = RTFileWrite(pFile, pvTmpBuf, cbSize, &cbWritten);
-
-                            if (RT_FAILURE(vrc))
-                            {
-                                Utf8Str path(*strTargetPath);
-                                path = path.stripFilename();
-
-                                throw setError(VBOX_E_FILE_ERROR,
-                                               tr("Could not write the ISO file '%s' into the folder %s (%Rrc)"),
-                                               strSrcFilePath.stripPath().c_str(),
-                                               path.c_str(),
-                                               vrc);
-                            }
-                        }
-                        RTFileClose(pFile);
+                        /*  
+                         * The source and target pathes are the same.  
+                         * It means that we have the needed file already. 
+                         * For example, in GZIP case, we decompress the file and save it in the target path,  
+                         * but with some prefix like "temp_". See part "check read file to GZIP compression" earlier  
+                         * in this function. 
+                         * Just rename the file by deleting "temp_" from it's name  
+                         */ 
+                        vrc = RTFileRename(strSrcFilePath.c_str(), strTargetPath->c_str(), RTPATHRENAME_FLAGS_NO_REPLACE); 
+                        if (RT_FAILURE(vrc)) 
+                            throw setError(VBOX_E_FILE_ERROR, 
+                                           tr("Could not rename the file '%s' (%Rrc)"), 
+                                           RTPathFilename(strSourceOVF.c_str()), vrc);
                     }
+                    else 
+                    { 
+                        /* Calculating SHA digest for ISO file while copying one */ 
+                        vrc = copyFileAndCalcShaDigest(strSrcFilePath.c_str(),  
+                                                        strTargetPath->c_str(),  
+                                                       pCallbacks,  
+                                                       pRealUsedStorage); 
+
+                        if (RT_FAILURE(vrc)) 
+                            throw setError(VBOX_E_FILE_ERROR, 
+                                           tr("Could not copy ISO file '%s' listed in the OVF file (%Rrc)"), 
+                                           RTPathFilename(strSourceOVF.c_str()), vrc); 
+                    } 
                 }
                 catch (HRESULT arc)
@@ -2501 +2494 @@
                     if (FAILED(rc)) throw rc;
 
+
+
                     /* Advance to the next operation. */
                     /* operation's weight, as set up with the IProgress originally */
@@ -2512 +2507 @@
                 ComPtr<IProgress> pp(pProgress);
                 waitForAsyncProgress(stack.pProgress, pp);
+
+                if (fGzipUsed == true) 
+                { 
+                    /*  
+                     * Just delete the temporary file 
+                     */ 
+                    vrc = RTFileDelete(strSrcFilePath.c_str()); 
+                    if (RT_FAILURE(vrc)) 
+                        setWarning(VBOX_E_FILE_ERROR, 
+                                   tr("Could not delete the file '%s' (%Rrc)"), 
+                                   RTPathFilename(strSrcFilePath.c_str()), vrc); 
+                } 
             }
         }