Changeset 94660 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Apr 21, 2022 8:38:34 AM (3 years ago)

Author:

vboxsync

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

151023

Message:

doc/manual,Main,Frontends: API changes in preparation for full VM encryption, guarded by VBOX_WITH_FULL_VM_ENCRYPTION (disabled by default) and returning a not supported error for now, bugref:9955

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -419 +419 @@
              "                                     \"TCP/Address\" - interface IP the VRDE\n"
              "                                       server will bind to\n"
-             "   --settingspw <pw>                 Specify the settings password\n"
+             "   --settingspw <pw>                 Specify the VirtualBox settings password\n"
              "   --settingspwfile <file>           Specify a file containing the\n"
-             "                                       settings password\n"
+             "                                       VirtualBox settings password\n"
+             "   --password <file>|-               Specify the VM password. Either file containing\n"
+             "                                     the VM password or \"-\" to read it from console\n"
+             "   --password-id <id>                Specify the password id for the VM password\n"
              "   -start-paused, --start-paused     Start the VM in paused state\n"
 #ifdef VBOX_WITH_RECORDING
@@ -827 +830 @@
         OPT_SETTINGSPW_FILE,
         OPT_COMMENT,
-        OPT_PAUSED
+        OPT_PAUSED,
+        OPT_VMPW,
+        OPT_VMPWID
     };
 
@@ -846 +851 @@
         { "--settingspw", OPT_SETTINGSPW, RTGETOPT_REQ_STRING },
         { "--settingspwfile", OPT_SETTINGSPW_FILE, RTGETOPT_REQ_STRING },
+        { "--password", OPT_VMPW, RTGETOPT_REQ_STRING },
+        { "--password-id", OPT_VMPWID, RTGETOPT_REQ_STRING },
 #ifdef VBOX_WITH_RECORDING
         { "-record", 'c', 0 },
@@ -866 +873 @@
     const char *pcszSettingsPw = NULL;
     const char *pcszSettingsPwFile = NULL;
+    const char *pcszVmPassword = NULL;
+    const char *pcszVmPasswordId = NULL;
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
@@ -898 +907 @@
             case OPT_SETTINGSPW_FILE:
                 pcszSettingsPwFile = ValueUnion.psz;
+                break;
+            case OPT_VMPW:
+                pcszVmPassword = ValueUnion.psz;
+                break;
+            case OPT_VMPWID:
+                pcszVmPasswordId = ValueUnion.psz;
                 break;
             case OPT_PAUSED:
@@ -1057 +1072 @@
         }
 
+        /* add VM password if required */
+        if (pcszVmPassword && pcszVmPasswordId)
+        {
+            com::Utf8Str strPassword;
+            if (!RTStrCmp(pcszVmPassword, "-"))
+            {
+                /* Get password from console. */
+                RTEXITCODE rcExit = readPasswordFromConsole(&strPassword, "Enter the password:");
+                if (rcExit == RTEXITCODE_FAILURE)
+                    break;
+            }
+            else
+            {
+                RTEXITCODE rcExit = readPasswordFile(pcszVmPassword, &strPassword);
+                if (rcExit != RTEXITCODE_SUCCESS)
+                    break;
+            }
+            CHECK_ERROR_BREAK(m, AddEncryptionPassword(Bstr(pcszVmPasswordId).raw(),
+                                                       Bstr(strPassword).raw()));
+        }
         Bstr bstrVMId;
         rc = m->COMGETTER(Id)(bstrVMId.asOutParam());