Changeset 54753 in vbox

Timestamp:

Mar 13, 2015 5:03:28 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Runtime UI: Disk Encryption (DE) support: Move 'ask for passwords' trigger to 'DEK missing' runtime error handler.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIAddDiskEncryptionPasswordDialog.cpp (modified) (7 diffs)
• UIAddDiskEncryptionPasswordDialog.h (modified) (3 diffs)
• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UISession.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp

@@ -96 +96 @@
       * @param pParent          being passed to the base-class,
       * @param encryptedMediums contains the lists of medium ids (values) encrypted with passwords with ids (keys). */
-    UIEncryptionDataModel(QObject *pParent, const EncryptedMediumsMap &encryptedMediums);
+    UIEncryptionDataModel(QObject *pParent, const EncryptedMediumMap &encryptedMediums);
 
     /** Returns the shallow copy of the encryption password map instance. */
@@ -123 +123 @@
 
     /** Holds the encrypted medium map reference. */
-    const EncryptedMediumsMap &m_encryptedMediums;
+    const EncryptedMediumMap &m_encryptedMediums;
 
     /** Holds the encryption password map instance. */
@@ -140 +140 @@
     /** Constructor.
       * @param pParent being passed to the base-class. */
-    UIEncryptionDataTable(const EncryptedMediumsMap &encryptedMediums);
+    UIEncryptionDataTable(const EncryptedMediumMap &encryptedMediums);
 
     /** Returns the shallow copy of the encryption password map
@@ -152 +152 @@
 
     /** Holds the encrypted medium map reference. */
-    const EncryptedMediumsMap &m_encryptedMediums;
+    const EncryptedMediumMap &m_encryptedMediums;
 
     /** Holds the encryption-data model instance. */
@@ -183 +183 @@
 }
 
-UIEncryptionDataModel::UIEncryptionDataModel(QObject *pParent, const EncryptedMediumsMap &encryptedMediums)
+UIEncryptionDataModel::UIEncryptionDataModel(QObject *pParent, const EncryptedMediumMap &encryptedMediums)
     : QAbstractTableModel(pParent)
     , m_encryptedMediums(encryptedMediums)
@@ -312 +312 @@
 }
 
-UIEncryptionDataTable::UIEncryptionDataTable(const EncryptedMediumsMap &encryptedMediums)
+UIEncryptionDataTable::UIEncryptionDataTable(const EncryptedMediumMap &encryptedMediums)
     : m_encryptedMediums(encryptedMediums)
     , m_pModelEncryptionData(0)
@@ -374 +374 @@
 }
 
-UIAddDiskEncryptionPasswordDialog::UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const EncryptedMediumsMap &encryptedMediums)
+UIAddDiskEncryptionPasswordDialog::UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const EncryptedMediumMap &encryptedMediums)
     : QIWithRetranslateUI<QDialog>(pParent)
     , m_encryptedMediums(encryptedMediums)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.h

@@ -31 +31 @@
 
 /* Type definitions: */
-typedef QMultiMap<QString, QString> EncryptedMediumsMap;
+typedef QMultiMap<QString, QString> EncryptedMediumMap;
 typedef QMap<QString, QString> EncryptionPasswordsMap;
 
@@ -45 +45 @@
       * @param pParent          being passed to the base-class,
       * @param encryptedMediums contains the lists of medium ids (values) encrypted with passwords with ids (keys). */
-    UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const EncryptedMediumsMap &encryptedMediums);
+    UIAddDiskEncryptionPasswordDialog(QWidget *pParent, const EncryptedMediumMap &encryptedMediums);
 
     /** Returns the shallow copy of the encryption password map
@@ -60 +60 @@
 
     /** Holds the encrypted medium map reference. */
-    const EncryptedMediumsMap &m_encryptedMediums;
+    const EncryptedMediumMap &m_encryptedMediums;
 
     /** Holds the description label instance. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -65 +65 @@
 # include "UIMedium.h"
 # include "UIExtraDataManager.h"
+# include "UIAddDiskEncryptionPasswordDialog.h"
 # ifdef Q_WS_MAC
 #  include "DockIconPreview.h"
@@ -653 +654 @@
 void UIMachineLogic::sltRuntimeError(bool fIsFatal, const QString &strErrorId, const QString &strMessage)
 {
+    /* Preprocess known runtime error types: */
+    if (strErrorId == "DrvVD_DEKMISSING")
+        return askUserForTheDiskEncryptionPasswords();
+
+    /* Show runtime error: */
     msgCenter().showRuntimeError(console(), fIsFatal, strErrorId, strMessage);
 }
