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

Timestamp:

Mar 2, 2015 7:55:29 PM (10 years ago)

Author:

vboxsync

Message:

Add support to supply passwords for disk encryption while the VM is running

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageDisk.cpp (modified) (5 diffs)
• VBoxManageHelp.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -1679 +1679 @@
                 break;
             }
-
+        }
+        else if (!strcmp(a->argv[1], "addencpassword"))
+        {
+            if (   a->argc != 4
+                && a->argc != 6)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                break;
+            }
+
+            if (   strcmp(a->argv[4], "--removeonsuspend")
+                || (   strcmp(a->argv[5], "yes")
+                    && strcmp(a->argv[5], "no")))
+            {
+                errorSyntax(USAGE_CONTROLVM, "Invalid parameters");
+                break;
+            }
+
+            BOOL fRemoveOnSuspend = FALSE;
+            Bstr bstrPwId(a->argv[2]);
+            Bstr bstrPw(a->argv[3]);
+            if (   a->argc == 6
+                && !strcmp(a->argv[5], "yes"))
+                fRemoveOnSuspend = TRUE;
+
+            CHECK_ERROR_BREAK(console, AddDiskEncryptionPassword(bstrPwId.raw(), bstrPw.raw(), fRemoveOnSuspend));
+        }
+        else if (!strcmp(a->argv[1], "removeencpassword"))
+        {
+            if (a->argc != 3)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                break;
+            }
+            Bstr bstrPwId(a->argv[2]);
+            CHECK_ERROR_BREAK(console, RemoveDiskEncryptionPassword(bstrPwId.raw()));
+        }
+        else if (!strcmp(a->argv[1], "removeallencpasswords"))
+        {
+            CHECK_ERROR_BREAK(console, ClearAllDiskEncryptionPasswords());
         }
         else

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -1641 +1641 @@
 static const RTGETOPTDEF g_aEncryptMediumOptions[] =
 {
-    { "--newpassword",  'n', RTGETOPT_REQ_STRING },
-    { "--oldpassword",  'o', RTGETOPT_REQ_STRING },
-    { "--cipher",       'c', RTGETOPT_REQ_STRING }
+    { "--newpassword",   'n', RTGETOPT_REQ_STRING },
+    { "--oldpassword",   'o', RTGETOPT_REQ_STRING },
+    { "--cipher",        'c', RTGETOPT_REQ_STRING },
+    { "--newpasswordid", 'i', RTGETOPT_REQ_STRING }
 };
 
@@ -1655 +1656 @@
     const char *pszCipher = NULL;
     const char *pszFilenameOrUuid = NULL;
+    const char *pszNewPasswordId = NULL;
 
     int c;
@@ -1676 +1678 @@
             case 'c':   // --cipher
                 pszCipher = ValueUnion.psz;
+                break;
+
+            case 'i':   // --newpasswordid
+                pszNewPasswordId = ValueUnion.psz;
                 break;
 
@@ -1708 +1714 @@
         return errorSyntax(USAGE_ENCRYPTMEDIUM, "No password specified");
 
+    if (   (pszPasswordNew && !pszNewPasswordId)
+        || (!pszPasswordNew && pszNewPasswordId))
+        return errorSyntax(USAGE_ENCRYPTMEDIUM, "A new password must always have a valid identifier set at the same time");
+
     /* Always open the medium if necessary, there is no other way. */
     rc = openMedium(a, pszFilenameOrUuid, DeviceType_HardDisk,
@@ -1722 +1732 @@
     ComPtr<IProgress> progress;
     CHECK_ERROR(hardDisk, ChangeEncryption(Bstr(pszPasswordNew).raw(), Bstr(pszPasswordOld).raw(),
-                                           Bstr(pszCipher).raw(), progress.asOutParam()));
+                                           Bstr(pszCipher).raw(), Bstr(pszNewPasswordId).raw(),
+                                           progress.asOutParam()));
     if (SUCCEEDED(rc))
         rc = showProgress(progress);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -495 +495 @@
                      "                            cpuexecutioncap <1-100>\n"
                      "                            webcam <attach [path [settings]]> | <detach [path]> | <list>\n"
+                     "                            addencpassword <id>\n"
+                     "                                           <password>\n"
+                     "                                           [--removeonsuspend <yes|no>]\n"
+                     "                            removeencpassword <id>\n"
+                     "                            removeallencpasswords\n"
                      "\n", SEP);
     }
@@ -637 +642 @@
                      "                            [--oldpassword <old password>]\n"
                      "                            [--cipher <cipher identifier>]\n"
+                     "                            [--newpasswordid <password identifier>]\n"
                      "\n", SEP);