Changeset 96967 in vbox

Timestamp:

Oct 3, 2022 1:17:31 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153888

Message:

FE/Qt: bugref:10293: Machine settings / System page: A possibility to manually reset secure boot keys to default.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/editors/UIMotherboardFeaturesEditor.cpp (modified) (8 diffs)
• settings/editors/UIMotherboardFeaturesEditor.h (modified) (4 diffs)
• settings/machine/UIMachineSettingsSystem.cpp (modified) (7 diffs)

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

@@ -858 +858 @@
 }
 
-bool UIMessageCenter::confirmCancelingPortForwardingDialog(QWidget *pParent /* = 0*/) const
+bool UIMessageCenter::confirmCancelingPortForwardingDialog(QWidget *pParent /* = 0 */) const
 {
     return questionBinary(pParent, MessageType_Question,
                           tr("<p>There are unsaved changes in the port forwarding configuration.</p>"
                              "<p>If you proceed your changes will be discarded.</p>"),
+                          0 /* auto-confirm id */,
+                          QString() /* ok button text */,
+                          QString() /* cancel button text */,
+                          false /* ok button by default? */);
+}
+
+bool UIMessageCenter::confirmRestoringDefaultKeys(QWidget *pParent /* = 0 */) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>Are you going to restore default secure boot keys.</p>"
+                             "<p>If you proceed your current keys will be rewritten. "
+                             "You may not be able to boot affected VM anymore.</p>"),
                           0 /* auto-confirm id */,
                           QString() /* ok button text */,

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

@@ -317 +317 @@
         bool warnAboutRulesConflict(QWidget *pParent = 0) const;
         bool confirmCancelingPortForwardingDialog(QWidget *pParent = 0) const;
+        bool confirmRestoringDefaultKeys(QWidget *pParent = 0) const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.cpp

@@ -30 +30 @@
 #include <QGridLayout>
 #include <QLabel>
+#include <QPushButton>
 
 /* GUI includes: */
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
 #include "UIMotherboardFeaturesEditor.h"
 
@@ -46 +49 @@
     , m_pCheckBoxEnableEfi(0)
     , m_pCheckBoxEnableSecureBoot(0)
+    , m_pPushButtonResetSecureBoot(0)
 {
     prepare();
@@ -124 +128 @@
            ? m_pCheckBoxEnableSecureBoot->checkState() == Qt::Checked
            : m_fEnableSecureBoot;
+}
+
+bool UIMotherboardFeaturesEditor::isResetSecureBoot() const
+{
+    return   m_pPushButtonResetSecureBoot
+           ? m_pPushButtonResetSecureBoot->property("clicked_once").toBool()
+           : false;
 }
 
@@ -166 +177 @@
         m_pCheckBoxEnableSecureBoot->setToolTip(tr("When checked, the secure boot emulation will be enabled."));
     }
+    if (m_pPushButtonResetSecureBoot)
+    {
+        m_pPushButtonResetSecureBoot->setText(tr("&Reset Keys to Default"));
+        m_pPushButtonResetSecureBoot->setToolTip(tr("Resets secure boot keys to default."));
+    }
 }
 
@@ -171 +187 @@
 {
     /* Acquire actual feature state: */
-    const bool fOn = m_pCheckBoxEnableEfi ? m_pCheckBoxEnableEfi->isChecked() : false;
+    const bool fOn = m_pCheckBoxEnableEfi
+                   ? m_pCheckBoxEnableEfi->isChecked()
+                   : false;
 
     /* Update corresponding controls: */
@@ -179 +197 @@
     /* Notify listeners: */
     emit sigChangedEfi();
+    sltHandleEnableSecureBootToggling();
+}
+
+void UIMotherboardFeaturesEditor::sltHandleEnableSecureBootToggling()
+{
+    /* Acquire actual feature state: */
+    const bool fOn =    m_pCheckBoxEnableEfi
+                     && m_pCheckBoxEnableSecureBoot
+                     && m_pPushButtonResetSecureBoot
+                   ?    m_pCheckBoxEnableEfi->isChecked()
+                     && m_pCheckBoxEnableSecureBoot->isChecked()
+                     && !m_pPushButtonResetSecureBoot->property("clicked_once").toBool()
+                   : false;
+
+    /* Update corresponding controls: */
+    if (m_pPushButtonResetSecureBoot)
+        m_pPushButtonResetSecureBoot->setEnabled(fOn);
+
+    /* Notify listeners: */
+    emit sigChangedSecureBoot();
+}
+
+void UIMotherboardFeaturesEditor::sltResetSecureBoot()
+{
+    if (!m_pPushButtonResetSecureBoot->property("clicked_once").toBool())
+    {
+        if (msgCenter().confirmRestoringDefaultKeys())
+        {
+            m_pPushButtonResetSecureBoot->setProperty("clicked_once", true);
+            sltHandleEnableSecureBootToggling();
+        }
+    }
 }
 
@@ -226 +276 @@
         {
             connect(m_pCheckBoxEnableSecureBoot, &QCheckBox::stateChanged,
-                    this, &UIMotherboardFeaturesEditor::sigChangedSecureBoot);
+                    this, &UIMotherboardFeaturesEditor::sltHandleEnableSecureBootToggling);
             m_pLayout->addWidget(m_pCheckBoxEnableSecureBoot, 3, 1);
