Changeset 106164 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 26, 2024 10:42:10 AM (4 months ago)

Author:

vboxsync

Message:

Main/VRDEServerImpl.cpp: Don't overwrite the 'NEGOTIATE' security method. Use case insenitive compare for the method like we do in the server code. Removed unnecessary rollbacks on i_generateServerCertificate failure (since it won't fail after mData.backup()). bugref:10310

File:

• trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp

@@ -279 +279 @@
  * Klaus, some settings saving input required here!
  */
-        mData->mapProperties["Security/Method"] = Utf8Str("TLS");
+        if (!mData->mapProperties["Security/Method"].equalsIgnoreCase("NEGOTIATE"))
+            mData->mapProperties["Security/Method"] = Utf8Str("TLS");
         mData->mapProperties["Security/ServerCertificate"] = strServerCertificate;
         mData->mapProperties["Security/ServerPrivateKey"] = strServerPrivateKey;
@@ -297 +298 @@
 HRESULT VRDEServer::i_certificateRepair(BOOL &certificateGenerated)
 {
-    if (mData->mapProperties["Security/Method"] != "RDP" || mData->mapProperties["Security/Method"] != "None")
+    if (   !mData->mapProperties["Security/Method"].equalsIgnoreCase("RDP")
+        && !mData->mapProperties["Security/Method"].equalsIgnoreCase("None"))
     {
         Utf8Str strServerCertificate(VRDE_AUTO_GENENERATED_CERT_FILENAME);
@@ -347 +349 @@
                 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
                 mData.backup();
-                mData->mapProperties["Security/Method"] = Utf8Str("TLS");
+                if (!mData->mapProperties["Security/Method"].equalsIgnoreCase("NEGOTIATE"))
+                    mData->mapProperties["Security/Method"] = Utf8Str("TLS");
                 mData->mapProperties["Security/ServerCertificate"] = strServerCertificate;
                 mData->mapProperties["Security/ServerPrivateKey"] = strServerPrivateKey;
@@ -368 +371 @@
                 vrc = i_generateServerCertificate();
                 if (RT_FAILURE(vrc))
-                {
-                    i_rollback();
                     return setError(VBOX_E_IPRT_ERROR, tr("Failed to auto generate server key and certificate: (%Rrc)\n"), vrc);
-                }
                 certificateGenerated = true;
             }
@@ -385 +385 @@
             vrc = i_generateServerCertificate();
             if (RT_FAILURE(vrc))
-            {
-                i_rollback();
                 return setError(VBOX_E_IPRT_ERROR, tr("Failed to auto generate server key and certificate: (%Rrc)\n"), vrc);
-            }
             certificateGenerated = true;
         }
@@ -398 +395 @@
             vrc = i_generateServerCertificate();
             if (RT_FAILURE(vrc))
-            {
-                i_rollback();
                 return setError(VBOX_E_IPRT_ERROR, tr("Failed to auto generate server key and certificate: (%Rrc)\n"), vrc);
-            }
             certificateGenerated = true;
         }
@@ -418 +412 @@
                 vrc = i_generateServerCertificate();
                 if (RT_FAILURE(vrc))
-                {
-                    i_rollback();
                     return setError(VBOX_E_IPRT_ERROR, tr("Failed to auto generate server key and certificate: (%Rrc)\n"), vrc);
-                }
                 certificateGenerated = true;
             }