Changeset 53560 in vbox

Timestamp:

Dec 17, 2014 12:03:00 PM (10 years ago)

Author:

vboxsync

Message:

Main: Fixes for disk encryption, delete the key again if configuring disk encryption fails. Correctly set disk properties for all media and not just the first one

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)

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

@@ -694 +694 @@
                        MachineState_T aMachineState,
                        HRESULT *phrc);
+    int i_configMediumProperties(PCFGMNODE pCur, IMedium *pMedium, bool *pfHostIP);
     static DECLCALLBACK(int) i_reconfigureMediumAttachment(Console *pThis,
                                                            PUVM pUVM,

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -4681 +4681 @@
                     m_mapSecretKeys.insert(std::make_pair(Utf8Str(pszUuid), pKey));
                     hrc = i_configureEncryptionForDisk(pszUuid);
+                    if (FAILED(hrc))
+                    {
+                        /* Delete the key from the map. */
+                        m_mapSecretKeys.erase(Utf8Str(pszUuid));
+                    }
                 }
                 else

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -4233 +4233 @@
                 /* Pass all custom parameters. */
                 bool fHostIP = true;
-                SafeArray<BSTR> names;
-                SafeArray<BSTR> values;
-                hrc = pMedium->GetProperties(Bstr().raw(),
-                                             ComSafeArrayAsOutParam(names),
-                                             ComSafeArrayAsOutParam(values));               H();
-
-                if (names.size() != 0)
-                {
-                    PCFGMNODE pVDC;
-                    InsertConfigNode(pCfg, "VDConfig", &pVDC);
-                    for (size_t ii = 0; ii < names.size(); ++ii)
-                    {
-                        if (values[ii] && *values[ii])
-                        {
-                            /* Put properties of filters in a separate config node. */
-                            Utf8Str name = names[ii];
-                            Utf8Str value = values[ii];
-                            size_t offSlash = name.find("/", 0);
-                            if (   offSlash != name.npos
-                                && !name.startsWith("Special/"))
-                            {
-                                com::Utf8Str strFilter;
-                                com::Utf8Str strKey;
-
-                                hrc = strFilter.assignEx(name, 0, offSlash); H();
-                                hrc = strKey.assignEx(name, offSlash + 1, name.length() - offSlash - 1); /* Skip slash */ H();
-
-                                PCFGMNODE pCfgFilterConfig = CFGMR3GetChild(pVDC, strFilter.c_str());
-                                if (!pCfgFilterConfig)
-                                    InsertConfigNode(pVDC, strFilter.c_str(), &pCfgFilterConfig);
-
-                                InsertConfigString(pCfgFilterConfig, strKey.c_str(), value);
-                            }
-                            else
-                            {
-                                InsertConfigString(pVDC, name.c_str(), value);
-                                if (    name.compare("HostIPStack") == 0
-                                    &&  value.compare("0") == 0)
-                                    fHostIP = false;
-                            }
-                        }
-                    }
-                }
+                hrc = i_configMediumProperties(pCfg, pMedium, &fHostIP); H();
 
                 /* Create an inverted list of parents. */
@@ -4302 +4260 @@
                     }
 
-                    /* Pass all custom parameters. */
-                    SafeArray<BSTR> aNames;
-                    SafeArray<BSTR> aValues;
-                    hrc = pMedium->GetProperties(NULL,
-                                                ComSafeArrayAsOutParam(aNames),
-                                                ComSafeArrayAsOutParam(aValues));           H();
-
-                    if (aNames.size() != 0)
-                    {
-                        PCFGMNODE pVDC;
-                        InsertConfigNode(pCur, "VDConfig", &pVDC);
-                        for (size_t ii = 0; ii < aNames.size(); ++ii)
-                        {
-                            if (aValues[ii] && *aValues[ii])
-                            {
-                                Utf8Str name = aNames[ii];
-                                Utf8Str value = aValues[ii];
-                                InsertConfigString(pVDC, name.c_str(), value);
-                                if (    name.compare("HostIPStack") == 0
-                                    &&  value.compare("0") == 0)
-                                    fHostIP = false;
-                            }
-                        }
-                    }
+                    /* Configure medium properties. */
+                    hrc = i_configMediumProperties(pCur, pMedium, &fHostIP); H();
 
                     /* next */
@@ -4347 +4283 @@
 
     return VINF_SUCCESS;
+}
+
+/**
+ * Adds the medium properties to the CFGM tree.
+ *
+ * @returns VBox status code.
+ * @param   pCur       The current CFGM node.
+ * @param   pMedium    The medium object to configure.
+ * @param   pfHostIP   Where to return the value of the \"HostIPStack\" property if found.
+ */
+int Console::i_configMediumProperties(PCFGMNODE pCur, IMedium *pMedium, bool *pfHostIP)
+{
+    /* Pass all custom parameters. */
+    SafeArray<BSTR> aNames;
+    SafeArray<BSTR> aValues;
+    HRESULT hrc = pMedium->GetProperties(NULL, ComSafeArrayAsOutParam(aNames),
+                                         ComSafeArrayAsOutParam(aValues));
+
+    if (   SUCCEEDED(hrc)
+        && aNames.size() != 0)
+    {
+        PCFGMNODE pVDC;
+        InsertConfigNode(pCur, "VDConfig", &pVDC);
+        for (size_t ii = 0; ii < aNames.size(); ++ii)
+        {
+            if (aValues[ii] && *aValues[ii])
+            {
+                Utf8Str name = aNames[ii];
+                Utf8Str value = aValues[ii];
+                size_t offSlash = name.find("/", 0);
+                if (   offSlash != name.npos
+                    && !name.startsWith("Special/"))
+                {
+                    com::Utf8Str strFilter;
+                    com::Utf8Str strKey;
+
+                    hrc = strFilter.assignEx(name, 0, offSlash);
+                    if (FAILED(hrc))
+                        break;
+
+                    hrc = strKey.assignEx(name, offSlash + 1, name.length() - offSlash - 1); /* Skip slash */
+                    if (FAILED(hrc))
+                        break;
+
+                    PCFGMNODE pCfgFilterConfig = CFGMR3GetChild(pVDC, strFilter.c_str());
+                    if (!pCfgFilterConfig)
+                        InsertConfigNode(pVDC, strFilter.c_str(), &pCfgFilterConfig);
+
+                    InsertConfigString(pCfgFilterConfig, strKey.c_str(), value);
+                }
+                else
+                {
+                    InsertConfigString(pVDC, name.c_str(), value);
+                    if (    name.compare("HostIPStack") == 0
+                        &&  value.compare("0") == 0)
+                        *pfHostIP = false;
+                }
+            }
+        }
+    }
+
+    return hrc;
 }