@@ -2407 +2413 @@
 }
 
+void UIMachineLogic::askUserForTheDiskEncryptionPasswords()
+{
+    /* Prepare the map of the encrypted mediums: */
+    EncryptedMediumMap encryptedMediums;
+    foreach (const CMediumAttachment &attachment, machine().GetMediumAttachments())
+    {
+        /* Acquire hard-drive attachments only: */
+        if (attachment.GetType() == KDeviceType_HardDisk)
+        {
+            /* Get the attachment medium: */
+            const CMedium medium = attachment.GetMedium();
+            /* Update the map with this medium if necessary: */
+            const QString strKeyId = medium.GetProperty("CRYPT/KeyId");
+            if (!strKeyId.isEmpty())
+                encryptedMediums.insert(strKeyId, medium.GetId());
+        }
+    }
+
+    /* Ask for the disk encryption passwords if necessary: */
+    EncryptionPasswordsMap encryptionPasswords;
+    if (!encryptedMediums.isEmpty())
+    {
+        /* Create corresponding dialog: */
+        QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
+             new UIAddDiskEncryptionPasswordDialog(activeMachineWindow(), encryptedMediums);
+        /* Execute it and acquire the result: */
+        if (pDlg->exec() == QDialog::Accepted)
+            encryptionPasswords = pDlg->encryptionPasswords();
+        /* Delete dialog if still valid: */
+        if (pDlg)
+            delete pDlg;
+    }
+
+    /* Add the disk encryption passwords if necessary: */
+    if (!encryptionPasswords.isEmpty())
+    {
+        foreach (const QString &strKey, encryptionPasswords.keys())
+        {
+            console().AddDiskEncryptionPassword(strKey, encryptionPasswords.value(strKey), false);
+            if (!console().isOk())
+                msgCenter().cannotAddDiskEncryptionPassword(console());
+        }
+    }
+}
+
 int UIMachineLogic::searchMaxSnapshotIndex(const CMachine &machine,
                                            const CSnapshot &snapshot,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -336 +336 @@
     void showGlobalPreferences(const QString &strCategory = QString(), const QString &strControl = QString());
 
+    /** Asks user for the disks encryption passwords. */
+    void askUserForTheDiskEncryptionPasswords();
+
     /* Helpers: */
     static int searchMaxSnapshotIndex(const CMachine &machine, const CSnapshot &snapshot, const QString &strNameTemplate);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -44 +44 @@
 # include "UIFrameBuffer.h"
 # include "UISettingsDialogSpecific.h"
-# include "UIAddDiskEncryptionPasswordDialog.h"
 # ifdef VBOX_WITH_VIDEOHWACCEL
 #  include "VBoxFBOverlay.h"
@@ -252 +251 @@
 bool UISession::powerUp()
 {
-    /* Prepare map of the encrypted ids: */
-    EncryptedMediumsMap encryptedPasswordIds;
-    foreach (const CMediumAttachment &attachment, machine().GetMediumAttachments())
-    {
-        /* Acquire hard-drives only: */
-        if (attachment.GetType() == KDeviceType_HardDisk)
-        {
-            /* Get attachment medium: */
-            const CMedium medium = attachment.GetMedium();
-            /* Append our map if this medium has encryption: */
-            const QString strKeyId = medium.GetProperty("CRYPT/KeyId");
-            if (!strKeyId.isEmpty())
-                encryptedPasswordIds.insert(strKeyId, medium.GetId());
-        }
-    }
-    /* Ask for disk encryption passwords if necessary: */
-    EncryptionPasswordsMap encryptionPasswords;
-    if (!encryptedPasswordIds.isEmpty())
-    {
-        QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
-             new UIAddDiskEncryptionPasswordDialog(machineLogic()->activeMachineWindow(),
-                                                   encryptedPasswordIds);
-        if (pDlg->exec() == QDialog::Accepted)
-            encryptionPasswords = pDlg->encryptionPasswords();
-        if (pDlg)
-            delete pDlg;
-    }
-
     /* Power UP machine: */
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -316 +287 @@
             msgCenter().cannotStartMachine(progress, machineName());
         return false;
-    }
-
-    /* Add the disk encryption passwords: */
-    if (!encryptionPasswords.isEmpty())
-    {
-        foreach (const QString &strKey, encryptionPasswords.keys())
-        {
-            console().AddDiskEncryptionPassword(strKey, encryptionPasswords.value(strKey), true);
-            if (!console().isOk())
-                msgCenter().cannotAddDiskEncryptionPassword(console());
-        }
     }