summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/private/files/storage/dav.php93
-rw-r--r--lib/private/http/client/client.php3
-rw-r--r--lib/private/http/client/response.php15
-rw-r--r--lib/public/http/client/iresponse.php2
4 files changed, 46 insertions, 67 deletions
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 6e89dcccbcd..c1cf17abdee 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -40,6 +40,7 @@ use OC\Files\Filesystem;
use OC\Files\Stream\Close;
use Icewind\Streams\IteratorDirectory;
use OC\MemCache\ArrayCache;
+use OCP\AppFramework\Http;
use OCP\Constants;
use OCP\Files;
use OCP\Files\FileInfo;
@@ -77,6 +78,8 @@ class DAV extends Common {
private $statCache;
/** @var array */
private static $tempFiles = [];
+ /** @var \OCP\Http\Client\IClientService */
+ private $httpClientService;
/**
* @param array $params
@@ -84,6 +87,7 @@ class DAV extends Common {
*/
public function __construct($params) {
$this->statCache = new ArrayCache();
+ $this->httpClientService = \OC::$server->getHTTPClientService();
if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
$host = $params['host'];
//remove leading http[s], will be generated in createBaseUri()
@@ -232,7 +236,7 @@ class DAV extends Common {
* If not, request it from the server then store to cache.
*
* @param string $path path to propfind
- *
+ *
* @return array propfind response
*
* @throws NotFound
@@ -337,38 +341,22 @@ class DAV extends Common {
if (!$this->file_exists($path)) {
return false;
}
- //straight up curl instead of sabredav here, sabredav put's the entire get result in memory
- $curl = curl_init();
- $fp = fopen('php://temp', 'r+');
- curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
- curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($path));
- curl_setopt($curl, CURLOPT_FILE, $fp);
- curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
- if(defined('CURLOPT_PROTOCOLS')) {
- curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
- }
- if(defined('CURLOPT_REDIR_PROTOCOLS')) {
- curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
- }
- if ($this->secure === true) {
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
- curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
- if ($this->certPath) {
- curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
- }
- }
-
- curl_exec($curl);
- $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
- if ($statusCode !== 200) {
- Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, Util::ERROR);
- if ($statusCode === 423) {
+ $response = $this->httpClientService
+ ->newClient()
+ ->get($this->createBaseUri() . $this->encodePath($path), [
+ 'auth' => [$this->user, $this->password],
+ 'stream' => true
+ ]);
+
+ if ($response->getStatusCode() !== Http::STATUS_OK) {
+ if ($response->getStatusCode() === Http::STATUS_LOCKED) {
throw new \OCP\Lock\LockedException($path);
+ } else {
+ Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), Util::ERROR);
}
}
- curl_close($curl);
- rewind($fp);
- return $fp;
+
+ return $response->getBody();
case 'w':
case 'wb':
case 'a':
@@ -478,38 +466,19 @@ class DAV extends Common {
*/
protected function uploadFile($path, $target) {
$this->init();
+
// invalidate
$target = $this->cleanPath($target);
$this->statCache->remove($target);
$source = fopen($path, 'r');
- $curl = curl_init();
- curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
- curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($target));
- curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
- curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
- curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
- curl_setopt($curl, CURLOPT_PUT, true);
- curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
- curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
- if ($this->secure === true) {
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
- curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
- if ($this->certPath) {
- curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
- }
- }
- curl_exec($curl);
- $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
- if ($statusCode !== 200) {
- Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, Util::ERROR);
- if ($statusCode === 423) {
- throw new \OCP\Lock\LockedException($path);
- }
- }
- curl_close($curl);
- fclose($source);
+ $this->httpClientService
+ ->newClient()
+ ->put($this->createBaseUri() . $this->encodePath($target), [
+ 'body' => $source,
+ 'auth' => [$this->user, $this->password]
+ ]);
+
$this->removeCachedFile($target);
}
@@ -768,7 +737,7 @@ class DAV extends Common {
if ($e->getHttpStatus() === 404 || $e->getHttpStatus() === 405) {
if ($path === '') {
// if root is gone it means the storage is not available
- throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+ throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
}
return false;
}
@@ -802,19 +771,19 @@ class DAV extends Common {
}
if ($e->getHttpStatus() === 401) {
// either password was changed or was invalid all along
- throw new StorageInvalidException(get_class($e).': '.$e->getMessage());
+ throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
} else if ($e->getHttpStatus() === 405) {
// ignore exception for MethodNotAllowed, false will be returned
return;
}
- throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+ throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
} else if ($e instanceof ClientException) {
// connection timeout or refused, server could be temporarily down
- throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+ throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
} else if ($e instanceof \InvalidArgumentException) {
// parse error because the server returned HTML instead of XML,
// possibly temporarily down
- throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+ throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
} else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
// rethrow
throw $e;
diff --git a/lib/private/http/client/client.php b/lib/private/http/client/client.php
index 323fc0d324f..b0aff10a413 100644
--- a/lib/private/http/client/client.php
+++ b/lib/private/http/client/client.php
@@ -120,7 +120,8 @@ class Client implements IClient {
*/
public function get($uri, array $options = []) {
$response = $this->client->get($uri, $options);
- return new Response($response);
+ $isStream = isset($options['stream']) && $options['stream'];
+ return new Response($response, $isStream);
}
/**
diff --git a/lib/private/http/client/response.php b/lib/private/http/client/response.php
index 4e9df51d77f..558482491d1 100644
--- a/lib/private/http/client/response.php
+++ b/lib/private/http/client/response.php
@@ -34,17 +34,26 @@ class Response implements IResponse {
private $response;
/**
+ * @var bool
+ */
+ private $stream;
+
+ /**
* @param GuzzleResponse $response
+ * @param bool $stream
*/
- public function __construct(GuzzleResponse $response) {
+ public function __construct(GuzzleResponse $response, $stream = false) {
$this->response = $response;
+ $this->stream = $stream;
}
/**
- * @return string
+ * @return string|resource
*/
public function getBody() {
- return $this->response->getBody()->getContents();
+ return $this->stream ?
+ $this->response->getBody()->detach():
+ $this->response->getBody()->getContents();
}
/**
diff --git a/lib/public/http/client/iresponse.php b/lib/public/http/client/iresponse.php
index 0e0ef4c5014..92bb7af82dd 100644
--- a/lib/public/http/client/iresponse.php
+++ b/lib/public/http/client/iresponse.php
@@ -30,7 +30,7 @@ namespace OCP\Http\Client;
*/
interface IResponse {
/**
- * @return string
+ * @return string|resource
* @since 8.1.0
*/
public function getBody();
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 19:10:57 +0000