fix ssl test. add passphrase and local key ssl options.

Author: makasim

composer.json

@@ -13,7 +13,7 @@
     "illuminate/database": "5.5.*",
     "illuminate/support": "5.5.*",
     "illuminate/queue": "5.5.*",
-    "enqueue/amqp-lib": "dev-ssl-filter-out-null-options as 0.8.4"
+    "enqueue/amqp-lib": "0.8.5"
   },
   "require-dev": {
     "phpunit/phpunit": "~6.0",
@@ -41,11 +41,5 @@
     "test": "vendor/bin/phpunit"
   },
   "minimum-stability": "dev",
-  "prefer-stable": true,
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "git@github.com:formapro-forks/amqp-lib.git"
-    }
-  ]
+  "prefer-stable": true
 }

config/rabbitmq.php

@@ -77,6 +77,7 @@
         'ssl_on'        => env('RABBITMQ_SSL', false),
         'cafile'        => env('RABBITMQ_SSL_CAFILE', null),
         'local_cert'    => env('RABBITMQ_SSL_LOCALCERT', null),
+        'local_key'     => env('RABBITMQ_SSL_LOCALKEY', null),
         'verify_peer'   => env('RABBITMQ_SSL_VERIFY_PEER', true),
         'passphrase'    => env('RABBITMQ_SSL_PASSPHRASE', null),
     ]

src/Queue/Connectors/RabbitMQConnector.php

@@ -54,9 +54,8 @@ public function connect(array $config): Queue
             'ssl_verify' => $config['ssl_params']['verify_peer'],
             'ssl_cacert' => $config['ssl_params']['cafile'],
             'ssl_cert' => $config['ssl_params']['local_cert'],
-
-            // TODO 'ssl_key' not supported
-            // TODO: add passphrase
+            'ssl_key' => $config['ssl_params']['local_key'],
+            'ssl_passphrase' => $config['ssl_params']['passphrase'],
         ]);
 
         if ($factory instanceof DelayStrategyAware) {

tests/Functional/SendAndReceiveDelayedMessageTest.php

@@ -46,6 +46,7 @@ public function test()
                 'ssl_on'        => false,
                 'cafile'        => null,
                 'local_cert'    => null,
+                'local_key'     => null,
                 'verify_peer'   => true,
                 'passphrase'    => null,
             ]

tests/Functional/SendAndReceiveMessageTest.php

@@ -46,6 +46,7 @@ public function test()
                 'ssl_on'        => false,
                 'cafile'        => null,
                 'local_cert'    => null,
+                'local_key'     => null,
                 'verify_peer'   => true,
                 'passphrase'    => null,
             ]

tests/Functional/SslConnectionTest.php

@@ -47,6 +47,7 @@ public function testConnectorEstablishSecureConnectionWithRabbitMQBroker()
                 'ssl_on'        => true,
                 'cafile'        => getenv('RABBITMQ_SSL_CAFILE'),
                 'local_cert'    => null,
+                'local_key'     => null,
                 'verify_peer'   => false,
                 'passphrase'    => null,
             ]

tests/Functional/StreamConnectionTest.php

@@ -45,6 +45,7 @@ public function testConnectorEstablishSecureConnectionWithRabbitMQBroker()
                 'ssl_on'        => false,
                 'cafile'        => null,
                 'local_cert'    => null,
+                'local_key'     => null,
                 'verify_peer'   => true,
                 'passphrase'    => null,
             ]

tests/Queue/Connectors/RabbitMQConnectorTest.php

@@ -72,6 +72,8 @@ public function testShouldPassExpectedConfigToConnectionFactory()
                 'ssl_verify' => 'theVerifyPeer',
                 'ssl_cacert' => 'theCafile',
                 'ssl_cert' => 'theLocalCert',
+                'ssl_key' => 'theLocalKey',
+                'ssl_passphrase' => 'thePassPhrase',
             ], $config);
         };
 
@@ -160,7 +162,9 @@ private function createDummyConfig()
                 'ssl_on' => 'theSslOn',
                 'verify_peer' => 'theVerifyPeer',
                 'cafile' => 'theCafile',
-                'local_cert' => 'theLocalCert'
+                'local_cert' => 'theLocalCert',
+                'local_key'  => 'theLocalKey',
+                'passphrase'  => 'thePassPhrase',
             ],
             'queue' => 'aQueueName',
             'exchange_declare' => false,

tests/Queue/RabbitMQQueueTest.php

@@ -473,7 +473,8 @@ private function createDummyConfig()
                 'ssl_on' => 'aSslOn',
                 'verify_peer' => 'aVerifyPeer',
                 'cafile' => 'aCafile',
-                'local_cert' => 'aLocalCert'
+                'local_cert' => 'aLocalCert',
+                'local_key'  => 'aLocalKey',
             ],
             'queue' => 'aQueueName',
             'exchange_declare' => false,