Changeset 106149 in vbox for trunk

Timestamp:

Sep 25, 2024 4:32:45 PM (7 months ago)

Author:

vboxsync

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

164928

Message:

FE/Qt: bugref:10310: VM Settings / Display page / Remote Display tab: Adding new field called Security Method to let user specify this VRDE property; This combo allows to choose among TLS, RDP and NEGOTIATE values.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• settings/editors/UIVRDESettingsEditor.cpp (modified) (11 diffs)
• settings/editors/UIVRDESettingsEditor.h (modified) (6 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -40 +40 @@
 #include "UISettingsDefs.h"
 #include "UITranslator.h"
+#include "UIVRDESettingsEditor.h"
 #if defined(VBOX_WS_NIX) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
 # include "UIDesktopWidgetWatchdog.h"
@@ -2904 +2905 @@
     return VMActivityOverviewColumn_Max;
 }
+
+/* QString <= UIVRDESecurityMethod: */
+template<> SHARED_LIBRARY_STUFF QString UIConverter::toString(const UIVRDESecurityMethod &enmSecurityMethod) const
+{
+    QString strResult;
+    switch (enmSecurityMethod)
+    {
+        case UIVRDESecurityMethod_TLS:       strResult = QApplication::translate("UICommon", "TLS"); break;
+        case UIVRDESecurityMethod_RDP:       strResult = QApplication::translate("UICommon", "RDP"); break;
+        case UIVRDESecurityMethod_Negotiate: strResult = QApplication::translate("UICommon", "NEGOTIATE"); break;
+        default:
+        {
+            AssertMsgFailed(("No text for security method=%d", enmSecurityMethod));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* QString <= UIVRDESecurityMethod: */
+template<> SHARED_LIBRARY_STUFF QString UIConverter::toInternalString(const UIVRDESecurityMethod &enmSecurityMethod) const
+{
+    QString strResult;
+    switch (enmSecurityMethod)
+    {
+        case UIVRDESecurityMethod_TLS:       strResult = QString(); break;
+        case UIVRDESecurityMethod_RDP:       strResult = QString("RDP"); break;
+        case UIVRDESecurityMethod_Negotiate: strResult = QString("NEGOTIATE"); break;
+        default:
+        {
+            AssertMsgFailed(("No text for security method=%d", enmSecurityMethod));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* UIVRDESecurityMethod <= QString: */
+template<> SHARED_LIBRARY_STUFF UIVRDESecurityMethod UIConverter::fromInternalString<UIVRDESecurityMethod>(const QString &strSecurityMethod) const
+{
+    if (strSecurityMethod.compare("RDP", Qt::CaseInsensitive) == 0)
+        return UIVRDESecurityMethod_RDP;
+    if (strSecurityMethod.compare("NEGOTIATE", Qt::CaseInsensitive) == 0)
+        return UIVRDESecurityMethod_Negotiate;
+    return UIVRDESecurityMethod_TLS;
+}

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

@@ -41 +41 @@
     : UIEditor(pParent)
     , m_fFeatureEnabled(false)
+    , m_enmSecurityMethod(UIVRDESecurityMethod_Max)
     , m_enmAuthType(KAuthType_Max)
     , m_fMultipleConnectionsAllowed(false)
@@ -47 +48 @@
     , m_pLabelPort(0)
     , m_pEditorPort(0)
+    , m_pLabelSecurityMethod(0)
+    , m_pComboSecurityMethod(0)
     , m_pLabelAuthMethod(0)
     , m_pComboAuthType(0)
@@ -102 +105 @@
 }
 
+void UIVRDESettingsEditor::setSecurityMethod(const UIVRDESecurityMethod &enmMethod)
+{
+    /* Update cached value and
+     * combo if value has changed: */
+    if (m_enmSecurityMethod != enmMethod)
+    {
+        m_enmSecurityMethod = enmMethod;
+        repopulateComboSecurityMethod();
+    }
+}
+
+UIVRDESecurityMethod UIVRDESettingsEditor::securityMethod() const
+{
+    return m_pComboSecurityMethod ? m_pComboSecurityMethod->currentData().value<UIVRDESecurityMethod>() : m_enmSecurityMethod;
+}
+
 void UIVRDESettingsEditor::setAuthType(const KAuthType &enmType)
 {
@@ -167 +186 @@
         m_pEditorPort->setToolTip(tr("Holds the VRDP Server port number. You may specify 0 (zero), to select port 3389, the "
                                      "standard port for RDP."));
+
+    if (m_pLabelSecurityMethod)
+        m_pLabelSecurityMethod->setText(tr("&Security Method:"));
+    if (m_pComboSecurityMethod)
+    {
+        for (int iIndex = 0; iIndex < m_pComboSecurityMethod->count(); ++iIndex)
+        {
+            const UIVRDESecurityMethod enmType = m_pComboSecurityMethod->itemData(iIndex).value<UIVRDESecurityMethod>();
+            m_pComboSecurityMethod->setItemText(iIndex, gpConverter->toString(enmType));
+        }
+        m_pComboSecurityMethod->setToolTip(tr("Selects the VRDP security method."));
+    }
 
     if (m_pLabelAuthMethod)
@@ -264 +295 @@
                 }
 
+                /* Prepare 'security method' label: */
+                m_pLabelSecurityMethod = new QLabel(m_pWidgetSettings);
+                if (m_pLabelSecurityMethod)
+                {
+                    m_pLabelSecurityMethod->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    pLayoutRemoteDisplaySettings->addWidget(m_pLabelSecurityMethod, 1, 0);
+                }
+                /* Prepare 'security method' combo: */
+                m_pComboSecurityMethod = new QComboBox(m_pWidgetSettings);
+                if (m_pComboSecurityMethod)
+                {
+                    if (m_pLabelSecurityMethod)
+                        m_pLabelSecurityMethod->setBuddy(m_pComboSecurityMethod);
+                    m_pComboSecurityMethod->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+
+                    pLayoutRemoteDisplaySettings->addWidget(m_pComboSecurityMethod, 1, 1, 1, 2);
+                }
+
                 /* Prepare 'auth type' label: */
                 m_pLabelAuthMethod = new QLabel(m_pWidgetSettings);
@@ -269 +318 @@
                 {
                     m_pLabelAuthMethod->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    pLayoutRemoteDisplaySettings->addWidget(m_pLabelAuthMethod, 1, 0);
+                    pLayoutRemoteDisplaySettings->addWidget(m_pLabelAuthMethod, 2, 0);
                 }
                 /* Prepare 'auth type' combo: */
@@ -279 +328 @@
                     m_pComboAuthType->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
-                    pLayoutRemoteDisplaySettings->addWidget(m_pComboAuthType, 1, 1, 1, 2);
+                    pLayoutRemoteDisplaySettings->addWidget(m_pComboAuthType, 2, 1, 1, 2);
                 }
 
@@ -287 +336 @@
                 {
                     m_pLabelTimeout->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    pLayoutRemoteDisplaySettings->addWidget(m_pLabelTimeout, 2, 0);
+                    pLayoutRemoteDisplaySettings->addWidget(m_pLabelTimeout, 3, 0);
                 }
                 /* Prepare 'timeout' editor: */
@@ -297 +346 @@
                     m_pEditorTimeout->setValidator(new QIntValidator(this));
 
-                    pLayoutRemoteDisplaySettings->addWidget(m_pEditorTimeout, 2, 1, 1, 2);
+                    pLayoutRemoteDisplaySettings->addWidget(m_pEditorTimeout, 3, 1, 1, 2);
                 }
 
@@ -305 +354 @@
                 {
                     m_pLabelOptions->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    pLayoutRemoteDisplaySettings->addWidget(m_pLabelOptions, 3, 0);
+                    pLayoutRemoteDisplaySettings->addWidget(m_pLabelOptions, 4, 0);
                 }
                 /* Prepare 'multiple connections' check-box: */
                 m_pCheckboxMultipleConnections = new QCheckBox(m_pWidgetSettings);
                 if (m_pCheckboxMultipleConnections)
-                    pLayoutRemoteDisplaySettings->addWidget(m_pCheckboxMultipleConnections, 3, 1);
+                    pLayoutRemoteDisplaySettings->addWidget(m_pCheckboxMultipleConnections, 4, 1);
             }
 
@@ -332 +381 @@
 }
 
+void UIVRDESettingsEditor::repopulateComboSecurityMethod()
+{
+    if (m_pComboSecurityMethod)
+    {
+        /* Clear combo first of all: */
+        m_pComboSecurityMethod->clear();
+
+        QVector<UIVRDESecurityMethod> securityMethods = QVector<UIVRDESecurityMethod>() << UIVRDESecurityMethod_TLS
+                                                                                        << UIVRDESecurityMethod_RDP
+                                                                                        << UIVRDESecurityMethod_Negotiate;
+
+        /* Take into account currently cached value: */
+        if (!securityMethods.contains(m_enmSecurityMethod))
+            securityMethods.prepend(m_enmSecurityMethod);
+
+        /* Populate combo finally: */
+        foreach (const UIVRDESecurityMethod &enmType, securityMethods)
+            m_pComboSecurityMethod->addItem(gpConverter->toString(enmType), QVariant::fromValue(enmType));
+
+        /* Look for proper index to choose: */
+        const int iIndex = m_pComboSecurityMethod->findData(QVariant::fromValue(m_enmSecurityMethod));
+        if (iIndex != -1)
+            m_pComboSecurityMethod->setCurrentIndex(iIndex);
+    }
+}
+
 void UIVRDESettingsEditor::repopulateComboAuthType()
 {

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

@@ -45 +45 @@
 class QWidget;
 
+/** VRDE Security Methods. */
+enum UIVRDESecurityMethod
+{
+    UIVRDESecurityMethod_TLS,
+    UIVRDESecurityMethod_RDP,
+    UIVRDESecurityMethod_Negotiate,
+    UIVRDESecurityMethod_Max
+};
+Q_DECLARE_METATYPE(UIVRDESecurityMethod);
+
 /** UIEditor sub-class used as a VRDE settings editor. */
 class SHARED_LIBRARY_STUFF UIVRDESettingsEditor : public UIEditor
@@ -73 +83 @@
     QString port() const;
 
+    /** Defines security @a enmMethod. */
+    void setSecurityMethod(const UIVRDESecurityMethod &enmMethod);
+    /** Returns security method. */
+    UIVRDESecurityMethod securityMethod() const;
+
     /** Defines auth @a enmType. */
     void setAuthType(const KAuthType &enmType);
@@ -87 +102 @@
     /** Returns whether multiple connections allowed. */
     bool isMultipleConnectionsAllowed() const;
-
 
 private slots:
@@ -106 +120 @@
     void prepareConnections();
 
+    /** Repopulates security method combo-box. */
+    void repopulateComboSecurityMethod();
     /** Repopulates auth type combo-box. */
     void repopulateComboAuthType();
@@ -112 +128 @@
      * @{ */
         /** Holds whether feature is enabled. */
-        bool       m_fFeatureEnabled;
+        bool                  m_fFeatureEnabled;
         /** Holds the port. */
-        QString    m_strPort;
+        QString               m_strPort;
+        /** Holds the security method. */
+        UIVRDESecurityMethod  m_enmSecurityMethod;
         /** Holds the auth type. */
-        KAuthType  m_enmAuthType;
+        KAuthType             m_enmAuthType;
         /** Holds the timeout. */
-        QString    m_strTimeout;
+        QString               m_strTimeout;
         /** Returns whether multiple connections allowed. */
-        bool       m_fMultipleConnectionsAllowed;
+        bool                  m_fMultipleConnectionsAllowed;
     /** @} */
 
@@ -133 +151 @@
         /** Holds the port editor instance. */
         QLineEdit *m_pEditorPort;
-        /** Holds the port auth method label instance. */
+        /** Holds the security method label instance. */
+        QLabel    *m_pLabelSecurityMethod;
+        /** Holds the security method combo instance. */
+        QComboBox *m_pComboSecurityMethod;
+        /** Holds the auth method label instance. */
         QLabel    *m_pLabelAuthMethod;
-        /** Holds the port auth method combo instance. */
+        /** Holds the auth method combo instance. */
         QComboBox *m_pComboAuthType;
         /** Holds the timeout label instance. */

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

@@ -74 +74 @@
         , m_fRemoteDisplayServerEnabled(false)
         , m_strRemoteDisplayPort(QString())
+        , m_remoteDisplaySecurityMethod(UIVRDESecurityMethod_Max)
         , m_remoteDisplayAuthType(KAuthType_Null)
         , m_uRemoteDisplayTimeout(0)
@@ -101 +102 @@
                && (m_fRemoteDisplayServerEnabled == other.m_fRemoteDisplayServerEnabled)
                && (m_strRemoteDisplayPort == other.m_strRemoteDisplayPort)
+               && (m_remoteDisplaySecurityMethod == other.m_remoteDisplaySecurityMethod)
                && (m_remoteDisplayAuthType == other.m_remoteDisplayAuthType)
                && (m_uRemoteDisplayTimeout == other.m_uRemoteDisplayTimeout)
@@ -269 +271 @@
     /** Holds the remote display server port. */
     QString                  m_strRemoteDisplayPort;
+    /** Holds the remote display server security method. */
+    UIVRDESecurityMethod     m_remoteDisplaySecurityMethod;
     /** Holds the remote display server auth type. */
     KAuthType                m_remoteDisplayAuthType;
@@ -412 +416 @@
         oldDisplayData.m_fRemoteDisplayServerEnabled = comVrdeServer.GetEnabled();
         oldDisplayData.m_strRemoteDisplayPort = comVrdeServer.GetVRDEProperty("TCP/Ports");
+        oldDisplayData.m_remoteDisplaySecurityMethod =
+            gpConverter->fromInternalString<UIVRDESecurityMethod>(comVrdeServer.GetVRDEProperty("Security/Method"));
         oldDisplayData.m_remoteDisplayAuthType = comVrdeServer.GetAuthType();
         oldDisplayData.m_uRemoteDisplayTimeout = comVrdeServer.GetAuthTimeout();
@@ -494 +500 @@
             m_pEditorVRDESettings->setFeatureEnabled(oldDisplayData.m_fRemoteDisplayServerEnabled);
             m_pEditorVRDESettings->setPort(oldDisplayData.m_strRemoteDisplayPort);
+            m_pEditorVRDESettings->setSecurityMethod(oldDisplayData.m_remoteDisplaySecurityMethod);
             m_pEditorVRDESettings->setAuthType(oldDisplayData.m_remoteDisplayAuthType);
             m_pEditorVRDESettings->setTimeout(QString::number(oldDisplayData.m_uRemoteDisplayTimeout));
@@ -570 +577 @@
         newDisplayData.m_fRemoteDisplayServerEnabled = m_pEditorVRDESettings->isFeatureEnabled();
         newDisplayData.m_strRemoteDisplayPort = m_pEditorVRDESettings->port();
+        newDisplayData.m_remoteDisplaySecurityMethod = m_pEditorVRDESettings->securityMethod();
         newDisplayData.m_remoteDisplayAuthType = m_pEditorVRDESettings->authType();
         newDisplayData.m_uRemoteDisplayTimeout = m_pEditorVRDESettings->timeout().toULong();
@@ -1197 +1205 @@
             {
                 comServer.SetVRDEProperty("TCP/Ports", newDisplayData.m_strRemoteDisplayPort);
+                fSuccess = comServer.isOk();
+            }
+            /* Save remote display server security method: */
+            if (fSuccess && newDisplayData.m_remoteDisplaySecurityMethod != oldDisplayData.m_remoteDisplaySecurityMethod)
+            {
+                comServer.SetVRDEProperty("Security/Method", gpConverter->toInternalString(newDisplayData.m_remoteDisplaySecurityMethod));
                 fSuccess = comServer.isOk();
             }