Merge pull request #570 from vyuldashev/newverifypeer

Correctly handle Verify Peer option
vyuldashev · Jan 10, 2024 · 03e1051 · 03e1051
2 parents 86315a4 + 3669445
commit 03e1051
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "php": "^8.0",
         "ext-json": "*",
         "illuminate/queue": "^9.0|^10.0",
-        "php-amqplib/php-amqplib": "^v3.2"
+        "php-amqplib/php-amqplib": "^v3.5.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3",

diff --git a/src/Queue/Connection/ConfigFactory.php b/src/Queue/Connection/ConfigFactory.php
@@ -75,7 +75,8 @@ protected static function getSLLOptionsFromConfig(AMQPConnectionConfig $connecti
         if ($key = Arr::get($sslConfig, 'local_key')) {
             $connectionConfig->setSslKey($key);
         }
-        if ($verifyPeer = Arr::get($sslConfig, 'verify_peer')) {
+        if (Arr::has($sslConfig, 'verify_peer')) {
+            $verifyPeer = Arr::get($sslConfig, 'verify_peer');
             $connectionConfig->setSslVerify($verifyPeer);
         }
         if ($passphrase = Arr::get($sslConfig, 'passphrase')) {

diff --git a/src/Queue/Connection/ConnectionFactory.php b/src/Queue/Connection/ConnectionFactory.php
@@ -170,7 +170,7 @@ protected static function getSslOptions(AMQPConnectionConfig $config): array
             'ciphers' => $config->getSslCiphers(),
             'security_level' => $config->getSslSecurityLevel(),
         ], static function ($value) {
-            return null !== $value;
+            return $value !== null;
         });
     }
 
@@ -200,10 +200,10 @@ protected static function assertSSLConnection($connection): void
         self::assertExtendedOf($connection, self::CONNECTION_SUB_TYPE_SSL);
     }
 
-    protected static function assertExtendedOf($connection, string $abstract): void
+    protected static function assertExtendedOf($connection, string $parent): void
     {
-        if (! is_subclass_of($connection, $abstract)) {
-            throw new AMQPLogicException(sprintf('The connection must extend: %s', class_basename($abstract)));
+        if (! is_subclass_of($connection, $parent) && $connection !== $parent) {
+            throw new AMQPLogicException(sprintf('The connection must extend: %s', class_basename($parent)));
         }
     }
 

diff --git a/src/Queue/RabbitMQQueue.php b/src/Queue/RabbitMQQueue.php
@@ -303,8 +303,6 @@ public function getJobClass(): string
 
     /**
      * Gets a queue/destination, by default the queue option set on the connection.
-     *
-     * @param  null  $queue
      */
     public function getQueue($queue = null): string
     {

diff --git a/tests/Feature/ConnectorTest.php b/tests/Feature/ConnectorTest.php
@@ -3,10 +3,12 @@
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Feature;
 
 use Illuminate\Queue\QueueManager;
+use PhpAmqpLib\Connection\AMQPConnectionConfig;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
 use PhpAmqpLib\Connection\AMQPSSLConnection;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mocks\TestSSLConnection;
 
 class ConnectorTest extends \VladimirYuldashev\LaravelQueueRabbitMQ\Tests\TestCase
 {
@@ -138,4 +140,48 @@ public function testSslConnection(): void
         $this->assertTrue($connection->getConnection()->isConnected());
         $this->assertTrue($connection->getChannel()->is_open());
     }
+
+    // Test to validate ssl connection params
+    public function testNoVerificationSslConnection(): void
+    {
+        $this->app['config']->set('queue.connections.rabbitmq', [
+            'driver' => 'rabbitmq',
+            'queue' => env('RABBITMQ_QUEUE', 'default'),
+            'connection' => TestSSLConnection::class,
+            'secure' => true,
+
+            'hosts' => [
+                [
+                    'host' => getenv('HOST'),
+                    'port' => getenv('PORT_SSL'),
+                    'user' => 'guest',
+                    'password' => 'guest',
+                    'vhost' => '/',
+                ],
+            ],
+
+            'options' => [
+                'ssl_options' => [
+                    'cafile' => getenv('RABBITMQ_SSL_CAFILE'),
+                    'local_cert' => null,
+                    'local_key' => null,
+                    'verify_peer' => false,
+                    'passphrase' => null,
+                ],
+            ],
+
+            'worker' => env('RABBITMQ_WORKER', 'default'),
+        ]);
+
+        /** @var QueueManager $queue */
+        $queue = $this->app['queue'];
+
+        /** @var RabbitMQQueue $connection */
+        $connection = $queue->connection('rabbitmq');
+        $this->assertInstanceOf(RabbitMQQueue::class, $connection);
+        $this->assertInstanceOf(AMQPSSLConnection::class, $connection->getConnection());
+        /** @var AMQPConnectionConfig */
+        $config = $connection->getConnection()->getConfig();
+        $this->assertFalse($config->getSslVerify());
+    }
 }
diff --git a/tests/Mocks/TestSSLConnection.php b/tests/Mocks/TestSSLConnection.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mocks;
+
+use PhpAmqpLib\Connection\AMQPConnectionConfig;
+use PhpAmqpLib\Connection\AMQPSSLConnection;
+
+class TestSSLConnection extends AMQPSSLConnection
+{
+    public function getConfig(): ?AMQPConnectionConfig
+    {
+        return $this->config;
+    }
+}