Changeset 55015 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 30, 2015 5:56:27 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Runtime UI: Disk Encryption (DE) support: Add Password dialog: Reflect status of the currently entered passwords.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIAddDiskEncryptionPasswordDialog.cpp (modified) (13 diffs)
• runtime/UIAddDiskEncryptionPasswordDialog.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsGeneral.h (modified) (1 diff)

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

@@ -31 +31 @@
 
 /* GUI includes: */
+# include "UIMedium.h"
+# include "UIIconPool.h"
+# include "VBoxGlobal.h"
 # include "QIDialogButtonBox.h"
 # include "QIWithRetranslateUI.h"
@@ -44 +47 @@
 enum UIEncryptionDataTableSection
 {
+    UIEncryptionDataTableSection_Status,
     UIEncryptionDataTableSection_Id,
     UIEncryptionDataTableSection_Password,
@@ -99 +103 @@
 
     /** Returns the shallow copy of the encryption password map instance. */
-    EncryptionPasswordsMap encryptionPasswords() const { return m_encryptionPasswords; }
+    EncryptionPasswordMap encryptionPasswords() const { return m_encryptionPasswords; }
 
     /** Returns the row count, taking optional @a parent instead of root if necessary. */
@@ -122 +126 @@
     void prepare();
 
+    /** Returns whether passed @a strPassword is valid for medium with passed @a strMediumId. */
+    bool isPasswordValid(const QString strMediumId, const QString strPassword);
+
     /** Holds the encrypted medium map reference. */
     const EncryptedMediumMap &m_encryptedMediums;
 
     /** Holds the encryption password map instance. */
-    EncryptionPasswordsMap m_encryptionPasswords;
+    EncryptionPasswordMap m_encryptionPasswords;
+    /** Holds the encryption password status map instance. */
+    EncryptionPasswordStatusMap m_encryptionPasswordStatus;
 };
 
@@ -144 +153 @@
     /** Returns the shallow copy of the encryption password map
       * acquired from the UIEncryptionDataModel instance. */
-    EncryptionPasswordsMap encryptionPasswords() const;
+    EncryptionPasswordMap encryptionPasswords() const;
 
 private:
