fix: throw exception on stream_socket_enable_crypto() warning (php-am…

…qplib#1158)
kratkyzobak · Feb 7, 2024 · 76eee28 · 76eee28
1 parent 0ed3ecc
commit 76eee28
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/PhpAmqpLib/Wire/IO/StreamIO.php b/PhpAmqpLib/Wire/IO/StreamIO.php
@@ -139,7 +139,7 @@ public function connect()
 
         $options = stream_context_get_options($context);
         if (isset($options['ssl']['crypto_method'])) {
-            $this->enable_crypto();
+            $this->enableCrypto();
         }
 
         $this->heartbeat = $this->initial_heartbeat;
@@ -432,16 +432,31 @@ protected function extract_error_code($message)
         return 0;
     }
 
-    private function enable_crypto(): void
+    /**
+     * @throws AMQPIOException
+     */
+    private function enableCrypto(): void
     {
         $timeout_at = time() + ($this->read_timeout + $this->write_timeout) * 2; // 2 round-trips during handshake
 
-        do {
-            $enabled = stream_socket_enable_crypto($this->sock, true);
-        } while ($enabled !== true && time() < $timeout_at);
+        try {
+            $this->setErrorHandler();
+            do {
+                $enabled = stream_socket_enable_crypto($this->sock, true);
+                if ($enabled === true) {
+                    return;
+                }
+                $this->throwOnError();
+                usleep(1e3);
+            } while ($enabled === 0 && time() < $timeout_at);
+        } catch (\ErrorException $exception) {
+            throw new AMQPIOException($exception->getMessage(), $exception->getCode(), $exception);
+        } finally {
+            $this->restoreErrorHandler();
+        }
 
         if ($enabled !== true) {
-            throw new AMQPIOException('Can not enable crypto');
+            throw new AMQPIOException('Could not enable socket crypto');
         }
     }
 }
diff --git a/tests/Unit/Connection/AMQPConnectionConfigTest.php b/tests/Unit/Connection/AMQPConnectionConfigTest.php
@@ -50,7 +50,6 @@ public function external_auth_with_user_credentials()
     public function secure_with_incorrect_crypto_method()
     {
         $this->expectException(AMQPIOException::class);
-        $this->expectExceptionMessage('Can not enable crypto');
 
         $cert_dir = realpath(__DIR__ . "/../../certs");
         $config = new AMQPConnectionConfig();