Add option for specifying remote user when calling the ssh command

app/Commands/SshCommand.php

@@ -9,7 +9,7 @@ class SshCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'ssh {server? : The server name}';
+    protected $signature = 'ssh {server? : The server name} {--u|user= : The user to connect to the server as}';
 
     /**
      * The description of the command.
@@ -35,13 +35,15 @@ public function handle()
 
         $server = $this->currentServer();
 
+        $username = $this->option('user') ?: 'forge';
+
         $this->step('Establishing secure connection');
 
         $this->remote->ensureSshIsConfigured();
 
         $this->successfulStep('Connected To <comment>['.$server->name.']</comment>');
 
-        $exitCode = $this->remote->passthru();
+        $exitCode = $this->remote->passthru(null, $username);
 
         abort_if($exitCode == 255, $exitCode, 'Unable to connect to remote server. Have you configured an SSH key?');
 

app/Repositories/RemoteRepository.php

@@ -57,13 +57,14 @@ public function __construct($socketsPath)
      * Execute a command against the shell, and displays the output.
      *
      * @param  string|null  $command
+     * @param  string  $user
      * @return int
      */
-    public function passthru($command = null)
+    public function passthru($command = null, $user = 'forge')
     {
         $this->ensureSshIsConfigured();
 
-        passthru($this->ssh('"'.$command.'"'), $exitCode);
+        passthru($this->ssh('"'.$command.'"', $user), $exitCode);
 
         return (int) $exitCode;
     }
@@ -195,12 +196,13 @@ protected function ensuresFilesAreTailable($files)
     }
 
     /**
-     * Returns the "ssh" sheel command to be run.
+     * Returns the "ssh" shell command to be run.
      *
-     * @param  string  $command|null
+     * @param  string|null  $command
+     * @param  string  $user
      * @return string
      */
-    protected function ssh($command = null)
+    protected function ssh($command = null, $user = 'forge')
     {
         $options = collect([
             'ConnectTimeout' => 5,
@@ -221,8 +223,9 @@ protected function ssh($command = null)
         }
 
         return trim(sprintf(
-            'ssh %s -t forge@%s %s',
+            'ssh %s -t %s@%s %s',
             $options,
+            $user,
             $this->server->ipAddress,
             $command,
         ));

app/Support/Panic.php

@@ -27,6 +27,6 @@ public static function abort($message)
             - Operating System: %s
             - Error Message: %s.
             EOF
-        , config('app.version'), phpversion(), PHP_OS, $message));
+            , config('app.version'), phpversion(), PHP_OS, $message));
     }
 }

tests/Feature/SshCommandTest.php

@@ -18,6 +18,48 @@
     $this->artisan('ssh')->assertExitCode(0);
 });
 
+it('can connect to a specific ssh user', function () {
+    $this->config->set('server', 1);
+
+    $this->forge->shouldReceive('server')
+        ->once()
+        ->with(1)
+        ->andReturn((object) [
+            'name' => 'production',
+            'ipAddress' => '123.456.789.000',
+        ]);
+
+    $this->remote->shouldReceive('ensureSshIsConfigured');
+
+    $this->remote->shouldReceive('passthru')
+        ->with(null, 'testuser')
+        ->andReturn(0);
+
+    $this->artisan('ssh', [
+        '--user' => 'testuser',
+    ])->assertExitCode(0);
+});
+
+it('defaults to the forge user', function () {
+    $this->config->set('server', 1);
+
+    $this->forge->shouldReceive('server')
+        ->once()
+        ->with(1)
+        ->andReturn((object) [
+            'name' => 'production',
+            'ipAddress' => '123.456.789.000',
+        ]);
+
+    $this->remote->shouldReceive('ensureSshIsConfigured');
+
+    $this->remote->shouldReceive('passthru')
+        ->with(null, 'forge')
+        ->andReturn(0);
+
+    $this->artisan('ssh')->assertExitCode(0);
+});
+
 it('can not create ssh connections when ssh key is missing', function () {
     $this->config->set('server', 1);
 

tests/Unit/Repositories/RemoteRepositoryTest.php

@@ -64,7 +64,7 @@ public function __construct($sanitizableOutput)
         $this->sanitizableOutput = $sanitizableOutput;
     }
 
-    protected function ssh($command = null)
+    protected function ssh($command = null, $user = null)
     {
         return $command;
     }