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

escape host name

Browse source
This commit is contained in:
Robin Appelman 2015-08-14 14:08:48 +02:00
commit 6e1f693ad5
3 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Share.php
View file

@ -58,11 +58,10 @@ class Share implements IShare {
return; return;
} }
$workgroupArgument = ($this->server->getWorkgroup()) ? ' -W ' . escapeshellarg($this->server->getWorkgroup()) : ''; $workgroupArgument = ($this->server->getWorkgroup()) ? ' -W ' . escapeshellarg($this->server->getWorkgroup()) : '';
$command = sprintf('%s %s --authentication-file=/proc/self/fd/3 //%s/%s', $command = sprintf('%s %s --authentication-file=/proc/self/fd/3 %s',
Server::CLIENT, Server::CLIENT,
$workgroupArgument, $workgroupArgument,
$this->server->getHost(), escapeshellarg('//' . $this->server->getHost() . '/' . $this->name)
$this->name
); );
$this->connection = new Connection($command); $this->connection = new Connection($command);
$this->connection->writeAuthentication($this->server->getUser(), $this->server->getPassword()); $this->connection->writeAuthentication($this->server->getUser(), $this->server->getPassword());
@ -261,11 +260,10 @@ class Share implements IShare {
// since returned stream is closed by the caller we need to create a new instance // since returned stream is closed by the caller we need to create a new instance
// since we can't re-use the same file descriptor over multiple calls // since we can't re-use the same file descriptor over multiple calls
$workgroupArgument = ($this->server->getWorkgroup()) ? ' -W ' . escapeshellarg($this->server->getWorkgroup()) : ''; $workgroupArgument = ($this->server->getWorkgroup()) ? ' -W ' . escapeshellarg($this->server->getWorkgroup()) : '';
$command = sprintf('%s %s --authentication-file=/proc/self/fd/3 //%s/%s', $command = sprintf('%s %s --authentication-file=/proc/self/fd/3 %s',
Server::CLIENT, Server::CLIENT,
$workgroupArgument, $workgroupArgument,
$this->server->getHost(), escapeshellarg('//' . $this->server->getHost() . '/' . $this->name)
$this->name
); );
$connection = new Connection($command); $connection = new Connection($command);
$connection->writeAuthentication($this->server->getUser(), $this->server->getPassword()); $connection->writeAuthentication($this->server->getUser(), $this->server->getPassword());
@ -290,11 +288,10 @@ class Share implements IShare {
// since returned stream is closed by the caller we need to create a new instance // since returned stream is closed by the caller we need to create a new instance
// since we can't re-use the same file descriptor over multiple calls // since we can't re-use the same file descriptor over multiple calls
$workgroupArgument = ($this->server->getWorkgroup()) ? ' -W ' . escapeshellarg($this->server->getWorkgroup()) : ''; $workgroupArgument = ($this->server->getWorkgroup()) ? ' -W ' . escapeshellarg($this->server->getWorkgroup()) : '';
$command = sprintf('%s %s --authentication-file=/proc/self/fd/3 //%s/%s', $command = sprintf('%s %s --authentication-file=/proc/self/fd/3 %s',
Server::CLIENT, Server::CLIENT,
$workgroupArgument, $workgroupArgument,
$this->server->getHost(), escapeshellarg('//' . $this->server->getHost() . '/' . $this->name)
$this->name
); );
$connection = new Connection($command); $connection = new Connection($command);
$connection->writeAuthentication($this->server->getUser(), $this->server->getPassword()); $connection->writeAuthentication($this->server->getUser(), $this->server->getPassword());

9
tests/Server.php
View file

@ -55,4 +55,13 @@ class Server extends TestCase {
$server = new \Icewind\SMB\Server(uniqid(), $this->config->user, $this->config->password); $server = new \Icewind\SMB\Server(uniqid(), $this->config->user, $this->config->password);
$server->listShares(); $server->listShares();
} }
/**
* @expectedException \Icewind\SMB\Exception\InvalidHostException
*/
public function testHostEscape() {
$server = new \Icewind\SMB\Server($this->config->host . ';asd', $this->config->user, $this->config->password);
$server->listShares();
}
} }

11
tests/Share.php
View file

@ -22,4 +22,15 @@ class Share extends AbstractShare {
} }
$this->share->mkdir($this->root); $this->share->mkdir($this->root);
} }
/**
* @expectedException \Icewind\SMB\Exception\InvalidHostException
*/
public function testHostEscape() {
$this->requireBackendEnv('smbclient');
$this->config = json_decode(file_get_contents(__DIR__ . '/config.json'));
$this->server = new NormalServer($this->config->host . ';asd', $this->config->user, $this->config->password);
$share = $this->server->getShare($this->config->share);
$share->dir($this->root);
}
} }