Some changes to allow commection with rsa keys authentication

.gitignore

@@ -0,0 +1 @@
+/.idea

Exception/ConnectionException.php

@@ -5,7 +5,22 @@
 /**
  * SSH2 connection exception
  */
-class ConnectionException extends Exception
+class ConnectionException extends \Exception
 {
+    /**
+     * Constructor
+     *
+     * @param string $message
+     * @param Profile $profile
+     */
+    public function __construct($message, Profile $profile = null)
+    {
+        if ($profile instanceof Profile) {
+            $message = '[' . (string)$profile . '] ' . $message;
+        } else {
+            $message = '[No profile specified] ' . $message;
+        }
 
+        parent::__construct($message);
+    }
 }

Factory/ConnectionFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace steevanb\SSH2Bundle\Factory;
+
+use steevanb\SSH2Bundle\Model\Profile;
+use steevanb\SSH2Bundle\Model\Connection;
+
+/**
+ * Service for SSH2 connections
+ */
+class ConnectionFactory
+{
+    /**
+     * @param array $args
+     * @param bool $autoConnect
+     * @return Connection
+     */
+    public function connect(array $args, $autoConnect = true)
+    {
+        $profile = new Profile($args);
+        return new Connection($profile, $autoConnect);
+    }
+}

Entity/Connection.php → Model/Connection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace steevanb\SSH2Bundle\Entity;
+namespace steevanb\SSH2Bundle\Model;
 
 use steevanb\SSH2Bundle\Exception\ConnectionException;
 
@@ -55,7 +55,10 @@ public function connect()
         if ($this->connection === false) {
             $this->state = self::STATE_INVALID_ADDRESS;
         } else {
-            $auth = @ssh2_auth_password($this->connection, $profile->getLogin(), $profile->getPassword());
+            $auth = @ssh2_auth_pubkey_file($this->connection, $profile->getLogin(), $profile->getRsaPubKey(), $profile->getRsaPemKey(), $profile->getPassphrase());
+            if ($auth === false) {
+                $auth = @ssh2_auth_password($this->connection, $profile->getLogin(), $profile->getPassword());
+            }
             if ($auth === false) {
                 $this->state = self::STATE_INVALID_LOGIN;
             } else {
@@ -119,20 +122,40 @@ public function getProfile()
         return $this->profile;
     }
 
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
     /**
      * Execute a command
      *
-     * @param string $command
-     * @return string
+     * @param $command
+     * @return bool|string
+     * @throws ConnectionException
+     *
      */
     public function exec($command)
     {
         $this->assertConnected();
 
-        $stream = ssh2_exec($this->connection, $command);
-        stream_set_blocking($stream, true);
-        $streamOut = ssh2_fetch_stream($stream, SSH2_STREAM_STDIO);
-        return stream_get_contents($streamOut);
+        if( !($stream = ssh2_exec($this->connection, $command)) ) {
+            throw new ConnectionException(
+                sprintf('%s command failed through ssh', $command),
+                $this->profile
+            );
+        }
+        $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR);
+        stream_set_blocking($errorStream, TRUE);
+        stream_set_blocking($stream, TRUE);
+        $output = stream_get_contents($stream);
+        $error_output = stream_get_contents($errorStream);
+        fclose($stream);
+        fclose($errorStream);
+        if (!empty($error_output)) {
+            throw new ConnectionException($error_output, $this->profile);
+        }
+        return $output;
     }
 
     /**
@@ -141,6 +164,7 @@ public function exec($command)
      * @param string $command
      * @param string $separator
      * @return array
+     * @throws ConnectionException
      */
     public function execExplode($command, $separator = ' ')
     {
@@ -155,6 +179,7 @@ public function execExplode($command, $separator = ' ')
      * @param string $separator Separator
      * @param mixed $default Default value if $index is not found
      * @return string
+     * @throws ConnectionException
      */
     public function execExplodeIndex($command, $index, $separator = ' ', $default = null)
     {
@@ -167,6 +192,7 @@ public function execExplodeIndex($command, $index, $separator = ' ', $default =
      *
      * @param type $command
      * @return array
+     * @throws ConnectionException
      */
     public function execLines($command)
     {
@@ -182,6 +208,7 @@ public function execLines($command)
      * @param int $index Index of the line to return
      * @param string $default Default value
      * @return string
+     * @throws ConnectionException
      */
     public function execLine($command, $index = 0, $default = null)
     {