+        }
+        /* Prepare 'reset secure boot' tool-button: */
+        m_pPushButtonResetSecureBoot = new QPushButton(this);
+        if (m_pPushButtonResetSecureBoot)
+        {
+            m_pPushButtonResetSecureBoot->setIcon(UIIconPool::iconSet(":/refresh_16px"));
+            connect(m_pPushButtonResetSecureBoot, &QPushButton::clicked,
+                    this, &UIMotherboardFeaturesEditor::sltResetSecureBoot);
+            m_pLayout->addWidget(m_pPushButtonResetSecureBoot, 4, 1);
         }
     }
@@ -233 +292 @@
     /* Fetch states: */
     sltHandleEnableEfiToggling();
+    sltHandleEnableSecureBootToggling();
 
     /* Apply language settings: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMotherboardFeaturesEditor.h

@@ -39 +39 @@
 class QGridLayout;
 class QLabel;
+class QPushButton;
 
 /** QWidget subclass used as motherboard features editor. */
@@ -81 +82 @@
     bool isEnabledSecureBoot() const;
 
+    /** Returns 'reset to default secure boot keys' feature value. */
+    bool isResetSecureBoot() const;
+
     /** Returns minimum layout hint. */
     int minimumLabelHorizontalHint() const;
@@ -95 +99 @@
     /** Handles 'enable EFI' feature being toggled. */
     void sltHandleEnableEfiToggling();
+    /** Handles 'enable secure boot' feature being toggled. */
+    void sltHandleEnableSecureBootToggling();
+
+    /** Marks corresponding push button activated. */
+    void sltResetSecureBoot();
 
 private:
@@ -116 +125 @@
      * @{ */
         /** Holds the main layout instance. */
-        QGridLayout *m_pLayout;
+        QGridLayout  *m_pLayout;
         /** Holds the label instance. */
-        QLabel      *m_pLabel;
+        QLabel       *m_pLabel;
         /** Holds the 'enable IO APIC' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableIoApic;
+        QCheckBox    *m_pCheckBoxEnableIoApic;
         /** Holds the 'enable UTC time' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableUtcTime;
+        QCheckBox    *m_pCheckBoxEnableUtcTime;
         /** Holds the 'enable EFI' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableEfi;
-        /** Holds the 'enable secure boot' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableSecureBoot;
+        QCheckBox    *m_pCheckBoxEnableEfi;
+        /** Holds the 'secure boot' check-box instance. */
+        QCheckBox    *m_pCheckBoxEnableSecureBoot;
+        /** Holds the 'secure boot' tool-button instance. */
+        QPushButton  *m_pPushButtonResetSecureBoot;
     /** @} */
 };

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

@@ -75 +75 @@
         , m_fAvailableSecureBoot(false)
         , m_fEnabledSecureBoot(false)
+        , m_fResetSecureBoot(false)
         /* CPU data: */
         , m_cCPUCount(-1)
@@ -106 +107 @@
                && (m_fAvailableSecureBoot == other.m_fAvailableSecureBoot)
                && (m_fEnabledSecureBoot == other.m_fEnabledSecureBoot)
+               && (m_fResetSecureBoot == other.m_fResetSecureBoot)
                /* CPU data: */
                && (m_cCPUCount == other.m_cCPUCount)
@@ -152 +154 @@
     /** Holds whether the secure boot is enabled. */
     bool                m_fEnabledSecureBoot;
+    /** Holds whether the secure boot is reseted. */
+    bool                m_fResetSecureBoot;
 
     /** Holds the CPU count. */
@@ -295 +299 @@
                                        ? comStoreLvl2.GetSecureBootEnabled()
                                        : false;
+    oldSystemData.m_fResetSecureBoot = false;
 
     /* Gather old 'Processor' data: */
@@ -409 +414 @@
         newSystemData.m_fAvailableSecureBoot = m_pCache->base().m_fAvailableSecureBoot;
         newSystemData.m_fEnabledSecureBoot = m_pEditorMotherboardFeatures->isEnabledSecureBoot();
+        newSystemData.m_fResetSecureBoot = m_pEditorMotherboardFeatures->isResetSecureBoot();
     }
 
@@ -998 +1004 @@
         }
         /* Save whether secure boot is enabled: */
-        if (fSuccess && isMachineOffline() && newSystemData.m_fEnabledSecureBoot != oldSystemData.m_fEnabledSecureBoot)
+        if (   fSuccess && isMachineOffline()
+            && (   newSystemData.m_fEnabledSecureBoot != oldSystemData.m_fEnabledSecureBoot
+                || newSystemData.m_fResetSecureBoot != oldSystemData.m_fResetSecureBoot))
         {
             CNvramStore comStoreLvl1 = m_machine.GetNonVolatileStore();
@@ -1007 +1015 @@
                 && newSystemData.m_fEnabledEFI)
             {
-                /* Secure boot was NOT available? */
-                if (!newSystemData.m_fAvailableSecureBoot)
+                /* Secure boot was NOT available
+                 * or requested to be reseted: */
+                if (   !newSystemData.m_fAvailableSecureBoot
+                    || newSystemData.m_fResetSecureBoot)
                 {
-                    /* Init and enroll everything: */
-                    comStoreLvl1.InitUefiVariableStore(0);
+                    /* Init if required: */
+                    if (!newSystemData.m_fAvailableSecureBoot)
+                        comStoreLvl1.InitUefiVariableStore(0);
+                    /* Enroll everything: */
                     comStoreLvl2 = comStoreLvl1.GetUefiVariableStore();
                     comStoreLvl2.EnrollOraclePlatformKey();