Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Support force_ip_resolve in StreamHandler #1659

Merged
merged 3 commits into from
May 1, 2017
Merged

Support force_ip_resolve in StreamHandler #1659

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e980738
Support force_ip_resolve in StreamHandler
c960657 Nov 15, 2016
fbab002
Review fixes
c960657 Dec 29, 2016
eb79b37
Merge branch 'master' into force-ip-resolve-stream
c960657 Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/Handler/StreamHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Http\Message\UriInterface;

/**
* HTTP handler that uses PHP's HTTP stream wrapper.
Expand Down Expand Up @@ -301,21 +302,44 @@ private function createStream(RequestInterface $request, array $options)
);
}

$uri = $this->resolveUri($request->getUri(), $options);

$context = $this->createResource(
function () use ($context, $params) {
return stream_context_create($context, $params);
}
);

return $this->createResource(
function () use ($request, &$http_response_header, $context) {
$resource = fopen((string) $request->getUri()->withFragment(''), 'r', null, $context);
function () use ($uri, &$http_response_header, $context) {
$resource = fopen((string) $uri, 'r', null, $context);
$this->lastHeaders = $http_response_header;
return $resource;
}
);
}

private function resolveUri(UriInterface $uri, array $options)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe call it resolveIp or resolveAddress? Since that's what we do here, isn't it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I chose the name resolveHost (we are resolving the hostname to an IP address).

{
if (isset($options['force_ip_resolve'])) {
if ('v4' === $options['force_ip_resolve']) {
$records = dns_get_record($uri->getHost(), DNS_A);
if (!isset($records[0]['ip'])) {
throw new ConnectException("Could not resolve IPv4 address for host '{$uri->getHost()}'", $request);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please use sprintf instead? I am not really fan of this kind of resolution.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

}
$uri = $uri->withHost($records[0]['ip']);
} elseif ('v6' === $options['force_ip_resolve']) {
$records = dns_get_record($uri->getHost(), DNS_AAAA);
if (!isset($records[0]['ipv6'])) {
throw new ConnectException("Could not resolve IPv6 address for host '{$uri->getHost()}'", $request);
}
$uri = $uri->withHost('[' . $records[0]['ipv6'] . ']');
}
}

return $uri;
}

private function getDefaultContext(RequestInterface $request)
{
$headers = '';
Expand Down