@@ -211 +220 @@
     switch (index.column())
     {
+        case UIEncryptionDataTableSection_Status:   return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
         case UIEncryptionDataTableSection_Id:       return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
         case UIEncryptionDataTableSection_Password: return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
@@ -227 +237 @@
     switch (iSection)
     {
-        case UIEncryptionDataTableSection_Id:       return tr("Password ID");
-        case UIEncryptionDataTableSection_Password: return tr("Password");
+        case UIEncryptionDataTableSection_Status:   return tr("Status", "password table field");
+        case UIEncryptionDataTableSection_Id:       return tr("ID", "password table field");
+        case UIEncryptionDataTableSection_Password: return tr("Password", "password table field");
         default: break;
     }
@@ -243 +254 @@
     switch (iRole)
     {
+        case Qt::DecorationRole:
+        {
+            /* Depending on column index: */
+            switch (index.column())
+            {
+                case UIEncryptionDataTableSection_Status:
+                    return m_encryptionPasswordStatus.value(m_encryptionPasswordStatus.keys().at(index.row())) ?
+                           UIIconPool::iconSet(":/status_check_16px.png") : UIIconPool::iconSet(":/status_error_16px.png");
+                default:
+                    return QVariant();
+            }
+            break;
+        }
         case Qt::DisplayRole:
         {
@@ -312 +336 @@
     switch (index.column())
     {
-        case UIEncryptionDataTableSection_Password: m_encryptionPasswords[m_encryptionPasswords.keys().at(index.row())] = value.toString(); break;
-        default: break;
+        case UIEncryptionDataTableSection_Password:
+        {
+            /* Update password: */
+            const int iRow = index.row();
+            const QString strPassword = value.toString();
+            const QString strKey = m_encryptionPasswords.keys().at(iRow);
+            m_encryptionPasswords[strKey] = strPassword;
+            /* Update password status: */
+            const QString strMediumId = m_encryptedMediums.values(strKey).first();
+            const bool fPasswordStatus = isPasswordValid(strMediumId, strPassword);
+            m_encryptionPasswordStatus[strKey] = fPasswordStatus;
+            /* Initiate explicit password status update: */
+            const QModelIndex statusIndex = createIndex(iRow, UIEncryptionDataTableSection_Status);
+            emit dataChanged(statusIndex, statusIndex);
+            break;
+        }
+        default:
+            break;
     }
     /* Nothing to set by default: */
@@ -321 +361 @@
 void UIEncryptionDataModel::prepare()
 {
-    /* Populate the map of passwords. */
+    /* Populate the map of passwords and statuses. */
     foreach (const QString &strPasswordId, m_encryptedMediums.keys())
+    {
         m_encryptionPasswords.insert(strPasswordId, QString());
+        m_encryptionPasswordStatus.insert(strPasswordId, false);
+    }
+}
+
+bool UIEncryptionDataModel::isPasswordValid(const QString strMediumId, const QString strPassword)
+{
+    /* Look for the medium with passed ID: */
+    const UIMedium uimedium = vboxGlobal().medium(strMediumId);
+    if (!uimedium.isNull())
+    {
+        /* Check wrapped medium for validity: */
+        const CMedium medium = uimedium.medium();
+        if (!medium.isNull())
+        {
+            /* Check whether the password is suitable for that medium. */
+            medium.CheckEncryptionPassword(strPassword);
+            return medium.isOk();
+        }
+    }
+    /* False by default: */
+    return false;
 }
 
@@ -334 +396 @@
 }
 
-EncryptionPasswordsMap UIEncryptionDataTable::encryptionPasswords() const
-{
-    AssertPtrReturn(m_pModelEncryptionData, EncryptionPasswordsMap());
+EncryptionPasswordMap UIEncryptionDataTable::encryptionPasswords() const
+{
+    AssertPtrReturn(m_pModelEncryptionData, EncryptionPasswordMap());
     return m_pModelEncryptionData->encryptionPasswords();
 }
@@ -384 +446 @@
     verticalHeader()->setDefaultSectionSize((int)(verticalHeader()->minimumSectionSize() * 1.33));
     horizontalHeader()->setStretchLastSection(false);
+    horizontalHeader()->setResizeMode(UIEncryptionDataTableSection_Status, QHeaderView::ResizeToContents);
     horizontalHeader()->setResizeMode(UIEncryptionDataTableSection_Id, QHeaderView::Interactive);
     horizontalHeader()->setResizeMode(UIEncryptionDataTableSection_Password, QHeaderView::Stretch);
@@ -403 +466 @@
 }
 
-EncryptionPasswordsMap UIAddDiskEncryptionPasswordDialog::encryptionPasswords() const
-{
-    AssertPtrReturn(m_pTableEncryptionData, EncryptionPasswordsMap());
+EncryptionPasswordMap UIAddDiskEncryptionPasswordDialog::encryptionPasswords() const
+{
+    AssertPtrReturn(m_pTableEncryptionData, EncryptionPasswordMap());
     return m_pTableEncryptionData->encryptionPasswords();
 }

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

@@ -32 +32 @@
 /* Type definitions: */
 typedef QMultiMap<QString, QString> EncryptedMediumMap;
-typedef QMap<QString, QString> EncryptionPasswordsMap;
+typedef QMap<QString, QString> EncryptionPasswordMap;
+typedef QMap<QString, bool> EncryptionPasswordStatusMap;
 
 /** QDialog reimplementation used to
@@ -50 +51 @@
     /** Returns the shallow copy of the encryption password map
       * acquired from the UIEncryptionDataTable instance. */
-    EncryptionPasswordsMap encryptionPasswords() const;
+    EncryptionPasswordMap encryptionPasswords() const;
 
 private:

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

@@ -2437 +2437 @@
 
     /* Ask for the disk encryption passwords if necessary: */
-    EncryptionPasswordsMap encryptionPasswords;
+    EncryptionPasswordMap encryptionPasswords;
     if (!encryptedMediums.isEmpty())
     {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -314 +314 @@
                 /* Get the maps of encrypted mediums and their passwords: */
                 const EncryptedMediumMap &encryptedMedium = generalData.m_encryptedMediums;
-                const EncryptionPasswordsMap &encryptionPasswords = generalData.m_encryptionPasswords;
+                const EncryptionPasswordMap &encryptionPasswords = generalData.m_encryptionPasswords;
                 /* Enumerate attachments: */
                 foreach (const CMediumAttachment &attachment, m_machine.GetMediumAttachments())

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -92 +92 @@
     EncryptedMediumMap m_encryptedMediums;
     /** Holds the encryption passwords. */
-    EncryptionPasswordsMap m_encryptionPasswords;
+    EncryptionPasswordMap m_encryptionPasswords;
 };
 typedef UISettingsCache<UIDataSettingsMachineGeneral> UICacheSettingsMachineGeneral;