Merge pull request #519 from Seldaek/hide_input

Improve password prompts on windows

src/Composer/Compiler.php

@@ -65,6 +65,7 @@ class Compiler
         }
         $this->addFile($phar, new \SplFileInfo(__DIR__.'/Autoload/ClassLoader.php'), false);
         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../res/composer-schema.json'), false);
+        $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../src/Composer/IO/hiddeninput.exe'), false);
 
         $finder = new Finder();
         $finder->files()

src/Composer/IO/ConsoleIO.php

@@ -134,44 +134,40 @@ class ConsoleIO implements IOInterface
      */
     public function askAndHideAnswer($question)
     {
-        // for windows OS (does not hide the answer in the popup, but it never appears in the STDIN history)
+        // handle windows
         if (defined('PHP_WINDOWS_VERSION_BUILD')) {
-            $vbscript = sys_get_temp_dir() . '/prompt_password.vbs';
+            $exe = __DIR__.'\\hiddeninput.exe';
-            file_put_contents($vbscript,
-                    'wscript.echo(Inputbox("' . addslashes($question) . '","'
-                            . addslashes($question) . '", ""))');
-            $command = "cscript //nologo " . escapeshellarg($vbscript);
 
-            $this->write($question, false);
+            // handle code running from a phar
+            if ('phar:' === substr(__FILE__, 0, 5)) {
+                $tmpExe = sys_get_temp_dir().'/hiddeninput.exe';
+                copy($exe, $tmpExe);
+                $exe = $tmpExe;
+            }
 
-            $value = rtrim(shell_exec($command));
+            $this->write($question, false);
-            unlink($vbscript);
+            $value = rtrim(shell_exec($exe));
+            $this->write('');
 
-            $this->write('***');
+            // clean up
+            if (isset($tmpExe)) {
+                unlink($tmpExe);
+            }
 
             return $value;
         }
 
-        // for other OS with shell_exec (hide the answer)
+        // handle other OSs with bash if available to hide the answer
-        $command = "/usr/bin/env bash -c 'echo OK'";
+        if ('OK' === rtrim(shell_exec("/usr/bin/env bash -c 'echo OK'"))) {
-        if (rtrim(shell_exec($command)) === 'OK') {
             $this->write($question, false);
-
             $command = "/usr/bin/env bash -c 'read -s mypassword && echo \$mypassword'";
             $value = rtrim(shell_exec($command));
-
-            for ($i = 0; $i < strlen($value); ++$i) {
-                $this->write('*', false);
-            }
-
             $this->write('');
 
             return $value;
         }
 
-        // for other OS without shell_exec (does not hide the answer)
+        // not able to hide the answer, proceed with normal question handling
-        $this->write('');
-
         return $this->ask($question);
     }