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

Timestamp:

Nov 10, 2020 11:11:14 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: VirtualBox Manager: A bit of validation for public key loading stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)

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

@@ -1035 +1035 @@
 }
 
-void UIMessageCenter::cannotOpenPublicKeyFile(const QString &strPath, QWidget *pParent /* = 0 */) const
+void UIMessageCenter::cannotCreateConsoleConnection(const CCloudMachine &comMachine, QWidget *pParent /* = 0 */)
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to create console connection for cloud machine <b>%1</b>.")
+             .arg(CCloudMachine(comMachine).GetName()),
+          UIErrorString::formatErrorInfo(comMachine));
+}
+
+void UIMessageCenter::cannotCreateConsoleConnection(const CProgress &comProgress, const QString &strMachineName, QWidget *pParent /* = 0 */)
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to create console connection for cloud machine <b>%1</b>.")
+             .arg(strMachineName),
+          UIErrorString::formatErrorInfo(comProgress));
+}
+
+void UIMessageCenter::cannotDeleteConsoleConnection(const CCloudMachine &comMachine, QWidget *pParent /* = 0 */)
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to delete console connection for cloud machine <b>%1</b>.")
+             .arg(CCloudMachine(comMachine).GetName()),
+          UIErrorString::formatErrorInfo(comMachine));
+}
+
+void UIMessageCenter::cannotDeleteConsoleConnection(const CProgress &comProgress, const QString &strMachineName, QWidget *pParent /* = 0 */)
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to delete console connection for cloud machine <b>%1</b>.")
+             .arg(strMachineName),
+          UIErrorString::formatErrorInfo(comProgress));
+}
+
+void UIMessageCenter::publicKeyFilePathIsEmpty(QWidget *pParent /* = 0 */) const
+{
+    alert(pParent, MessageType_Error,
+          tr("Public key file path is empty."));
+}
+
+void UIMessageCenter::publicKeyFileIsntReadable(const QString &strPath, QWidget *pParent /* = 0 */) const
 {
     alert(pParent, MessageType_Error,
           tr("Failed to open the public key file <nobr><b>%1</b></nobr>. Check file permissions.")
              .arg(strPath));
-}
-
-void UIMessageCenter::cannotCreateConsoleConnection(const CCloudMachine &comMachine, QWidget *pParent /* = 0 */)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to create console connection for cloud machine <b>%1</b>.")
-             .arg(CCloudMachine(comMachine).GetName()),
-          UIErrorString::formatErrorInfo(comMachine));
-}
-
-void UIMessageCenter::cannotCreateConsoleConnection(const CProgress &comProgress, const QString &strMachineName, QWidget *pParent /* = 0 */)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to create console connection for cloud machine <b>%1</b>.")
-             .arg(strMachineName),
-          UIErrorString::formatErrorInfo(comProgress));
-}
-
-void UIMessageCenter::cannotDeleteConsoleConnection(const CCloudMachine &comMachine, QWidget *pParent /* = 0 */)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to delete console connection for cloud machine <b>%1</b>.")
-             .arg(CCloudMachine(comMachine).GetName()),
-          UIErrorString::formatErrorInfo(comMachine));
-}
-
-void UIMessageCenter::cannotDeleteConsoleConnection(const CProgress &comProgress, const QString &strMachineName, QWidget *pParent /* = 0 */)
-{
-    error(pParent, MessageType_Error,
-          tr("Failed to delete console connection for cloud machine <b>%1</b>.")
-             .arg(strMachineName),
-          UIErrorString::formatErrorInfo(comProgress));
 }
 

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

@@ -305 +305 @@
     void cannotMoveMachine(const CMachine &machine, QWidget *pParent = 0) const;
     void cannotMoveMachine(const CProgress &progress, const QString &strMachineName, QWidget *pParent = 0) const;
-    void cannotOpenPublicKeyFile(const QString &strPath, QWidget *pParent = 0) const;
     void cannotCreateConsoleConnection(const CCloudMachine &comMachine, QWidget *pParent = 0);
     void cannotCreateConsoleConnection(const CProgress &comProgress, const QString &strMachineName, QWidget *pParent = 0);
     void cannotDeleteConsoleConnection(const CCloudMachine &comMachine, QWidget *pParent = 0);
     void cannotDeleteConsoleConnection(const CProgress &comProgress, const QString &strMachineName, QWidget *pParent = 0);
+    void publicKeyFilePathIsEmpty(QWidget *pParent = 0) const;
+    void publicKeyFileIsntReadable(const QString &strPath, QWidget *pParent = 0) const;
 
     /* API: Snapshot warnings: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -136 +136 @@
     void prepare();
 
-    /** Loads file contents. */
-    void loadFileContents(const QString &strPath, bool fIgnoreErrors = false);
+    /** Loads file contents.
+      * @returns Whether file was really loaded. */
+    bool loadFileContents(const QString &strPath, bool fIgnoreErrors = false);
 
     /** Holds the text-editor instance. */
@@ -235 +236 @@
 }
 
-void UIAcquirePublicKeyDialog::loadFileContents(const QString &strPath, bool fIgnoreErrors /* = false */)
-{
+bool UIAcquirePublicKeyDialog::loadFileContents(const QString &strPath, bool fIgnoreErrors /* = false */)
+{
+    /* Make sure file path isn't empty: */
     if (strPath.isEmpty())
-        return;
+    {
+        if (!fIgnoreErrors)
+            msgCenter().publicKeyFilePathIsEmpty();
+        return false;
+    }
+
+    /* Make sure file can be opened: */
     QFile file(strPath);
-    if (file.open(QIODevice::ReadOnly))
-        m_pTextEditor->setPlainText(file.readAll());
-    else if (!fIgnoreErrors)
-        msgCenter().cannotOpenPublicKeyFile(strPath);
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        if (!fIgnoreErrors)
+            msgCenter().publicKeyFileIsntReadable(strPath);
+        return false;
+    }
+
+    /* File opened and read, filling editor: */
+    m_pTextEditor->setPlainText(file.readAll());
+    return true;
 }