- update SSH1 logging and disconnecting

- add better support for an as-yet-to-be-written SCP class - update example of read() git-svn-id: http://phpseclib.svn.sourceforge.net/svnroot/phpseclib/trunk@158 21d32557-59b3-4da0-833f-c5933fad653e
phpseclib · May 8, 2011 · 34cdb78 · 34cdb78
1 parent c61b3f9
commit 34cdb78
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 41 deletions.
diff --git a/phpseclib/Net/SSH1.php b/phpseclib/Net/SSH1.php
@@ -30,9 +30,9 @@
  *        exit('Login Failed');
  *    }
  *
- *    echo $ssh->read('%');
- *    $ssh->write("ls -la\r\n");
- *    echo $ssh->read('%');
+ *    echo $ssh->read('username@username:~$');
+ *    $ssh->write("ls -la\n");
+ *    echo $ssh->read('username@username:~$');
  * ?>
  * </code>
  *
@@ -444,6 +444,7 @@ function Net_SSH1($host, $port = 22, $timeout = 10, $cipher = NET_SSH1_CIPHER_3D
             16 => 'NET_SSH1_CMSG_STDIN_DATA',
             17 => 'NET_SSH1_SMSG_STDOUT_DATA',
             18 => 'NET_SSH1_SMSG_STDERR_DATA',
+            19 => 'NET_SSH1_CMSG_EOF',
             20 => 'NET_SSH1_SMSG_EXITSTATUS',
             33 => 'NET_SSH1_CMSG_EXIT_CONFIRMATION'
         );
@@ -644,6 +645,12 @@ function login($username, $password = '')
             return false;
         }
 
+        // remove the username and password from the last logged packet
+        if (defined('NET_SSH1_LOGGING') && NET_SSH1_LOGGING == NET_SSH1_LOG_COMPLEX) {
+            $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen('password'), 'password');
+            $this->message_log[count($this->message_log) - 1] = $data; // zzzzz
+        }
+
         $response = $this->_get_binary_packet();
 
         if ($response[NET_SSH1_RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
@@ -684,23 +691,6 @@ function exec($cmd, $block = true)
             return false;
         }
 
-        // connect using the sample parameters in protocol-1.5.txt.
-        // according to wikipedia.org's entry on text terminals, "the fundamental type of application running on a text
-        // terminal is a command line interpreter or shell".  thus, opening a terminal session to run the shell.
-        $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, NET_SSH1_TTY_OP_END);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_REQUEST_PTY', E_USER_NOTICE);
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[NET_SSH1_RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            user_error('Expected SSH_SMSG_SUCCESS', E_USER_NOTICE);
-            return false;
-        }
-
         $data = pack('CNa*', NET_SSH1_CMSG_EXEC_CMD, strlen($cmd), $cmd);
 
         if (!$this->_send_binary_packet($data)) {
@@ -743,6 +733,9 @@ function exec($cmd, $block = true)
      */
     function _initShell()
     {
+        // connect using the sample parameters in protocol-1.5.txt.
+        // according to wikipedia.org's entry on text terminals, "the fundamental type of application running on a text
+        // terminal is a command line interpreter or shell".  thus, opening a terminal session to run the shell.
         $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, NET_SSH1_TTY_OP_END);
 
         if (!$this->_send_binary_packet($data)) {
@@ -808,16 +801,15 @@ function read($expect, $mode = NET_SSH1_READ_SIMPLE)
             return false;
         }
 
+        $match = $expect;
         while (true) {
-            if ($mode != NET_SSH1_READ_REGEX) {
-                $pos = strpos($this->interactiveBuffer, $expect);
-            } else {
-                $pos = preg_match($expect, $this->interactiveBuffer, $matches) ?
-                       strpos($this->interactiveBuffer, $matches[0]) :
-                       false;
+            if ($mode == NET_SSH1_READ_REGEX) {
+                preg_match($expect, $this->interactiveBuffer, $matches);
+                $match = $matches[0];
             }
+            $pos = strpos($this->interactiveBuffer, $match);
             if ($pos !== false) {
-                return $this->_string_shift($this->interactiveBuffer, $pos + 1);
+                return $this->_string_shift($this->interactiveBuffer, $pos + strlen($match));
             }
             $response = $this->_get_binary_packet();
             $this->interactiveBuffer.= substr($response[NET_SSH1_RESPONSE_DATA], 4);
@@ -921,7 +913,18 @@ function __destruct()
     function _disconnect($msg = 'Client Quit')
     {
         if ($this->bitmap) {
-            $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
+            $data = pack('C', NET_SSH1_CMSG_EOF);
+            $this->_send_binary_packet($data);
+
+            $response = $this->_get_binary_packet();
+            switch ($response[NET_SSH1_RESPONSE_TYPE]) {
+                case NET_SSH1_SMSG_EXITSTATUS:
+                    $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
+                    break;
+                default:
+                    $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
+            }
+
             $this->_send_binary_packet($data);
             fclose($this->fsock);
             $this->bitmap = 0;
@@ -1004,6 +1007,15 @@ function _send_binary_packet($data) {
             return false;
         }
 
+        if (defined('NET_SSH1_LOGGING')) {
+            $temp = isset($this->protocol_flags[ord($data[0])]) ? $this->protocol_flags[ord($data[0])] : 'UNKNOWN';
+            $this->protocol_flags_log[] = '-> ' . $temp .
+                                          ' (' . round($stop - $start, 4) . 's)';
+            if (NET_SSH1_LOGGING == NET_SSH1_LOG_COMPLEX) {
+                $this->message_log[] = substr($data, 1);
+            }
+        }
+
         $length = strlen($data) + 4;
 
         $padding_length = 8 - ($length & 7);
@@ -1025,15 +1037,6 @@ function _send_binary_packet($data) {
         $result = strlen($packet) == fputs($this->fsock, $packet);
         $stop = strtok(microtime(), ' ') + strtok('');
 
-        if (defined('NET_SSH1_LOGGING')) {
-            $temp = isset($this->protocol_flags[ord($data[0])]) ? $this->protocol_flags[ord($data[0])] : 'UNKNOWN';
-            $this->protocol_flags_log[] = '-> ' . $temp .
-                                          ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SSH1_LOGGING == NET_SSH1_LOG_COMPLEX) {
-                $this->message_log[] = substr($data, 1);
-            }
-        }
-
         return $result;
     }
 

diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
@@ -35,9 +35,9 @@
  *        exit('Login Failed');
  *    }
  *
- *    echo $ssh->read('%');
- *    $ssh->write("ls -la\r\n");
- *    echo $ssh->read('%');
+ *    echo $ssh->read('username@username:~$');
+ *    $ssh->write("ls -la\n");
+ *    echo $ssh->read('username@username:~$');
  * ?>
  * </code>
  *
@@ -2005,7 +2005,7 @@ function _filter($payload)
      * @return Mixed
      * @access private
      */
-    function _get_channel_packet($client_channel)
+    function _get_channel_packet($client_channel, $skip_extended = false)
     {
         if (!empty($this->channel_buffers[$client_channel])) {
             return array_shift($this->channel_buffers[$client_channel]);
@@ -2074,6 +2074,9 @@ function _get_channel_packet($client_channel)
                     $this->channel_buffers[$client_channel][] = $data;
                     break;
                 case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
+                    if ($skip_extended) {
+                        break;
+                    }
                     /*
                     if ($client_channel == NET_SSH2_CHANNEL_EXEC) {
                         $this->_send_channel_packet($client_channel, chr(0));