-
Notifications
You must be signed in to change notification settings - Fork 53
Add Content-type plugin to set content-type header automatically #85
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
Changes from 7 commits
889f2df
5d43a86
9ef69cf
2d1a885
bc7b746
77d63c4
6162941
e6ba6f1
93c6bf2
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,109 @@ | ||
<?php | ||
|
||
namespace spec\Http\Client\Common\Plugin; | ||
|
||
use PhpSpec\Exception\Example\SkippingException; | ||
use Psr\Http\Message\RequestInterface; | ||
use Psr\Http\Message\StreamInterface; | ||
use PhpSpec\ObjectBehavior; | ||
use Prophecy\Argument; | ||
|
||
class ContentTypePluginSpec extends ObjectBehavior | ||
{ | ||
function it_is_initializable() | ||
{ | ||
$this->shouldHaveType('Http\Client\Common\Plugin\ContentTypePlugin'); | ||
} | ||
|
||
function it_is_a_plugin() | ||
{ | ||
$this->shouldImplement('Http\Client\Common\Plugin'); | ||
} | ||
|
||
function it_adds_json_content_type_header(RequestInterface $request) | ||
{ | ||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false); | ||
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for(json_encode(['foo' => 'bar']))); | ||
$request->withHeader('Content-Type', 'application/json')->shouldBeCalled()->willReturn($request); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
function it_adds_xml_content_type_header(RequestInterface $request) | ||
{ | ||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false); | ||
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>')); | ||
$request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
function it_does_not_set_content_type_header(RequestInterface $request) | ||
{ | ||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false); | ||
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('foo')); | ||
$request->withHeader('Content-Type', null)->shouldNotBeCalled(); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
function it_does_not_set_content_type_header_if_already_one(RequestInterface $request) | ||
{ | ||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(true); | ||
$request->getBody()->shouldNotBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('foo')); | ||
$request->withHeader('Content-Type', null)->shouldNotBeCalled(); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
function it_does_not_set_content_type_header_if_size_0_or_unknown(RequestInterface $request) | ||
{ | ||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false); | ||
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for()); | ||
$request->withHeader('Content-Type', null)->shouldNotBeCalled(); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
function it_adds_xml_content_type_header_if_size_limit_is_not_reached_using_default_value(RequestInterface $request) | ||
{ | ||
$this->beConstructedWith([ | ||
'skip_detection' => true | ||
]); | ||
|
||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false); | ||
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>')); | ||
$request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
function it_adds_xml_content_type_header_if_size_limit_is_not_reached(RequestInterface $request) | ||
{ | ||
$this->beConstructedWith([ | ||
'skip_detection' => true, | ||
'size_limit' => 32000000 | ||
]); | ||
|
||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false); | ||
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>')); | ||
$request->withHeader('Content-Type', 'application/xml')->shouldBeCalled()->willReturn($request); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
function it_does_not_set_content_type_header_if_size_limit_is_reached(RequestInterface $request) | ||
{ | ||
$this->beConstructedWith([ | ||
'skip_detection' => true, | ||
'size_limit' => 8 | ||
]); | ||
|
||
$request->hasHeader('Content-Type')->shouldBeCalled()->willReturn(false); | ||
$request->getBody()->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\stream_for('<foo>bar</foo>')); | ||
$request->withHeader('Content-Type', null)->shouldNotBeCalled(); | ||
|
||
$this->handleRequest($request, function () {}, function () {}); | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,123 @@ | ||
<?php | ||
|
||
namespace Http\Client\Common\Plugin; | ||
|
||
use Http\Client\Common\Plugin; | ||
use Psr\Http\Message\RequestInterface; | ||
use Psr\Http\Message\StreamInterface; | ||
use Symfony\Component\OptionsResolver\OptionsResolver; | ||
|
||
/** | ||
* Allow to set the correct content type header on the request automatically only if it is not set. | ||
* | ||
* @author Karim Pinchon <[email protected]> | ||
*/ | ||
final class ContentTypePlugin implements Plugin | ||
{ | ||
/** | ||
* Allow to disable the content type detection when stream is too large (as it can consume a lot of resource). | ||
* | ||
* @var bool | ||
* | ||
* true skip the content type detection | ||
* false detect the content type (default value) | ||
*/ | ||
protected $skipDetection; | ||
|
||
/** | ||
* Determine the size stream limit for which the detection as to be skipped (default to 16Mb). | ||
* | ||
* @var int | ||
*/ | ||
protected $sizeLimit; | ||
|
||
/** | ||
* @param array $config { | ||
* | ||
* @var bool $skip_detection True skip detection if stream size is bigger than $size_limit. | ||
* @var int $size_limit size stream limit for which the detection as to be skipped. | ||
* } | ||
*/ | ||
public function __construct(array $config = []) | ||
{ | ||
$resolver = new OptionsResolver(); | ||
$resolver->setDefaults([ | ||
'skip_detection' => false, | ||
'size_limit' => 16000000, | ||
]); | ||
$resolver->setAllowedTypes('skip_detection', 'bool'); | ||
$resolver->setAllowedTypes('size_limit', 'int'); | ||
|
||
$options = $resolver->resolve($config); | ||
|
||
$this->skipDetection = $options['skip_detection']; | ||
$this->sizeLimit = $options['size_limit']; | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function handleRequest(RequestInterface $request, callable $next, callable $first) | ||
{ | ||
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. We should avoid content type detection if stream is not rewindable |
||
if (!$request->hasHeader('Content-Type')) { | ||
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. We should early return here if the body size of the stream is equal to 0 |
||
$stream = $request->getBody(); | ||
$streamSize = $stream->getSize(); | ||
|
||
if (!$stream->isSeekable()) { | ||
return $next($request); | ||
} | ||
|
||
if (0 == $streamSize) { | ||
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. We should use strict comparison and then do an extra one for checking if null. 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. Not here, as we skip every stream that has a size equal to null, don't we want to skip only thoses with skipDetection and null size ? I mean if stream is rewindable, but we cannot determine it's size but still want to auto detect the content type why skipping this ? 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. I agree, I made it too quickly. |
||
return $next($request); | ||
} | ||
|
||
if ($this->skipDetection && $streamSize >= $this->sizeLimit) { | ||
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 $streamSize == null? |
||
return $next($request); | ||
} | ||
|
||
if ($this->isJson($stream)) { | ||
$request = $request->withHeader('Content-Type', 'application/json'); | ||
|
||
return $next($request); | ||
} | ||
|
||
if ($this->isXml($stream)) { | ||
$request = $request->withHeader('Content-Type', 'application/xml'); | ||
|
||
return $next($request); | ||
} | ||
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. Some content type that can be added to check (but not necessarly in this PR) :
|
||
} | ||
|
||
return $next($request); | ||
} | ||
|
||
/** | ||
* @param $stream StreamInterface | ||
* | ||
* @return bool | ||
*/ | ||
private function isJson($stream) | ||
{ | ||
$stream->rewind(); | ||
|
||
json_decode($stream->getContents()); | ||
|
||
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. We should rewind the stream here |
||
return json_last_error() == JSON_ERROR_NONE; | ||
} | ||
|
||
/** | ||
* @param $stream StreamInterface | ||
* | ||
* @return \SimpleXMLElement|false | ||
*/ | ||
private function isXml($stream) | ||
{ | ||
$stream->rewind(); | ||
|
||
$previousValue = libxml_use_internal_errors(true); | ||
$isXml = simplexml_load_string($stream->getContents()); | ||
libxml_use_internal_errors($previousValue); | ||
|
||
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. We should rewind the stream here |
||
return $isXml; | ||
} | ||
} |
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.
May be nice to add some options to this plugin to avoid detection on too large stream, or stream with a null size