Merge pull request #83 from clue-labs/too-many-connections

Fix parsing error message during handshake (Too many connections)

Author: jsor

src/Io/Parser.php

@@ -138,25 +138,26 @@ public function parse($data)
         $this->state = self::STATE_STANDBY;
         //$this->stream->bufferSize = 4;
         if ($this->phase === 0) {
-            $this->phase = self::PHASE_GOT_INIT;
-            $this->protocalVersion = $this->buffer->readInt1();
-            $this->debug(sprintf("Protocal Version: %d", $this->protocalVersion));
-            if ($this->protocalVersion === 0xFF) { //error
-                $fieldCount = $this->protocalVersion;
-                $this->protocalVersion = 0;
-                printf("Error:\n");
-
-                $this->rsState = self::RS_STATE_HEADER;
-                $this->resultFields = [];
-                if ($this->phase === self::PHASE_AUTH_SENT || $this->phase === self::PHASE_GOT_INIT) {
-                    $this->phase = self::PHASE_AUTH_ERR;
-                }
+            $response = $this->buffer->readInt1();
+            if ($response === 0xFF) {
+                // error packet before handshake means we did not exchange capabilities and error does not include SQL state
+                $this->phase   = self::PHASE_AUTH_ERR;
+                $this->errno   = $this->buffer->readInt2();
+                $this->errmsg  = $this->buffer->read($this->pctSize - $len + $this->buffer->length());
+                $this->debug(sprintf("Error Packet:%d %s\n", $this->errno, $this->errmsg));
 
-                goto field;
+                // error during init phase also means we're not currently executing any command
+                // simply reject the first outstanding command in the queue (AuthenticateCommand)
+                $this->currCommand = $this->executor->dequeue();
+                $this->onError();
+                return;
             }
 
-            $options = &$this->connectOptions;
+            $this->phase = self::PHASE_GOT_INIT;
+            $this->protocalVersion = $response;
+            $this->debug(sprintf("Protocal Version: %d", $this->protocalVersion));
 
+            $options = &$this->connectOptions;
             $options['serverVersion'] = $this->buffer->readStringNull();
             $options['threadId']      = $this->buffer->readInt4();
             $this->scramble           = $this->buffer->read(8); // 1st part
@@ -173,14 +174,15 @@ public function parse($data)
                 $this->buffer->readStringNull(); // skip authentication plugin name
             }
 
+            // init completed, continue with sending AuthenticateCommand
             $this->nextRequest(true);
         } else {
             $fieldCount = $this->buffer->readInt1();
-field:
+
             if ($fieldCount === 0xFF) {
                 // error packet
                 $this->errno   = $this->buffer->readInt2();
-                $this->buffer->skip(6); // state
+                $this->buffer->skip(6); // skip SQL state
                 $this->errmsg  = $this->buffer->read($this->pctSize - $len + $this->buffer->length());
                 $this->debug(sprintf("Error Packet:%d %s\n", $this->errno, $this->errmsg));
 

tests/Io/ParserTest.php

@@ -7,6 +7,7 @@
 use React\MySQL\Io\Parser;
 use React\Stream\ThroughStream;
 use React\Tests\MySQL\BaseTestCase;
+use React\MySQL\Exception;
 
 class ParserTest extends BaseTestCase
 {
@@ -33,7 +34,7 @@ public function testClosingStreamEmitsErrorForCurrentCommand()
         $parser = new Parser($stream, $executor);
         $parser->start();
 
-        $command = new QueryCommand($connection);
+        $command = new QueryCommand();
         $command->on('error', $this->expectCallableOnce());
 
         // hack to inject command as current command
@@ -43,4 +44,47 @@ public function testClosingStreamEmitsErrorForCurrentCommand()
 
         $stream->close();
     }
+
+    public function testSendingErrorFrameDuringHandshakeShouldEmitErrorOnFollowingCommand()
+    {
+        $stream = new ThroughStream();
+        $connection = $this->getMockBuilder('React\MySQL\ConnectionInterface')->disableOriginalConstructor()->getMock();
+
+        $command = new QueryCommand();
+        $command->on('error', $this->expectCallableOnce());
+
+        $error = null;
+        $command->on('error', function ($e) use (&$error) {
+            $error = $e;
+        });
+
+        $executor = new Executor($connection);
+        $executor->enqueue($command);
+
+        $parser = new Parser($stream, $executor);
+        $parser->start();
+
+        $stream->write("\x17\0\0\0" . "\xFF" . "\x10\x04" . "Too many connections");
+
+        $this->assertTrue($error instanceof Exception);
+        $this->assertEquals(1040, $error->getCode());
+        $this->assertEquals('Too many connections', $error->getMessage());
+    }
+
+    public function testSendingIncompleteErrorFrameDuringHandshakeShouldNotEmitError()
+    {
+        $stream = new ThroughStream();
+        $connection = $this->getMockBuilder('React\MySQL\ConnectionInterface')->disableOriginalConstructor()->getMock();
+
+        $command = new QueryCommand();
+        $command->on('error', $this->expectCallableNever());
+
+        $executor = new Executor($connection);
+        $executor->enqueue($command);
+
+        $parser = new Parser($stream, $executor);
+        $parser->start();
+
+        $stream->write("\xFF\0\0\0" . "\xFF" . "\x12\x34" . "Some incomplete error message...");
+    }
 }