robin/smb
1
0
Fork 0
mirror of https://codeberg.org/icewind/SMB.git synced 2026-06-03 17:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

use authentication files

Browse source
This commit is contained in:
Robin Appelman 2014-07-21 20:26:24 +02:00
commit d18b9db9c0
3 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Share.php
View file

@ -40,11 +40,10 @@ class Share implements IShare {
if ($this->connection and $this->connection->isValid()) {
return;
}
$command = Server::CLIENT . ' -U ' . escapeshellarg($this->server->getUser()) .
$command = Server::CLIENT . ' --authentication-file=/proc/self/fd/3' .
' //' . $this->server->getHost() . '/' . $this->name;
$this->connection = new Connection($command);
$this->connection->write($this->server->getPassword());
$this->connection->readLine(); // discard password prompt
$this->connection->writeAuthentication($this->server->getUser(), $this->server->getPassword());
if (!$this->connection->isValid()) {
throw new ConnectionError();
}
@ -212,13 +211,11 @@ class Share implements IShare {
public function read($source) {
$source = $this->escapePath($source);
// since we do binary transfer over STDOUT we create a new connection
$command = Server::CLIENT . ' -U ' . escapeshellarg($this->server->getUser()) .
$command = Server::CLIENT . ' --authentication-file=/proc/self/fd/3' .
' //' . $this->server->getHost() . '/' . $this->name
. ' -c \'get ' . $source . ' -\'';
// because we're piping the files content over STOUT using the password prompt is no option here
$connection = new Connection($command, array(
'PASSWD' => $this->server->getPassword()
));
$connection = new Connection($command);
$connection->writeAuthentication($this->server->getUser(), $this->server->getPassword());
$fh = $connection->getOutputStream();
//save the connection as context of the stream to prevent it going out of scope and cleaning up the resource
stream_context_set_option($fh, 'file', 'connection', $connection);