vbox的更動 51752 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

時間撮記:

2014-6-27 下午08:59:43 (10 年 以前)

作者:

vboxsync

訊息:

Storage,DrvVD,Main: Redo the way secret keys are passed from Main to encryption filters in DrvVD. Instead of using the config interface in VD use a distinct interface for retrieving secret keys which directly talks to the entity storing the keys in Console. Avoids copying sensitive data into probably insecure buffers. Key consumers only get a reference to the key which they can use and don't have to worry about allocating secure key memory.

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (修改) (8 筆差異)

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

@@ -421 +421 @@
 #endif
     , mBusMgr(NULL)
+    , mpIfSecKey(NULL)
     , mVMStateChangeCallbackDisabled(false)
     , mfUseHostClipboard(true)
@@ -457 +458 @@
     pVmm2UserMethods->pConsole          = this;
     mpVmm2UserMethods = pVmm2UserMethods;
+
+    MYPDMISECKEY *pIfSecKey = (MYPDMISECKEY *)RTMemAllocZ(sizeof(*mpIfSecKey) + sizeof(Console *));
+    if (!pIfSecKey)
+        return E_OUTOFMEMORY;
+    pIfSecKey->pfnKeyRetain             = Console::i_pdmIfSecKey_KeyRetain;
+    pIfSecKey->pfnKeyRelease            = Console::i_pdmIfSecKey_KeyRelease;
+    pIfSecKey->pConsole                 = this;
+    mpIfSecKey = pIfSecKey;
 
     return BaseFinalConstruct();
@@ -687 +696 @@
     }
 
+    if (mpIfSecKey)
+    {
+        RTMemFree((void *)mpIfSecKey);
+        mpIfSecKey = NULL;
+    }
+
     if (mNvram)
     {
@@ -727 +742 @@
     mRemoteUSBDevices.clear();
     mUSBDevices.clear();
+
+    for (SecretKeyMap::iterator it = m_mapSecretKeys.begin();
+         it != m_mapSecretKeys.end();
+         it++)
+        delete it->second;
+    m_mapSecretKeys.clear();
 
     if (mVRDEServerInfo)
@@ -4361 +4382 @@
  * @returns COM status code.
  * @param   pszUuid   The UUID of the disk to configure encryption for.
- * @param   pbKey     The key to use
- * @param   cbKey     Size of the key in bytes.
  */
-HRESULT Console::i_configureEncryptionForDisk(const char *pszUuid, const uint8_t *pbKey, size_t cbKey)
+HRESULT Console::i_configureEncryptionForDisk(const char *pszUuid)
 {
     HRESULT hrc = S_OK;
@@ -4467 +4486 @@
             }
 
-            rc = pIMedium->pfnSetKey(pIMedium, pbKey, cbKey);
+            rc = pIMedium->pfnSetSecKeyIf(pIMedium, mpIfSecKey);
             if (RT_FAILURE(rc))
                 return setError(E_FAIL, tr("Failed to set the encryption key (%Rrc)"), rc);
@@ -4542 +4561 @@
                 rc = RTBase64Decode(pszKeyEnc, pbKey, cbKey, NULL, NULL);
                 if (RT_SUCCESS(rc))
-                    hrc = i_configureEncryptionForDisk(pszUuid, pbKey, cbKey);
+                {
+                    SecretKey *pKey = new SecretKey(pbKey, cbKey);
+                    /* Add the key to the map */
+                    m_mapSecretKeys.insert(std::make_pair(Utf8Str(pszUuid), pKey));
+                    hrc = i_configureEncryptionForDisk(pszUuid);
+                }
                 else
                     hrc = setError(E_FAIL,
                                    tr("Failed to decode the key (%Rrc)"),
                                    rc);
-
-                RTMemWipeThoroughly(pbKey, cbKey, 10 /* cMinPasses */);
-                RTMemLockedFree(pbKey);
             }
             else
@@ -10134 +10155 @@
 
     pConsole->mfPowerOffCausedByReset = true;
+}
+
+
+
+
+/**
+ * @interface_method_impl{PDMISECKEY,pfnKeyRetain}
+ */
+/*static*/ DECLCALLBACK(int)
+Console::i_pdmIfSecKey_KeyRetain(PPDMISECKEY pInterface, const char *pszId, const uint8_t **ppbKey,
+                                 size_t *pcbKey)
+{
+    Console *pConsole = ((MYPDMISECKEY *)pInterface)->pConsole;
+
+    SecretKeyMap::const_iterator it = pConsole->m_mapSecretKeys.find(Utf8Str(pszId));
+    if (it != pConsole->m_mapSecretKeys.end())
+    {
+        SecretKey *pKey = (*it).second;
+
+        ASMAtomicIncU32(&pKey->m_cRefs);
+        *ppbKey = pKey->m_pbKey;
+        *pcbKey = pKey->m_cbKey;
+        return VINF_SUCCESS;
+    }
+
+    return VERR_NOT_FOUND;
+}
+
+/**
+ * @interface_method_impl{PDMISECKEY,pfnKeyRelease}
+ */
+/*static*/ DECLCALLBACK(int)
+Console::i_pdmIfSecKey_KeyRelease(PPDMISECKEY pInterface, const char *pszId)
+{
+    Console *pConsole = ((MYPDMISECKEY *)pInterface)->pConsole;
+    SecretKeyMap::const_iterator it = pConsole->m_mapSecretKeys.find(Utf8Str(pszId));
+    if (it != pConsole->m_mapSecretKeys.end())
+    {
+        SecretKey *pKey = (*it).second;
+        ASMAtomicDecU32(&pKey->m_cRefs);
+        return VINF_SUCCESS;
+    }
+
+    return VERR_NOT_FOUND;
 }