Merge pull request #20 from adpeyre/login_rsa_key

Authentication with ssh key

Author: julienj

src/Automate/Loader.php

@@ -137,7 +137,12 @@ private function getSchema()
                                             ],
                                             'password' => [
                                                 '_type' => 'text',
-                                                '_required' => true,
+                                                '_required' => false,
+                                                '_not_empty' => false,
+                                            ],
+                                            'ssh_key' => [
+                                                '_type' => 'text',
+                                                '_required' => false,
                                                 '_not_empty' => true,
                                             ],
                                             'path' => [

src/Automate/Model/Server.php

@@ -31,6 +31,12 @@ class Server
      */
     private $user;
 
+
+    /**
+     * @var string
+     */
+    private $sshKey;
+
     /**
      * @var int
      */
@@ -106,6 +112,26 @@ public function setUser($user)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getSshKey()
+    {
+        return $this->sshKey;
+    }
+
+    /**
+     * @param string $sshKey
+     *
+     * @return Server
+     */
+    public function setSshKey($sshKey)
+    {
+        $this->sshKey = $sshKey;
+
+        return $this;
+    }
+
     /**
      * @return int
      */
@@ -165,6 +191,4 @@ public function setPort($port)
 
         return $this;
     }
-
-
 }

src/Automate/Serializer/ServerDenormalizer.php

@@ -28,12 +28,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $server = new Server();
 
         $server
-            ->setName($this->extractValue($data,     'name'))
-            ->setHost($this->extractValue($data,     'host'))
-            ->setUser($this->extractValue($data,     'user'))
-            ->setPassword($this->extractValue($data, 'password'))
-            ->setPath($this->extractValue($data,     'path'))
-            ->setPort($this->extractValue($data,     'port', 22))
+            ->setName($this->extractValue($data, 'name'))
+            ->setHost($this->extractValue($data, 'host'))
+            ->setUser($this->extractValue($data, 'user'))
+            ->setSshKey($this->extractValue($data, 'ssh_key'))
+            ->setPassword($this->extractValue($data, 'password', ""))
+            ->setPath($this->extractValue($data, 'path'))
+            ->setPort($this->extractValue($data, 'port', 22))
         ;
 
         return $server;

src/Automate/SessionFactory.php

@@ -13,6 +13,7 @@
 
 use Automate\Model\Server;
 use phpseclib\Net\SSH2;
+use phpseclib\Crypt\RSA;
 
 class SessionFactory
 {
@@ -29,8 +30,23 @@ public function create(Server $server)
     {
         $ssh = new SSH2($server->getHost(), $server->getPort());
 
-        if (!$ssh->login($server->getUser(), $server->getPassword())) {
-            throw new \Exception(sprintf('[%s] Invalid user or password', $server->getName()));
+        // Connection with ssh key and optional
+        if (!empty($server->getSshKey())) {
+            if (!file_exists($server->getSshKey())) {
+                throw new \Exception(sprintf('[%s] File "'.$server->getSshKey().'" not found', $server->getName()));
+            }
+
+            $key = new RSA();
+            $key->setPassword($server->getPassword());
+            $key->loadKey(file_get_contents($server->getSshKey()));
+
+            if (!$ssh->login($server->getUser(), $key)) {
+                throw new \Exception(sprintf('[%s] SSH key or passphrase is invalid', $server->getName()));
+            }
+        } else {
+            if (!$ssh->login($server->getUser(), $server->getPassword())) {
+                throw new \Exception(sprintf('[%s] Invalid user or password', $server->getName()));
+            }
         }
 
         return new Session($ssh);