wip

Hank-IT · Oct 1, 2019 · 849761a · 849761a
1 parent 312a07e
commit 849761a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Adapters/SshAdapter.php b/src/Adapters/SshAdapter.php
@@ -56,8 +56,6 @@ class SshAdapter implements AdapterInterface
     /**
      * SshAdapter constructor.
      *
-     * @throws PublicKeyMismatchException
-     *
      * @param $host
      * @param $username
      * @param $publicKey
@@ -66,10 +64,6 @@ public function __construct($host, $username, $publicKey)
     {
         $this->connection = new SSH2($host);
 
-        if ($this->connection->getServerPublicHostKey() !== $publicKey) {
-            throw new PublicKeyMismatchException('Public key mismatch');
-        }
-
         $this->username = $username;
 
         $this->publicKey = $publicKey;
@@ -99,22 +93,32 @@ public function getServerPublicHostKey()
      * Login via password.
      *
      * @throws ConnectionNotPossibleException
+     * @throws PublicKeyMismatchException
      * @param $password
      */
     public function loginPassword($password)
     {
+        if ($this->getServerPublicHostKey() !== $this->publicKey) {
+            throw new PublicKeyMismatchException('Public key mismatch');
+        }
+
         $this->login($password);
     }
 
     /**
      * Login via private key.
      *
      * @throws ConnectionNotPossibleException
+     * @throws PublicKeyMismatchException
      * @param      $key
      * @param null $password
      */
     public function loginKey($key, $password = null)
     {
+        if ($this->getServerPublicHostKey() !== $this->publicKey) {
+            throw new PublicKeyMismatchException('Public key mismatch');
+        }
+
         $crypt = new RSA;
 
         if (! is_null($password)) {