-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29325 from owncloud/stable10-fix-quota-fedsharing…
…-new [stable10] Fix quota federated sharing (new)
- Loading branch information
Showing
12 changed files
with
1,701 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| <?php | ||
| /** | ||
| * @author Vincent Petry <[email protected]> | ||
| * | ||
| * @copyright Copyright (c) 2017, ownCloud GmbH | ||
| * @license AGPL-3.0 | ||
| * | ||
| * This code is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License, version 3, | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License, version 3, | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/> | ||
| * | ||
| */ | ||
|
|
||
| namespace OC\Http\Client; | ||
|
|
||
| use OCP\Http\Client\IWebDavClientService; | ||
| use OCP\IConfig; | ||
| use OCP\ICertificateManager; | ||
| use Sabre\DAV\Client; | ||
|
|
||
| /** | ||
| * Class WebDavClientService | ||
| * | ||
| * @package OC\Http | ||
| */ | ||
| class WebDavClientService implements IWebDavClientService { | ||
| /** @var IConfig */ | ||
| private $config; | ||
| /** @var ICertificateManager */ | ||
| private $certificateManager; | ||
|
|
||
| /** | ||
| * @param IConfig $config | ||
| * @param ICertificateManager $certificateManager | ||
| */ | ||
| public function __construct(IConfig $config, | ||
| ICertificateManager $certificateManager) { | ||
| $this->config = $config; | ||
| $this->certificateManager = $certificateManager; | ||
| } | ||
|
|
||
| /** | ||
| * Instantiate new Sabre client | ||
| * | ||
| * Settings are provided through the 'settings' argument. The following | ||
| * settings are supported: | ||
| * | ||
| * * baseUri | ||
| * * userName (optional) | ||
| * * password (optional) | ||
| * * proxy (optional) | ||
| * * authType (optional) | ||
| * * encoding (optional) | ||
| * | ||
| * authType must be a bitmap, using self::AUTH_BASIC, self::AUTH_DIGEST | ||
| * and self::AUTH_NTLM. If you know which authentication method will be | ||
| * used, it's recommended to set it, as it will save a great deal of | ||
| * requests to 'discover' this information. | ||
| * | ||
| * Encoding is a bitmap with one of the ENCODING constants. | ||
| * | ||
| * @param array $settings Sabre client settings | ||
| * @return Client | ||
| */ | ||
| public function newClient($settings) { | ||
| if (!isset($settings['proxy'])) { | ||
| $proxy = $this->config->getSystemValue('proxy', ''); | ||
| if($proxy !== '') { | ||
| $settings['proxy'] = $proxy; | ||
| } | ||
| } | ||
|
|
||
| $certPath = null; | ||
| if (strpos($settings['baseUri'], 'https') === 0) { | ||
| $certPath = $this->certificateManager->getAbsoluteBundlePath(); | ||
| if (!file_exists($certPath)) { | ||
| $certPath = null; | ||
| } | ||
| } | ||
|
|
||
| $client = new Client($settings); | ||
| $client->setThrowExceptions(true); | ||
|
|
||
| if ($certPath !== null) { | ||
| $client->addCurlSetting(CURLOPT_CAINFO, $certPath); | ||
| } | ||
| return $client; | ||
| } | ||
| } |
Oops, something went wrong.