sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents 

Use HTTPClient instead of file_get_contents
remotes/origin/design-experiment
Thomas Müller 2016-03-09 12:20:06 +07:00
parent 3608421800 8214fae9ae
commit 30cec687ae
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
apps/files_sharing/lib/external/storage.php vendored
Unescape Escape View File

@ -25,6 +25,8 @@
namespace OCA\Files_Sharing\External;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ConnectException;
use OC\Files\Storage\DAV;
use OC\ForbiddenException;
use OCA\FederatedFileSharing\DiscoveryManager;
@ -34,36 +36,21 @@ use OCP\Files\StorageInvalidException;
use OCP\Files\StorageNotAvailableException;
class Storage extends DAV implements ISharedStorage {
/**
* @var string
*/
/** @var string */
private $remoteUser;
/**
* @var string
*/
/** @var string */
private $remote;
/**
* @var string
*/
/** @var string */
private $mountPoint;
/**
* @var string
*/
/** @var string */
private $token;
/**
* @var \OCP\ICacheFactory
*/
/** @var \OCP\ICacheFactory */
private $memcacheFactory;
/**
* @var \OCP\ICertificateManager
*/
/** @var \OCP\Http\Client\IClientService */
private $httpClient;
/** @var \OCP\ICertificateManager */
private $certificateManager;
/** @var bool */
private $updateChecked = false;
/**
@ -73,6 +60,7 @@ class Storage extends DAV implements ISharedStorage {
public function __construct($options) {
$this->memcacheFactory = \OC::$server->getMemCacheFactory();
$this->httpClient = \OC::$server->getHTTPClientService();
$discoveryManager = new DiscoveryManager(
$this->memcacheFactory,
\OC::$server->getHTTPClientService()
@ -257,9 +245,17 @@ class Storage extends DAV implements ISharedStorage {
return (bool)$cache->get($url);
}
$result = file_get_contents($url);
$data = json_decode($result);
$returnValue = (is_object($data) and !empty($data->version));
$client = $this->httpClient->newClient();
try {
$result = $client->get($url)->getBody();
$data = json_decode($result);
$returnValue = (is_object($data) && !empty($data->version));
} catch (ConnectException $e) {
$returnValue = false;
} catch (ClientException $e) {
$returnValue = false;
}
$cache->set($url, $returnValue);
return $returnValue;
}