Browse Source

send ca cert path to sabredav client

remotes/origin/stable5
Bjoern Schiessle 14 years ago
parent
commit
f86ecb3bf7
  1. 9
      3rdparty/Sabre/DAV/Client.php
  2. 3
      apps/files_external/lib/webdav.php

9
3rdparty/Sabre/DAV/Client.php

@ -22,6 +22,7 @@ class Sabre_DAV_Client {
protected $userName;
protected $password;
protected $proxy;
protected $capath;
/**
* Constructor
@ -49,6 +50,11 @@ class Sabre_DAV_Client {
'proxy'
);
$this->capath = '';
if (isset($settings['capath'])) {
$this->capath = $settings['capath'];
}
foreach($validSettings as $validSetting) {
if (isset($settings[$validSetting])) {
$this->$validSetting = $settings[$validSetting];
@ -249,9 +255,12 @@ class Sabre_DAV_Client {
// Automatically follow redirects
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 5,
CURLOPT_SSL_VERIFYPEER => true,
//CURLOPT_SSL_VERIFYPEER => false,
);
if ($this->capath != '') $curlSettings[CURLOPT_CAPATH] = $this->capath;
switch ($method) {
case 'PUT':
$curlSettings[CURLOPT_PUT] = true;

3
apps/files_external/lib/webdav.php

@ -36,10 +36,13 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
$this->root.='/';
}
$caview = \OCP\Files::getStorage('files_external');
$capath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("");
$settings = array(
'baseUri' => $this->createBaseUri(),
'userName' => $this->user,
'password' => $this->password,
'capath' => $capath,
);
$this->client = new Sabre_DAV_Client($settings);

Loading…
Cancel
Save