Changeset 104618 in vbox for trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp

Timestamp:

May 13, 2024 6:51:25 PM (7 months ago)

Author:

vboxsync

Message:

Fixed potential overwriting of certificates - bugref:10310

File:

• trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp (modified) (1 diff)

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

@@ -296 +296 @@
 
         /*
-        * If TLS is not explicitely disabled then auto-generate
-        * a self-signed certificate for this VM.
-        */
-        if (mData->mapProperties["Security/Method"] != "RDP")
-        {
-            int vrc = i_generateServerCertificate();
-            if (RT_FAILURE(vrc))
+         * If TLS is not explicitly disabled and there is not an existing certificate
+         * then auto-generate a self-signed certificate for this VM.
+         */
+        Utf8Str strPath = mData->mapProperties["Security/ServerCertificate"];
+        if (aEnabled && strPath.isEmpty())
+        {
+            if (mData->mapProperties["Security/Method"] != "RDP")
             {
-                LogRel(("Failed to auto generate server key and certificate: (%Rrc)\n", vrc));
+                int vrc = i_generateServerCertificate();
+                if (RT_FAILURE(vrc))
+                {
+                    LogRel(("Failed to auto generate server key and certificate: (%Rrc)\n", vrc));
+                }
             }
         }