Changeset 55509 in vbox for trunk/src/VBox

Timestamp:

Apr 29, 2015 9:16:18 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Disk Encryption (DE) support for Export Appliance wizard.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1681 +1681 @@
 }
 
+void UIMessageCenter::cannotAddDiskEncryptionPassword(const CAppliance &appliance, QWidget *pParent /* = 0 */)
+{
+    error(pParent, MessageType_Error,
+          tr("Bad password or authentication failure."),
+          formatErrorInfo(appliance));
+}
+
 void UIMessageCenter::showRuntimeError(const CConsole &console, bool fFatal, const QString &strErrorId, const QString &strErrorMsg) const
 {
@@ -2086 +2093 @@
 {
     error(0, MessageType_Error,
-          tr("Unable to enter password!"),
+          tr("Bad password or authentication failure."),
           formatErrorInfo(console));
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -280 +280 @@
     void cannotExportAppliance(const CProgress &progress, const QString &strPath, QWidget *pParent = 0) const;
     void cannotFindSnapshotByName(const CMachine &machine, const QString &strMachine, QWidget *pParent = 0) const;
+    void cannotAddDiskEncryptionPassword(const CAppliance &appliance, QWidget *pParent = 0);
 
     /* API: Runtime UI warnings: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -32 +32 @@
 # include "UIWizardExportAppPageBasic4.h"
 # include "UIWizardExportAppPageExpert.h"
+# include "UIAddDiskEncryptionPasswordDialog.h"
 # include "UIMessageCenter.h"
 
@@ -132 +133 @@
 bool UIWizardExportApp::exportVMs(CAppliance &appliance)
 {
+    /* Get the map of the password IDs: */
+    EncryptedMediumMap encryptedMediums;
+    foreach (const QString &strPasswordId, appliance.GetPasswordIds())
+        foreach (const QString &strMediumId, appliance.GetMediumIdsForPasswordId(strPasswordId))
+            encryptedMediums.insert(strPasswordId, strMediumId);
+
+    /* Ask for the disk encryption passwords if necessary: */
+    if (!encryptedMediums.isEmpty())
+    {
+        /* Create corresponding dialog: */
+        QPointer<UIAddDiskEncryptionPasswordDialog> pDlg =
+             new UIAddDiskEncryptionPasswordDialog(this,
+                                                   window()->windowTitle(),
+                                                   encryptedMediums);
+
+        /* Execute the dialog: */
+        if (pDlg->exec() == QDialog::Accepted)
+        {
+            /* Acquire the passwords provided: */
+            const EncryptionPasswordMap encryptionPasswords = pDlg->encryptionPasswords();
+
+            /* Delete the dialog: */
+            delete pDlg;
+
+            /* Make sure the passwords were really provided: */
+            AssertReturn(!encryptionPasswords.isEmpty(), false);
+
+            /* Provide appliance with passwords if possible: */
+            appliance.AddPasswords(encryptionPasswords.keys().toVector(),
+                                   encryptionPasswords.values().toVector());
+            if (!appliance.isOk())
+            {
+                /* Warn the user about failure: */
+                msgCenter().cannotAddDiskEncryptionPassword(appliance);
+
+                return false;
+            }
+        }
+        else
+        {
+            /* Any modal dialog can be destroyed in own event-loop
+             * as a part of application termination procedure..
+             * We have to check if the dialog still valid. */
+            if (pDlg)
+            {
+                /* Delete the dialog: */
+                delete pDlg;
+            }
+
+            return false;
+        }
+    }
+
     /* Write the appliance: */
     QVector<KExportOptions> options;