-
-
Notifications
You must be signed in to change notification settings - Fork 145
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Decode chunked transfer encoding for incoming requests #106
Changes from 7 commits
42a12fa
2e7d1e3
8e70e6d
4eea7d1
31ef4cb
dec2291
0e50877
5bfc445
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,197 @@ | ||
<?php | ||
namespace React\Http; | ||
|
||
use Evenement\EventEmitter; | ||
use React\Stream\ReadableStreamInterface; | ||
use React\Stream\WritableStreamInterface; | ||
use React\Stream\Util; | ||
use Exception; | ||
|
||
/** @internal */ | ||
class ChunkedDecoder extends EventEmitter implements ReadableStreamInterface | ||
{ | ||
const CRLF = "\r\n"; | ||
|
||
private $closed = false; | ||
private $input; | ||
private $buffer = ''; | ||
private $chunkSize = 0; | ||
private $actualChunksize = 0; | ||
private $chunkHeaderComplete = false; | ||
|
||
public function __construct(ReadableStreamInterface $input) | ||
{ | ||
$this->input = $input; | ||
|
||
$this->input->on('data', array($this, 'handleData')); | ||
$this->input->on('end', array($this, 'handleEnd')); | ||
$this->input->on('error', array($this, 'handleError')); | ||
$this->input->on('close', array($this, 'close')); | ||
} | ||
|
||
|
||
public function isReadable() | ||
{ | ||
return ! $this->closed && $this->input->isReadable(); | ||
} | ||
|
||
public function pause() | ||
{ | ||
$this->input->pause(); | ||
} | ||
|
||
public function resume() | ||
{ | ||
$this->input->resume(); | ||
} | ||
|
||
public function pipe(WritableStreamInterface $dest, array $options = array()) | ||
{ | ||
Util::pipe($this, $dest, $options); | ||
|
||
return $dest; | ||
} | ||
|
||
public function close() | ||
{ | ||
if ($this->closed) { | ||
return; | ||
} | ||
|
||
$this->closed = true; | ||
|
||
$this->input->close(); | ||
|
||
$this->emit('close'); | ||
$this->removeAllListeners(); | ||
} | ||
|
||
/** | ||
* Extracts the hexadecimal header and removes it from the given data string | ||
* | ||
* @param string $data - complete or incomplete chunked string | ||
* @return string | ||
*/ | ||
private function handleChunkHeader($data) | ||
{ | ||
$hexValue = strtok($this->buffer . $data, static::CRLF); | ||
if ($this->isLineComplete($this->buffer . $data, $hexValue, strlen($hexValue))) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could this be simplified? How about using |
||
|
||
if (dechex(hexdec($hexValue)) != $hexValue) { | ||
$this->emit('error', array(new \Exception('Unable to identify ' . $hexValue . 'as hexadecimal number'))); | ||
$this->close(); | ||
return; | ||
} | ||
|
||
$this->chunkSize = hexdec($hexValue); | ||
$this->chunkHeaderComplete = true; | ||
|
||
$data = substr($this->buffer . $data, strlen($hexValue) + 2); | ||
$this->buffer = ''; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is really hard to keep track of. It looks like the buffer is modified in a couple of methods here? Can this buffering logic be simplified? (see also above for |
||
// Chunk header is complete | ||
return $data; | ||
} | ||
|
||
$this->buffer .= $data; | ||
$data = ''; | ||
// Chunk header isn't complete, buffer | ||
return $data; | ||
} | ||
|
||
/** | ||
* Extracts the chunk data and removes it from the income data string | ||
* | ||
* @param unknown $data - string without the hexadecimal header | ||
* @return string | ||
*/ | ||
private function handleChunkData($data) | ||
{ | ||
$chunk = substr($this->buffer . $data, 0, $this->chunkSize); | ||
$this->actualChunksize = strlen($chunk); | ||
|
||
if ($this->chunkSize == $this->actualChunksize) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
$data = $this->sendChunk($data, $chunk); | ||
} elseif ($this->actualChunksize < $this->chunkSize) { | ||
$this->buffer .= $data; | ||
$data = ''; | ||
} | ||
|
||
return $data; | ||
} | ||
|
||
/** | ||
* Sends the chunk or ends the stream | ||
* | ||
* @param string $data - incomed data stream the chunk will be removed from this string | ||
* @param string $chunk - chunk which will be emitted | ||
* @return string - rest data string | ||
*/ | ||
private function sendChunk($data, $chunk) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is being "sent" here? |
||
{ | ||
if ($this->chunkSize == 0 && $this->isLineComplete($this->buffer . $data, $chunk, $this->chunkSize)) { | ||
$this->emit('end', array()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't this be followed by a |
||
return; | ||
} | ||
|
||
if (!$this->isLineComplete($this->buffer . $data, $chunk, $this->chunkSize)) { | ||
$this->emit('error', array(new \Exception('Chunk doesn\'t end with new line delimiter'))); | ||
$this->close(); | ||
return; | ||
} | ||
|
||
$data = substr($this->buffer . $data, $this->chunkSize + 2); | ||
$this->emit('data', array($chunk)); | ||
|
||
$this->buffer = ''; | ||
$this->chunkSize = 0; | ||
$this->chunkHeaderComplete = false; | ||
|
||
return $data; | ||
} | ||
|
||
/** | ||
* Checks if the given chunk is ending with a "\r\n" at the start of the data string | ||
* | ||
* @param string $data - complete data string | ||
* @param string $chunk - string which should end with "\r\n" | ||
* @param unknown $length - possible length of the data chunk | ||
* @return boolean | ||
*/ | ||
private function isLineComplete($data, $chunk, $length) | ||
{ | ||
if (substr($data, 0, $length + 2) == $chunk . static::CRLF) { | ||
return true; | ||
} | ||
return false; | ||
} | ||
|
||
/** @internal */ | ||
public function handleEnd() | ||
{ | ||
if (! $this->closed) { | ||
$this->emit('end'); | ||
$this->close(); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What if there's still data in the buffer when the underlying stream emits an |
||
} | ||
|
||
/** @internal */ | ||
public function handleError(\Exception $e) | ||
{ | ||
$this->emit('error', array($e)); | ||
$this->close(); | ||
} | ||
|
||
/** @internal */ | ||
public function handleData($data) | ||
{ | ||
while (strlen($data) != 0) { | ||
if (! $this->chunkHeaderComplete) { | ||
$data = $this->handleChunkHeader($data); | ||
} | ||
// Not 'else', chunkHeaderComplete can change in 'handleChunkHeader' | ||
if ($this->chunkHeaderComplete) { | ||
$data = $this->handleChunkData($data); | ||
} | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,26 +22,21 @@ public function __construct(SocketServerInterface $io) | |
// TODO: multipart parsing | ||
|
||
$parser = new RequestHeaderParser(); | ||
$parser->on('headers', function (Request $request, $bodyBuffer) use ($conn, $parser, $that) { | ||
$listener = array($parser, 'feed'); | ||
|
||
$parser->on('headers', function (Request $request, $bodyBuffer) use ($conn, $parser, $that, $listener) { | ||
// attach remote ip to the request as metadata | ||
$request->remoteAddress = $conn->getRemoteAddress(); | ||
|
||
// forward pause/resume calls to underlying connection | ||
$request->on('pause', array($conn, 'pause')); | ||
$request->on('resume', array($conn, 'resume')); | ||
|
||
$that->handleRequest($conn, $request, $bodyBuffer); | ||
$conn->removeListener('data', $listener); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Duplicate? (Line 34) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right. Removed this line in one of the latest |
||
|
||
$conn->removeListener('data', array($parser, 'feed')); | ||
$conn->on('end', function () use ($request) { | ||
$request->emit('end'); | ||
}); | ||
$conn->on('data', function ($data) use ($request) { | ||
$request->emit('data', array($data)); | ||
}); | ||
$that->handleRequest($conn, $request, $bodyBuffer); | ||
}); | ||
|
||
$listener = array($parser, 'feed'); | ||
$conn->on('data', $listener); | ||
$parser->on('error', function() use ($conn, $listener, $that) { | ||
// TODO: return 400 response | ||
|
@@ -62,7 +57,24 @@ public function handleRequest(ConnectionInterface $conn, Request $request, $body | |
return; | ||
} | ||
|
||
$stream = $conn; | ||
if ($request->hasHeader('Transfer-Encoding')) { | ||
$transferEncodingHeader = $request->getHeader('Transfer-Encoding'); | ||
// 'chunked' must always be the final value of 'Transfer-Encoding' according to: https://tools.ietf.org/html/rfc7230#section-3.3.1 | ||
if (strtolower(end($transferEncodingHeader)) === 'chunked') { | ||
$stream = new ChunkedDecoder($conn); | ||
} | ||
} | ||
|
||
$stream->on('data', function ($data) use ($request) { | ||
$request->emit('data', array($data)); | ||
}); | ||
|
||
$stream->on('end', function () use ($request) { | ||
$request->emit('end', array()); | ||
}); | ||
|
||
$this->emit('request', array($request, $response)); | ||
$request->emit('data', array($bodyBuffer)); | ||
$conn->emit('data', array($bodyBuffer)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just a heads up: Will likely cause a merge conflict with #108. |
||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@internal
?