Changeset 32568 in vbox

Timestamp:

Sep 16, 2010 3:26:13 PM (14 years ago)

Author:

vboxsync

Message:

OVA: parse ovf in memory on ova import (no need for a temporary ovf anymore)

Location:

trunk

Files:

• include/iprt/sha.h (modified) (2 diffs)
• src/VBox/Main/ApplianceImplImport.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/checksum/RTSha1Digest.cpp (modified) (1 diff)
• src/VBox/Runtime/common/checksum/manifest.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTDigest.cpp (modified) (1 diff)

trunk/include/iprt/sha.h

@@ -114 +114 @@
 
 /**
+ * Creates a SHA1 digest for the given memory buffer.
+ *
+ * @returns iprt status code.
+ *
+ * @param   pvBuf                 Memory buffer to create a SHA1 digest for.
+ * @param   cbBuf                 The amount of data (in bytes).
+ * @param   ppszDigest            On success the SHA1 digest.
+ * @param   pfnProgressCallback   optional callback for the progress indication
+ * @param   pvUser                user defined pointer for the callback
+ */
+RTR3DECL(int) RTSha1Digest(void* pvBuf, size_t cbBuf, char **ppszDigest, FNRTPROGRESS pfnProgressCallback, void *pvUser);
+
+/**
  * Creates a SHA1 digest for the given file.
  *
@@ -123 +136 @@
  * @param   pvUser                user defined pointer for the callback
  */
-RTR3DECL(int) RTSha1Digest(const char *pszFile, char **ppszDigest, FNRTPROGRESS pfnProgressCallback, void *pvUser);
-
+RTR3DECL(int) RTSha1DigestFromFile(const char *pszFile, char **ppszDigest, FNRTPROGRESS pfnProgressCallback, void *pvUser);
 
 

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -691 +691 @@
         /* Create the SHA1 sum of the OVF file for later validation */
         char *pszDigest;
