wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9720 from owncloud/sftp-stream-wrapper-new-connection

Browse source 
Pass existing Net_SFTP object into Net_SFTP_Stream.
This commit is contained in:
Vincent Petry 2014-07-18 19:19:33 +02:00
commit c8a2418815
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/files_external/lib/sftp.php
View file

@ -17,6 +17,9 @@ class SFTP extends \OC\Files\Storage\Common {
private $password;
private $root;
/**
* @var \Net_SFTP
*/
private $client;
private static $tempFiles = array();
@ -231,8 +234,8 @@ class SFTP extends \OC\Files\Storage\Common {
case 'x+':
case 'c':
case 'c+':
// FIXME: make client login lazy to prevent it when using fopen()
return fopen($this->constructUrl($path), $mode);
$context = stream_context_create(array('sftp' => array('session' => $this->client)));
return fopen($this->constructUrl($path), $mode, false, $context);
}
} catch (\Exception $e) {
}
@ -294,7 +297,10 @@ class SFTP extends \OC\Files\Storage\Common {
* @param string $path
*/
public function constructUrl($path) {
$url = 'sftp://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
// Do not pass the password here. We want to use the Net_SFTP object
// supplied via stream context or fail. We only supply username and
// hostname because this might show up in logs (they are not used).
$url = 'sftp://'.$this->user.'@'.$this->host.$this->root.$path;
return $url;
}
}