Changeset 55505 in vbox

Timestamp:

Apr 29, 2015 8:26:44 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99859

Message:

Main: Add method to return list of medium identifiers assoicated with a given password ID. Required by the GUI to verify entered passwords during appliance export

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -2993 +2993 @@
   <interface
     name="IAppliance" extends="$unknown"
-    uuid="d9432012-2740-499f-b3b3-0991da3679f3"
+    uuid="a529d52c-cf23-4936-9150-e8a6ce77fdad"
     wsmap="managed"
     >
@@ -3256 +3256 @@
 
       <param name="identifiers" type="wstring" dir="return" safearray="yes">
-        The list of password identifiers required on success.
+        The list of password identifiers required for export on success.
+      </param>
+    </method>
+
+    <method name="getMediumIdsForPasswordId">
+      <desc>
+        Returns a list of medium identifiers which use the given password identifier.
+      </desc>
+
+      <param name="passwordId" type="wstring" dir="in">
+        The password identifier to get the medium identifiers for.
+      </param>
+      <param name="identifiers" type="uuid" mod="string" dir="return" safearray="yes">
+        The list of medium identifiers returned on success.
       </param>
     </method>
@@ -14681 +14694 @@
       <param name="currentPassword" type="wstring" dir="in">
         <desc>
-          The olcurrentd password the medium is protected with. Use an empty string to indicate
+          The current password the medium is protected with. Use an empty string to indicate
           that the medium isn't encrypted.
         </desc>

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

@@ -106 +106 @@
     HRESULT getWarnings(std::vector<com::Utf8Str> &aWarnings);
     HRESULT getPasswordIds(std::vector<com::Utf8Str> &aIdentifiers);
+    HRESULT getMediumIdsForPasswordId(const com::Utf8Str &aPasswordId, std::vector<com::Guid> &aIdentifiers);
     HRESULT addPasswords(const std::vector<com::Utf8Str> &aIdentifiers,
                          const std::vector<com::Utf8Str> &aPasswords);

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

@@ -35 +35 @@
 typedef std::pair<Utf8Str, Utf8Str> STRPAIR;
 
+typedef std::vector<com::Guid> GUIDVEC;
+
 /* Describe a location for the import/export. The location could be a file on a
  * local hard disk or a remote target based on the supported inet protocols. */
@@ -106 +108 @@
     /** Sequence of password identifiers to encrypt disk images during export. */
     std::vector<com::Utf8Str> m_vecPasswordIdentifiers;
+    /** Map to get all medium identifiers assoicated with a given password identifier. */
+    std::map<com::Utf8Str, GUIDVEC> m_mapPwIdToMediumIds;
     /** Secret key store used to hold the passwords during export. */
     SecretKeyStore            *m_pSecretKeyStore;

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

@@ -614 +614 @@
 }
 
+HRESULT Appliance::getMediumIdsForPasswordId(const com::Utf8Str &aPasswordId, std::vector<com::Guid> &aIdentifiers)
+{
+    HRESULT hrc = S_OK;
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    std::map<com::Utf8Str, GUIDVEC>::const_iterator it = m->m_mapPwIdToMediumIds.find(aPasswordId);
+    if (it != m->m_mapPwIdToMediumIds.end())
+        aIdentifiers = it->second;
+    else
+        hrc = setError(E_FAIL, tr("The given password identifier is not associated with any medium"));
+
+    return hrc;
+}
+
 HRESULT Appliance::addPasswords(const std::vector<com::Utf8Str> &aIdentifiers,
                                 const std::vector<com::Utf8Str> &aPasswords)

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

@@ -359 +359 @@
                 if (FAILED(rc)) throw rc;
 
-                /* If the medium is encrypted add the key identifier to the */
+                /* If the medium is encrypted add the key identifier to the list. */
                 IMedium *iBaseMedium = pBaseMedium;
                 Medium *pBase = static_cast<Medium*>(iBaseMedium);
@@ -365 +365 @@
                 if (!strKeyId.isEmpty())
                 {
+                    IMedium *iMedium = pMedium;
+                    Medium *pMed = static_cast<Medium*>(iMedium);
+                    com::Guid mediumUuid = pMed->i_getId();
                     bool fKnown = false;
 
@@ -378 +381 @@
 
                     if (!fKnown)
+                    {
+                        GUIDVEC vecMediumIds;
+
+                        vecMediumIds.push_back(mediumUuid);
                         pAppliance->m->m_vecPasswordIdentifiers.push_back(strKeyId);
+                        pAppliance->m->m_mapPwIdToMediumIds.insert(std::pair<com::Utf8Str, GUIDVEC>(strKeyId, vecMediumIds));
+                    }
+                    else
+                    {
+                        std::map<com::Utf8Str, GUIDVEC>::iterator it = pAppliance->m->m_mapPwIdToMediumIds.find(strKeyId);
+                        if (it == pAppliance->m->m_mapPwIdToMediumIds.end())
+                            throw setError(E_FAIL, tr("Internal error adding a medium UUID to the map"));
+                        it->second.push_back(mediumUuid);
+                    }
                 }
             }