-        int vrc = RTSha1Digest(locInfo.strPath.c_str(), &pszDigest, NULL, NULL);
+        int vrc = RTSha1DigestFromFile(locInfo.strPath.c_str(), &pszDigest, NULL, NULL);
         if (RT_FAILURE(vrc))
             DebugBreakThrow(setError(VBOX_E_FILE_ERROR,
@@ -724 +724 @@
 
     AutoWriteLock appLock(this COMMA_LOCKVAL_SRC_POS);
-
     HRESULT rc = S_OK;
-    int vrc = VINF_SUCCESS;
-    char szOSTmpDir[RTPATH_MAX];
-    RTPathTemp(szOSTmpDir, sizeof(szOSTmpDir));
-    /* The template for the temporary directory created below */
-    char *pszTmpDir;
-    RTStrAPrintf(&pszTmpDir, "%s"RTPATH_SLASH_STR"vbox-ovf-XXXXXX", szOSTmpDir);
-    list< pair<Utf8Str, ULONG> > filesList;
-    Utf8Str strTmpOvf;
+    void *pvBuf = 0;
 
     try
     {
-        /* Extract the path */
         Utf8Str tmpPath = locInfo.strPath;
         /* Remove the ova extension */
         tmpPath.stripExt();
+        /* add the ovf extension. */
         tmpPath += ".ovf";
-
-        /* We need a temporary directory which we can put the OVF file & all
-         * disk images in */
-        vrc = RTDirCreateTemp(pszTmpDir);
+        char* pcszOVFName = RTPathFilename(tmpPath.c_str());
+
+        /* Read the OVF into a memory buffer */
+        uint64_t cbSize;
+        int vrc = RTTarExtractFileToBuf(locInfo.strPath.c_str(), &pvBuf, &cbSize, pcszOVFName, 0, 0);
         if (RT_FAILURE(vrc))
-            DebugBreakThrow(setError(VBOX_E_FILE_ERROR,
-                           tr("Cannot create temporary directory '%s' (%Rrc)"), pszTmpDir, vrc));
-
-        /* The temporary name of the target OVF file */
-        strTmpOvf = Utf8StrFmt("%s/%s", pszTmpDir, RTPathFilename(tmpPath.c_str()));
-
-        /* Next we have to download the OVF */
-        char *papszFile = RTPathFilename(strTmpOvf.c_str());
-        vrc = RTTarExtractFiles(locInfo.strPath.c_str(), pszTmpDir, &papszFile, 1, 0, 0);
+        {
+            if (vrc == VERR_FILE_NOT_FOUND)
+                throw setError(VBOX_E_IPRT_ERROR,
+                               tr("Can't find ovf file '%s' in archive '%s' (%Rrc)"), pcszOVFName, locInfo.strPath.c_str(), vrc);
+            else
+                throw setError(VBOX_E_IPRT_ERROR,
+                               tr("Can't unpack the archive file '%s' (%Rrc)"), locInfo.strPath.c_str(), vrc);
+        }
+
+        /* Read & parse the XML structure of the OVF file */
+        m->pReader = new ovf::OVFReader(pvBuf, cbSize, locInfo.strPath);
+        /* Create the SHA1 sum of the OVF file for later validation */
+        char *pszDigest;
+        vrc = RTSha1Digest(pvBuf, cbSize, &pszDigest, 0, 0);
         if (RT_FAILURE(vrc))
-        {
-            if (vrc == VERR_FILE_NOT_FOUND)
-                DebugBreakThrow(setError(VBOX_E_IPRT_ERROR,
-                                         tr("Can't find ovf file '%s' in archive '%s' (%Rrc)"), papszFile, locInfo.strPath.c_str(), vrc));
-            else
-                DebugBreakThrow(setError(VBOX_E_IPRT_ERROR,
-                                         tr("Can't unpack the archive file '%s' (%Rrc)"), locInfo.strPath.c_str(), vrc));
-        }
-
-        // todo: check this out
-//        pTask->pProgress->SetNextOperation(Bstr(tr("Reading")), 1);
-
-        /* Prepare the temporary reading of the OVF */
-        ComObjPtr<Progress> progress;
-        LocationInfo li;
-        li.strPath = strTmpOvf;
-        /* Start the reading from the fs */
-        rc = readImpl(li, progress);
-        if (FAILED(rc)) DebugBreakThrow(rc);
-
-        /* Unlock the appliance for the reading thread */
-        appLock.release();
-        /* Wait until the reading is done, but report the progress back to the
-           caller */
-        ComPtr<IProgress> progressInt(progress);
-        waitForAsyncProgress(pProgress, progressInt); /* Any errors will be thrown */
-
-        /* Again lock the appliance for the next steps */
-        appLock.acquire();
-    }
-    catch(HRESULT aRC)
+            throw setError(VBOX_E_FILE_ERROR,
+                           tr("Couldn't calculate SHA1 digest for file '%s' (%Rrc)"),
+                           RTPathFilename(locInfo.strPath.c_str()), vrc);
+        m->strOVFSHA1Digest = pszDigest;
+        RTStrFree(pszDigest);
+
+    }
+    catch (iprt::Error &x)      // includes all XML exceptions
+    {
+        rc = setError(VBOX_E_FILE_ERROR,
+                      x.what());
+    }
+    catch (HRESULT aRC)
     {
         rc = aRC;
     }
-    /* Delete all files which where temporary created */
-    if (RTPathExists(strTmpOvf.c_str()))
-    {
-        vrc = RTFileDelete(strTmpOvf.c_str());
-        if (RT_FAILURE(vrc))
-            rc = setError(VBOX_E_FILE_ERROR,
-                          tr("Cannot delete file '%s' (%Rrc)"), strTmpOvf.c_str(), vrc);
-    }
-    /* Delete the temporary directory */
-    if (RTPathExists(pszTmpDir))
-    {
-        vrc = RTDirRemove(pszTmpDir);
-        if (RT_FAILURE(vrc))
-            rc = setError(VBOX_E_FILE_ERROR,
-                          tr("Cannot delete temporary directory '%s' (%Rrc)"), pszTmpDir, vrc);
-    }
-    if (pszTmpDir)
-        RTStrFree(pszTmpDir);
+
+    /* Cleanup the OVF memory buffer */
+    if (pvBuf)
+        RTMemFree(pvBuf);
 
     LogFlowFunc(("rc=%Rhrc\n", rc));
@@ -1157 +1123 @@
         {
             char* pszDigest;
-            vrc = RTSha1Digest((*it1).c_str(), &pszDigest, NULL, NULL);
+            vrc = RTSha1DigestFromFile((*it1).c_str(), &pszDigest, NULL, NULL);
             pTestList[i].pszTestFile = (char*)(*it1).c_str();
             pTestList[i].pszTestDigest = pszDigest;

trunk/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp

@@ -41 +41 @@
 
 
-RTR3DECL(int) RTSha1Digest(const char *pszFile, char **ppszDigest, PFNRTPROGRESS pfnProgressCallback, void *pvUser)
+RTR3DECL(int) RTSha1Digest(void* pvBuf, size_t cbBuf, char **ppszDigest, FNRTPROGRESS pfnProgressCallback, void *pvUser)
+{
+    /* Validate input */
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertPtrReturn(ppszDigest, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pfnProgressCallback, VERR_INVALID_PARAMETER);
+
+    int rc = VINF_SUCCESS;
+    *ppszDigest = NULL;
+
+    /* Initialize OpenSSL. */
+    SHA_CTX ctx;
+    if (!SHA1_Init(&ctx))
+        return VERR_INTERNAL_ERROR;
+
+    /* Buffer size for progress callback */
+    double rdMulti = 100.0 / cbBuf;
+
+    /* Working buffer */
+    char *pvTmp = (char*)pvBuf;
+
+    /* Process the memory in blocks */
+    size_t cbRead;
+    size_t cbReadTotal = 0;
+    for (;;)
+    {
+        cbRead = RT_MIN(cbBuf - cbReadTotal, _1M);
+        if(!SHA1_Update(&ctx, pvTmp, cbRead))
+        {
+            rc = VERR_INTERNAL_ERROR;
+            break;
+        }
+        cbReadTotal += cbRead;
+        pvTmp += cbRead;
+
+        /* Call the progress callback if one is defined */
+        if (pfnProgressCallback)
+        {
+            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            if (RT_FAILURE(rc))
+                break; /* canceled */
+        }
+        /* Finished? */
+        if (cbReadTotal == cbBuf)
+            break;
+    }
+    if (RT_SUCCESS(rc))
+    {
+        /* Finally calculate & format the SHA1 sum */
+        unsigned char auchDig[RTSHA1_HASH_SIZE];
+        if (!SHA1_Final(auchDig, &ctx))
+            return VERR_INTERNAL_ERROR;
+
+        char *pszDigest;
+        rc = RTStrAllocEx(&pszDigest, RTSHA1_DIGEST_LEN + 1);
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTSha1ToString(auchDig, pszDigest, RTSHA1_DIGEST_LEN + 1);
+            if (RT_SUCCESS(rc))
+                *ppszDigest = pszDigest;
+            else
+                RTStrFree(pszDigest);
+        }
+    }
+
+    return rc;
+}
+
+RTR3DECL(int) RTSha1DigestFromFile(const char *pszFile, char **ppszDigest, PFNRTPROGRESS pfnProgressCallback, void *pvUser)
 {
     /* Validate input */

trunk/src/VBox/Runtime/common/checksum/manifest.cpp

@@ -253 +253 @@
         {
             callback.cCurrentFile = i;
-            rc = RTSha1Digest(papszFiles[i], &pszDigest, rtSHAProgressCallback, &callback);
+            rc = RTSha1DigestFromFile(papszFiles[i], &pszDigest, rtSHAProgressCallback, &callback);
         }
         else
-            rc = RTSha1Digest(papszFiles[i], &pszDigest, NULL, NULL);
+            rc = RTSha1DigestFromFile(papszFiles[i], &pszDigest, NULL, NULL);
         if (RT_FAILURE(rc))
             break;
@@ -301 +301 @@
         {
             callback.cCurrentFile = i;
-            rc = RTSha1Digest(papszFiles[i], &pszDigest, rtSHAProgressCallback, &callback);
+            rc = RTSha1DigestFromFile(papszFiles[i], &pszDigest, rtSHAProgressCallback, &callback);
         }
         else
-            rc = RTSha1Digest(papszFiles[i], &pszDigest, NULL, NULL);
+            rc = RTSha1DigestFromFile(papszFiles[i], &pszDigest, NULL, NULL);
         if (RT_FAILURE(rc))
             break;

trunk/src/VBox/Runtime/testcase/tstRTDigest.cpp

@@ -152 +152 @@
                              {
                                  char *pszDigest;
-                                 int rc = RTSha1Digest(ValueUnion.psz, &pszDigest, NULL, NULL);
+                                 int rc = RTSha1DigestFromFile(ValueUnion.psz, &pszDigest, NULL, NULL);
                                  if (RT_FAILURE(rc))
                                      return Error("RTSha1Digest(%s,) -> %Rrc\n", ValueUnion.psz, rc);