mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfile 

Check for cert bundle existence before using it
This commit is contained in:
Vincent Petry 2014-11-04 20:05:49 +01:00
parent 9323ba53b1 ee6d8c9d58
commit 140faf2c30
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files_sharing/lib/external/storage.php vendored
View File

@ -198,12 +198,19 @@ class Storage extends DAV implements ISharedStorage {
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
curl_setopt($ch, CURLOPT_CAINFO, $this->certificateManager->getCertificateBundle()); $path = $this->certificateManager->getCertificateBundle();
if (is_readable($path)) {
curl_setopt($ch, CURLOPT_CAINFO, $path);
}
$result = curl_exec($ch); $result = curl_exec($ch);
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE); $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$errorMessage = curl_error($ch);
curl_close($ch); curl_close($ch);
if (!empty($errorMessage)) {
throw new \Exception($errorMessage);
}
switch ($status) { switch ($status) {
case 401: case 401: