Merge branch '2.x' into 3.x

shitware-ltd · Apr 14, 2022 · 9b3b146 · 9b3b146
2 parents dea7299 + 837431d
commit 9b3b146
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -127,6 +127,13 @@
 * FilesystemAdapter::directoryExists to check for directory existence
 * FilesystemAdapter::fileExists to check for file existence
 
+## 2.4.4 - 2022-04-14
+
+### Fixed
+
+- [SFTP v2] Avoid type errors when public key is not retrieved (#1446)
+- [SFTP v3] Avoid type errors when public key is not retrieved (#1446)
+
 ## 2.4.3 - 2022-02-16
 
 ### Fixed

diff --git a/src/PhpseclibV2/SftpConnectionProvider.php b/src/PhpseclibV2/SftpConnectionProvider.php
@@ -143,7 +143,12 @@ private function checkFingerprint(SFTP $connection): void
             return;
         }
 
-        $publicKey = $connection->getServerPublicHostKey() ?: 'no-public-key';
+        $publicKey = $connection->getServerPublicHostKey();
+
+        if ($publicKey === false) {
+            throw UnableToEstablishAuthenticityOfHost::becauseTheAuthenticityCantBeEstablished($this->host);
+        }
+
         $fingerprint = $this->getFingerprintFromPublicKey($publicKey);
 
         if (0 !== strcasecmp($this->hostFingerprint, $fingerprint)) {

diff --git a/src/PhpseclibV3/SftpConnectionProvider.php b/src/PhpseclibV3/SftpConnectionProvider.php
@@ -158,7 +158,12 @@ private function checkFingerprint(SFTP $connection): void
             return;
         }
 
-        $publicKey = $connection->getServerPublicHostKey() ?: 'no-public-key';
+        $publicKey = $connection->getServerPublicHostKey();
+
+        if ($publicKey === false) {
+            throw UnableToEstablishAuthenticityOfHost::becauseTheAuthenticityCantBeEstablished($this->host);
+        }
+
         $fingerprint = $this->getFingerprintFromPublicKey($publicKey);
 
         if (0 !== strcasecmp($this->hostFingerprint, $fingerprint)) {