Merge pull request #99 from clue-labs/invalid-url

Emit error event if request URL is invalid

Author: WyriHaximus

src/Request.php

@@ -4,6 +4,7 @@
 
 use Evenement\EventEmitterTrait;
 use GuzzleHttp\Psr7 as gPsr;
+use React\Promise;
 use React\Socket\ConnectorInterface;
 use React\Stream\WritableStreamInterface;
 use React\Socket\ConnectionInterface;
@@ -80,7 +81,7 @@ function (ConnectionInterface $stream) use ($requestData, &$streamRef, &$stateRe
                     }
                 }
             },
-            array($this, 'handleError')
+            array($this, 'closeError')
         );
 
         $this->on('close', function() use ($promise) {
@@ -247,10 +248,17 @@ protected function parseResponse($data)
 
     protected function connect()
     {
+        $scheme = $this->requestData->getScheme();
+        if ($scheme !== 'https' && $scheme !== 'http') {
+            return Promise\reject(
+                new \InvalidArgumentException('Invalid request URL given')
+            );
+        }
+
         $host = $this->requestData->getHost();
         $port = $this->requestData->getPort();
 
-        if ($this->requestData->getScheme() === 'https') {
+        if ($scheme === 'https') {
             $host = 'tls://' . $host;
         }
 

tests/RequestTest.php

@@ -226,6 +226,52 @@ public function requestShouldEmitErrorIfGuzzleParseThrowsException()
         $request->handleData("\r\n\r\n");
     }
 
+    /**
+     * @test
+     */
+    public function requestShouldEmitErrorIfUrlIsInvalid()
+    {
+        $requestData = new RequestData('GET', 'ftp://www.example.com');
+        $request = new Request($this->connector, $requestData);
+
+        $handler = $this->createCallableMock();
+        $handler->expects($this->once())
+            ->method('__invoke')
+            ->with(
+                $this->isInstanceOf('\InvalidArgumentException')
+            );
+
+        $request->on('error', $handler);
+
+        $this->connector->expects($this->never())
+            ->method('connect');
+
+        $request->end();
+    }
+
+    /**
+     * @test
+     */
+    public function requestShouldEmitErrorIfUrlHasNoScheme()
+    {
+        $requestData = new RequestData('GET', 'www.example.com');
+        $request = new Request($this->connector, $requestData);
+
+        $handler = $this->createCallableMock();
+        $handler->expects($this->once())
+            ->method('__invoke')
+            ->with(
+                $this->isInstanceOf('\InvalidArgumentException')
+            );
+
+        $request->on('error', $handler);
+
+        $this->connector->expects($this->never())
+            ->method('connect');
+
+        $request->end();
+    }
+
     /**
      * @test
      * @expectedException Exception