Changeset 84031 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 28, 2020 9:55:27 AM (5 years ago)

Author:

vboxsync

Message:

bugre:9699. Added the function getManifest() into the IAppliance interface. Saving manifest name and manifest data in the string form after reading an appliance.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (3 diffs)
• include/ApplianceImpl.h (modified) (1 diff)
• include/ApplianceImplPrivate.h (modified) (4 diffs)
• src-server/ApplianceImpl.cpp (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (2 diffs)

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

@@ -3510 +3510 @@
       addresses, if the import options are used to keep them.</desc>
     </const>
-
   </enum>
 
@@ -3634 +3633 @@
     uuid="86a98347-7619-41aa-aece-b21ac5c1a7e6"
     wsmap="managed"
-    reservedMethods="7" reservedAttributes="8"
+    reservedMethods="6" reservedAttributes="8"
     >
     <desc>
@@ -3781 +3780 @@
       </desc>
     </attribute>
+
+    <method name="getManifest">
+      <desc>
+        Return manifest represented in the OVF and type of digest used there.
+      </desc>
+      <param name="manifest" type="wstring" dir="out">
+        <desc>
+          The manifest represented in the OVF. Empty if not exist.
+          This is available after calling <link to="#read"/>.
+        </desc>
+      </param>
+      <param name="manifestName" type="wstring" dir="out">
+        <desc>
+          The manifest file name. Empty if not exist.
+        </desc>
+      </param>
+
+    </method>
 
     <method name="read">

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

@@ -93 +93 @@
     HRESULT getVirtualSystemDescriptions(std::vector<ComPtr<IVirtualSystemDescription> > &aVirtualSystemDescriptions);
     HRESULT getMachines(std::vector<com::Utf8Str> &aMachines);
+
+    HRESULT getManifest(com::Utf8Str &aManifest, com::Utf8Str &aManifestName);
 
     // wrapped IAppliance methods

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

@@ -133 +133 @@
             cbSignedDigest = 0;
         }
+
         if (fSignerCertLoaded)
         {
@@ -148 +149 @@
         ptrCertificateInfo.setNull();
         strCertError.setNull();
+        strManifest.setNull();
+        strManifestName.setNull();
     }
 
@@ -161 +164 @@
     /** @name Write data
      * @{ */
-    bool                fManifest;      // Create a manifest file on export
+    bool                fManifest;     // Create a manifest file on export
     /** @} */
 
@@ -176 +179 @@
     /** Memorized copy of the manifest file for signature checking purposes. */
     RTVFSFILE           hMemFileTheirManifest;
+    /** The string contains manifest data. */
+    Utf8Str            strManifest;
+    /** The string contains manifest file name after reading appliance. */
+    Utf8Str            strManifestName;
 
     /** The signer certificate from the signature file (.cert).

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

@@ -505 +505 @@
  * Public method implementation.
  */
+HRESULT Appliance::getManifest(com::Utf8Str &aManifest, com::Utf8Str &aManifestName)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aManifest = m->strManifest;
+    aManifestName = m->strManifestName;
+    return S_OK;
+}
+
+/**
+ * Public method implementation.
+ */
 HRESULT Appliance::getDisks(std::vector<com::Utf8Str> &aDisks)
 {

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

@@ -2569 +2569 @@
     LogFlowFunc(("%s[%s]\n", pTask->locInfo.strPath.c_str(), pszSubFileNm));
 
+    /* Remember the manifet file name */
+    m->strManifestName.assign(pszSubFileNm);
+
     /*
      * Copy the manifest into a memory backed file so we can later do signature
@@ -2578 +2581 @@
         return setErrorVrc(vrc, tr("Error reading the manifest file '%s' for '%s' (%Rrc)"),
                            pszSubFileNm, pTask->locInfo.strPath.c_str(), vrc);
+
+    /*
+     * Store the manifest as a string in the m->strManifest
+     */
+    {
+        char   abBuf[_16K];
+        size_t cbRead;
+
+        vrc = RTVfsFileRead(m->hMemFileTheirManifest, &abBuf, sizeof(abBuf), &cbRead);
+        if (RT_SUCCESS(vrc))
+            m->strManifest.assignEx((const char*)abBuf, cbRead);
+
+        /* Rewind to the beginning, because the manifest will be read later again */
+        RTVfsFileSeek(m->hMemFileTheirManifest, 0, RTFILE_SEEK_BEGIN, NULL);
+    }
 
     /*