octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-28 12:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #748 from terrafrost/ssh-custom-socket-2.0

Browse Source 
SSH2: make it so you can connect using open sockets / 2.0 branch

* terrafrost/ssh-custom-socket-2.0:
  SSH2: move where $host is defined
  SSH2: make it so you can connect using open sockets
This commit is contained in:
Andreas Fischer 2015-07-21 12:53:32 +02:00
commit 650a4ce266
2 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
phpseclib/Net/SSH2.php
View File

@ -869,7 +869,9 @@ class SSH2
/** /**
* Default Constructor. * Default Constructor.
* *
* @param String $host * $host can either be a string, representing the host, or a stream resource.
*
* @param Mixed $host
* @param optional Integer $port * @param optional Integer $port
* @param optional Integer $timeout * @param optional Integer $timeout
* @see \phpseclib\Net\SSH2::login() * @see \phpseclib\Net\SSH2::login()
@ -954,9 +956,16 @@ class SSH2
34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST') 34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST')
); );
$this->host = $host; if (is_resource($host)) {
$this->port = $port; $this->fsock = $host;
$this->timeout = $timeout; return;
}
if (is_string($host)) {
$this->host = $host;
$this->port = $port;
$this->timeout = $timeout;
}
} }
/** /**
@ -989,23 +998,24 @@ class SSH2
$this->curTimeout = $this->timeout; $this->curTimeout = $this->timeout;
$host = $this->host . ':' . $this->port;
$this->last_packet = microtime(true); $this->last_packet = microtime(true);
$start = microtime(true); if (!is_resource($this->fsock)) {
$this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout); $start = microtime(true);
if (!$this->fsock) { $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout);
user_error(rtrim("Cannot connect to $host. Error $errno. $errstr")); if (!$this->fsock) {
return false; $host = $this->host . ':' . $this->port;
} user_error(rtrim("Cannot connect to $host. Error $errno. $errstr"));
$elapsed = microtime(true) - $start; return false;
}
$elapsed = microtime(true) - $start;
$this->curTimeout-= $elapsed; $this->curTimeout-= $elapsed;
if ($this->curTimeout <= 0) { if ($this->curTimeout <= 0) {
$this->is_timeout = true; $this->is_timeout = true;
return false; return false;
}
} }
/* According to the SSH2 specs, /* According to the SSH2 specs,

13
tests/Functional/Net/SSH2Test.php
View File

@ -87,4 +87,17 @@ class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase
$this->assertInternalType('string', $ssh->getServerPublicHostKey()); $this->assertInternalType('string', $ssh->getServerPublicHostKey());
} }
public function testOpenSocketConnect()
{
$fsock = fsockopen($this->getEnv('SSH_HOSTNAME'), 22);
$ssh = new SSH2($fsock);
$username = $this->getEnv('SSH_USERNAME');
$password = $this->getEnv('SSH_PASSWORD');
$this->assertTrue(
$ssh->login($username, $password),
'SSH2 login using an open socket failed.'
);
}
} }