Skip to content

Exec: Store current working directory #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exec: Store current working directory #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/Ssh/Exec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,42 @@
*/
class Exec extends Subsystem
{
protected $cwd;
protected $storeCwd = false;

protected function createResource()
{
$this->resource = $this->getSessionResource();
}

public function run($cmd, $pty = null, array $env = array(), $width = 80, $height = 25, $width_height_type = SSH2_TERM_UNIT_CHARS)
{
$cmd .= ';echo -ne "[return_code:$?]"';
if ($this->cwd && $this->storeCwd) {
$cmd = 'cd '.escapeshellarg($this->cwd).';'.$cmd;
}

$cmd .= ';echo -ne "\\0" "$?" "\\0";pwd';
$stdout = ssh2_exec($this->getResource(), $cmd, $pty, $env, $width, $height, $width_height_type);
$stderr = ssh2_fetch_stream($stdout, SSH2_STREAM_STDERR);
stream_set_blocking($stderr, true);
stream_set_blocking($stdout, true);

$output = stream_get_contents($stdout);
preg_match('/\[return_code:(.*?)\]/', $output, $match);
if ((int) $match[1] !== 0) {
throw new RuntimeException(stream_get_contents($stderr), (int) $match[1]);
preg_match('/^(.*)\\0 (\d+) \\0([^\\0]+)$/s', $output, $match);

list($_, $output, $retcode, $cwd) = $match;

$this->cwd = rtrim($cwd, "\r\n");

if ((int) $retcode !== 0) {
throw new RuntimeException(stream_get_contents($stderr), (int) $retcode);
}

return preg_replace('/\[return_code:(.*?)\]/', '', $output);
return $output;
}

public function setStoreCwd($store)
{
$this->storeCwd = $store;
}
}
25 changes: 24 additions & 1 deletion tests/Ssh/FunctionalTests/ExecTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,28 @@ public function testExecuteErrorOutput()

$this->assertEquals('', trim($output));
}

public function testExecuteWithStoreCwd()
{
$configuration = new Configuration('localhost');
$authentication = new Password(TEST_USER, TEST_PASSWORD);
$session = new Session($configuration, $authentication);

$exec = $session->getExec();
$exec->setStoreCwd(true);

$output = $exec->run('pwd');
$this->assertEquals(getenv('HOME'), trim($output));

$exec->run('cd /');

$output = $exec->run('pwd');
$this->assertEquals('/', trim($output));

$exec->run('cd ~');

$output = $exec->run('pwd');
$this->assertEquals(getenv('HOME'), trim($output));
}
}