Changeset 55923 in vbox

Timestamp:

May 19, 2015 8:35:24 AM (10 years ago)

Author:

vboxsync

Message:

FE/VBoxManage: Don't pass the password directly on the command line, ask for it instead of let the user specify a file to read the password from

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (1 diff)

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

@@ -1699 +1699 @@
             BOOL fRemoveOnSuspend = FALSE;
             Bstr bstrPwId(a->argv[2]);
-            Bstr bstrPw(a->argv[3]);
+            Utf8Str strPassword;
+
+            if (!RTStrCmp(a->argv[3], "-"))
+            {
+                /* Get password from console. */
+                RTEXITCODE rcExit = readPasswordFromConsole(&strPassword, "Enter password:");
+                if (rcExit == RTEXITCODE_FAILURE)
+                    break;
+            }
+            else
+            {
+                RTEXITCODE rcExit = readPasswordFile(a->argv[3], &strPassword);
+                if (rcExit == RTEXITCODE_FAILURE)
+                {
+                    RTMsgError("Failed to read new password from file");
+                    break;
+                }
+            }
+
             if (   a->argc == 6
                 && !strcmp(a->argv[5], "yes"))
                 fRemoveOnSuspend = TRUE;
 
-            CHECK_ERROR_BREAK(console, AddDiskEncryptionPassword(bstrPwId.raw(), bstrPw.raw(), fRemoveOnSuspend));
+            CHECK_ERROR_BREAK(console, AddDiskEncryptionPassword(bstrPwId.raw(), Bstr(strPassword).raw(), fRemoveOnSuspend));
         }
         else if (!strcmp(a->argv[1], "removeencpassword"))

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

@@ -499 +499 @@
                      "                            webcam <attach [path [settings]]> | <detach [path]> | <list>\n"
                      "                            addencpassword <id>\n"
-                     "                                           <password>\n"
+                     "                                           <password file>|-\n"
                      "                                           [--removeonsuspend <yes|no>]\n"
                      "                            removeencpassword <id>\n"