diff options
Diffstat (limited to 'lib/private/Http/Client/Client.php')
-rw-r--r-- | lib/private/Http/Client/Client.php | 231 |
1 files changed, 223 insertions, 8 deletions
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index 298749d52e1..3bf43e6c07e 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -34,13 +34,16 @@ declare(strict_types=1); namespace OC\Http\Client; use GuzzleHttp\Client as GuzzleClient; +use GuzzleHttp\Promise\PromiseInterface; use GuzzleHttp\RequestOptions; use OCP\Http\Client\IClient; +use OCP\Http\Client\IPromise; use OCP\Http\Client\IResponse; use OCP\Http\Client\LocalServerException; use OCP\ICertificateManager; use OCP\IConfig; use OCP\Security\IRemoteHostValidator; +use Psr\Log\LoggerInterface; use function parse_url; /** @@ -61,7 +64,8 @@ class Client implements IClient { IConfig $config, ICertificateManager $certificateManager, GuzzleClient $client, - IRemoteHostValidator $remoteHostValidator + IRemoteHostValidator $remoteHostValidator, + protected LoggerInterface $logger, ) { $this->config = $config; $this->client = $client; @@ -205,7 +209,7 @@ class Client implements IClient { * 'headers' => [ * 'foo' => 'bar', * ], - * 'cookies' => [' + * 'cookies' => [ * 'foo' => 'bar', * ], * 'allow_redirects' => [ @@ -236,7 +240,7 @@ class Client implements IClient { * 'headers' => [ * 'foo' => 'bar', * ], - * 'cookies' => [' + * 'cookies' => [ * 'foo' => 'bar', * ], * 'allow_redirects' => [ @@ -271,7 +275,7 @@ class Client implements IClient { * 'headers' => [ * 'foo' => 'bar', * ], - * 'cookies' => [' + * 'cookies' => [ * 'foo' => 'bar', * ], * 'allow_redirects' => [ @@ -312,7 +316,7 @@ class Client implements IClient { * 'headers' => [ * 'foo' => 'bar', * ], - * 'cookies' => [' + * 'cookies' => [ * 'foo' => 'bar', * ], * 'allow_redirects' => [ @@ -347,7 +351,7 @@ class Client implements IClient { * 'headers' => [ * 'foo' => 'bar', * ], - * 'cookies' => [' + * 'cookies' => [ * 'foo' => 'bar', * ], * 'allow_redirects' => [ @@ -370,7 +374,7 @@ class Client implements IClient { } /** - * Sends a options request + * Sends an OPTIONS request * * @param string $uri * @param array $options Array such as @@ -382,7 +386,7 @@ class Client implements IClient { * 'headers' => [ * 'foo' => 'bar', * ], - * 'cookies' => [' + * 'cookies' => [ * 'foo' => 'bar', * ], * 'allow_redirects' => [ @@ -403,4 +407,215 @@ class Client implements IClient { $response = $this->client->request('options', $uri, $this->buildRequestOptions($options)); return new Response($response); } + + protected function wrapGuzzlePromise(PromiseInterface $promise): IPromise { + return new GuzzlePromiseAdapter( + $promise, + $this->logger + ); + } + + /** + * Sends an asynchronous GET request + * + * @param string $uri + * @param array $options Array such as + * 'query' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, + * @return IPromise + */ + public function getAsync(string $uri, array $options = []): IPromise { + $this->preventLocalAddress($uri, $options); + $response = $this->client->requestAsync('get', $uri, $this->buildRequestOptions($options)); + return $this->wrapGuzzlePromise($response); + } + + /** + * Sends an asynchronous HEAD request + * + * @param string $uri + * @param array $options Array such as + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, + * @return IPromise + */ + public function headAsync(string $uri, array $options = []): IPromise { + $this->preventLocalAddress($uri, $options); + $response = $this->client->requestAsync('head', $uri, $this->buildRequestOptions($options)); + return $this->wrapGuzzlePromise($response); + } + + /** + * Sends an asynchronous POST request + * + * @param string $uri + * @param array $options Array such as + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, + * @return IPromise + */ + public function postAsync(string $uri, array $options = []): IPromise { + $this->preventLocalAddress($uri, $options); + + if (isset($options['body']) && is_array($options['body'])) { + $options['form_params'] = $options['body']; + unset($options['body']); + } + + return $this->wrapGuzzlePromise($this->client->requestAsync('post', $uri, $this->buildRequestOptions($options))); + } + + /** + * Sends an asynchronous PUT request + * + * @param string $uri + * @param array $options Array such as + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, + * @return IPromise + */ + public function putAsync(string $uri, array $options = []): IPromise { + $this->preventLocalAddress($uri, $options); + $response = $this->client->requestAsync('put', $uri, $this->buildRequestOptions($options)); + return $this->wrapGuzzlePromise($response); + } + + /** + * Sends an asynchronous DELETE request + * + * @param string $uri + * @param array $options Array such as + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, + * @return IPromise + */ + public function deleteAsync(string $uri, array $options = []): IPromise { + $this->preventLocalAddress($uri, $options); + $response = $this->client->requestAsync('delete', $uri, $this->buildRequestOptions($options)); + return $this->wrapGuzzlePromise($response); + } + + /** + * Sends an asynchronous OPTIONS request + * + * @param string $uri + * @param array $options Array such as + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, + * @return IPromise + */ + public function optionsAsync(string $uri, array $options = []): IPromise { + $this->preventLocalAddress($uri, $options); + $response = $this->client->requestAsync('options', $uri, $this->buildRequestOptions($options)); + return $this->wrapGuzzlePromise($response); + } } |