fix ssl connection bug

Author: Aleksey Kulagin

Configuration.php

@@ -8,7 +8,10 @@
 use mikemadisonweb\rabbitmq\exceptions\InvalidConfigException;
 use PhpAmqpLib\Connection\AbstractConnection;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
+use PhpAmqpLib\Connection\AMQPSSLConnection;
+use Yii;
 use yii\base\Component;
+use yii\di\NotInstantiableException;
 use yii\helpers\ArrayHelper;
 
 class Configuration extends Component
@@ -145,44 +148,53 @@ public function getConfig() : Configuration
     /**
      * Get connection service
      * @param string $connectionName
-     * @return AbstractConnection
+     * @return object|AbstractConnection
+     * @throws NotInstantiableException
+     * @throws \yii\base\InvalidConfigException
      */
     public function getConnection(string $connectionName = '') : AbstractConnection
     {
         if ('' === $connectionName) {
             $connectionName = self::DEFAULT_CONNECTION_NAME;
         }
 
-        return \Yii::$container->get(sprintf(self::CONNECTION_SERVICE_NAME, $connectionName));
+        return Yii::$container->get(sprintf(self::CONNECTION_SERVICE_NAME, $connectionName));
     }
 
     /**
      * Get producer service
      * @param string $producerName
-     * @return Producer
+     * @return Producer|object
+     * @throws \yii\base\InvalidConfigException
+     * @throws NotInstantiableException
      */
-    public function getProducer(string $producerName) : Producer
+    public function getProducer(string $producerName)
     {
-        return \Yii::$container->get(sprintf(self::PRODUCER_SERVICE_NAME, $producerName));
+        return Yii::$container->get(sprintf(self::PRODUCER_SERVICE_NAME, $producerName));
     }
 
     /**
      * Get consumer service
      * @param string $consumerName
-     * @return Consumer
+     * @return Consumer|object
+     * @throws NotInstantiableException
+     * @throws \yii\base\InvalidConfigException
      */
-    public function getConsumer(string $consumerName) : Consumer
+    public function getConsumer(string $consumerName)
     {
-        return \Yii::$container->get(sprintf(self::CONSUMER_SERVICE_NAME, $consumerName));
+        return Yii::$container->get(sprintf(self::CONSUMER_SERVICE_NAME, $consumerName));
     }
 
     /**
      * Get routing service
-     * @return Routing
+     * @param AbstractConnection $connection
+     * @return Routing|object|string
+     * @throws NotInstantiableException
+     * @throws \yii\base\InvalidConfigException
      */
-    public function getRouting(AbstractConnection $connection) : Routing
+    public function getRouting(AbstractConnection $connection)
     {
-        return \Yii::$container->get(Configuration::ROUTING_SERVICE_NAME, ['conn' => $connection]);
+        return Yii::$container->get(Configuration::ROUTING_SERVICE_NAME, ['conn' => $connection]);
     }
 
     /**
@@ -261,6 +273,12 @@ protected function validateRequired()
             if (isset($connection['type']) && !is_subclass_of($connection['type'], AbstractConnection::class)) {
                 throw new InvalidConfigException('Connection type should be a subclass of PhpAmqpLib\Connection\AbstractConnection.');
             }
+            if (!empty($connection['ssl_context']) && empty($connection['type'])) {
+                throw new InvalidConfigException('If you are using a ssl connection, the connection type must be AMQPSSLConnection::class');
+            }
+            if (!empty($connection['ssl_context']) && $connection['type'] !== AMQPSSLConnection::class) {
+                throw new InvalidConfigException('If you are using a ssl connection, the connection type must be AMQPSSLConnection::class');
+            }
         }
 
         foreach ($this->exchanges as $exchange) {

components/AbstractConnectionFactory.php

@@ -29,6 +29,23 @@ public function __construct($class, array $parameters)
      */
     public function createConnection() : AbstractConnection
     {
+        if ($this->_parameters['ssl_context'] !== null) {
+            return new $this->_class(
+                $this->_parameters['host'],
+                $this->_parameters['port'],
+                $this->_parameters['user'],
+                $this->_parameters['password'],
+                $this->_parameters['vhost'],
+                $this->_parameters['ssl_context'],
+                [
+                    'connection_timeout' => $this->_parameters['connection_timeout'],
+                    'read_write_timeout' => $this->_parameters['read_write_timeout'],
+                    'keepalive' => $this->_parameters['keepalive'],
+                    'heartbeat' => $this->_parameters['heartbeat'],
+                    'channel_rpc_timeout' => $this->_parameters['channel_rpc_timeout'],
+                ]
+            );
+        }
         return new $this->_class(
             $this->_parameters['host'],
             $this->_parameters['port'],

controllers/RabbitMQController.php

@@ -250,7 +250,7 @@ public function actionDeleteAll(string $connection = Configuration::DEFAULT_CONN
         if ($this->interactive)
         {
             $input = Console::prompt('Are you sure you want to delete all queues and exchanges?', ['default' => 'yes']);
-            if ($input !== 'yes')
+            if ($input !== 'yes' && $input !== 'y')
             {
                 $this->stderr(Console::ansiFormat("Aborted.\n", [Console::FG_RED]));