net-ssh 1.1.2 → 1.1.3

data/ChangeLog

@@ -1,3 +1,18 @@
+2008-02-26 07:54  jamis
+
+	* Fix invalid use of socket.send (closes #17857, thanks to
+	  Zbigniew Zemła)
+
+2007-07-11 09:52  jamis
+
+	* nevermind
+
+2007-07-11 08:57  jamis
+
+	* Make sure packets are split in such a way as to preserve a
+	  minimum packet size, to prevent hmacs being split and
+	  causing grief
+
 2007-06-18 12:07  jamis
 
 	* version bump

data/NEWS

@@ -1,6 +1,9 @@
 Net:SSH
 http://rubyforge.org/projects/net-ssh
 
+[1.1.3] 29 Apr 2008
+  * Fixed bug #17857 (Invalid use of @socket.send) [Zbigniew Zemla]
+
 [1.1.2] 18 June 2007
   * Fixed bug #6156 (ruby -w warnings)
 

data/lib/net/ssh/transport/packet-stream.rb

@@ -111,7 +111,16 @@ module Net
 
             encrypted_data = @cipher.update( unencrypted_data ) << @cipher.final
             message = encrypted_data + mac
-            @socket.send message, 0
+            
+	    # send package, in case package was only partially transferred, retry
+	    counter = message.size
+	    while counter > 0
+		begin
+		    counter -= @socket.send message[(message.size-counter)..message.size], 0
+		rescue Errno::EINTR
+		    retry
+		end
+	    end
 
             increment_sequence_number
           end
@@ -195,13 +204,17 @@ module Net
 
         def read( length )
           if IO === @socket
-            data = ""
-            while data.length < length
-              break if @socket.closed?
-              if ( IO.select([@socket],nil,nil,0.01) rescue nil )
-                data << @socket.read(length-data.length)
+    	    data = ""
+            begin
+	      while data.length < length
+                break if @socket.closed?
+                if ( IO.select([@socket],nil,nil,0.01) rescue nil )
+	          data << @socket.read(length-data.length)
+                end
               end
-            end
+	    rescue Error::EINTR
+		retry
+	    end
           else
             data = @socket.recv(length)
           end

data/lib/net/ssh/version.rb

@@ -20,7 +20,7 @@ module Net
 
       MAJOR = 1
       MINOR = 1
-      TINY  = 2
+      TINY  = 3
 
       STRING = [ MAJOR, MINOR, TINY ].join( "." )
 

data/test/transport/tc_packet_stream.rb

@@ -106,6 +106,7 @@ module PacketStream_Mock
 
     def send( text, arg )
       @send_buffer << text
+      text.length
     end
   end
 

metadata

@@ -1,33 +1,34 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2007-06-18 00:00:00 -06:00
-summary: Net::SSH is a pure-Ruby implementation of the SSH2 client protocol.
-require_paths: 
-- lib
-email: jamis@37signals.com
-homepage: http://net-ssh.rubyforge.org
-rubyforge_project: 
-description: 
-autorequire: net/ssh
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.1.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Jamis Buck
+autorequire: net/ssh
+bindir: bin
+cert_chain: []
+
+date: 2008-04-29 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: needle
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
+description: 
+email: jamis@37signals.com
+executables: 
+- rb-keygen
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - bin/rb-keygen
 - doc/LICENSE-BSD
@@ -77,18 +78,6 @@ files:
 - doc/manual/stylesheets/manual.css
 - doc/manual/stylesheets/ruby.css
 - doc/manual/tutorial.erb
-- doc/manual-html
-- doc/manual-html/chapter-1.html
-- doc/manual-html/chapter-2.html
-- doc/manual-html/chapter-3.html
-- doc/manual-html/chapter-4.html
-- doc/manual-html/chapter-5.html
-- doc/manual-html/chapter-6.html
-- doc/manual-html/chapter-7.html
-- doc/manual-html/index.html
-- doc/manual-html/stylesheets
-- doc/manual-html/stylesheets/manual.css
-- doc/manual-html/stylesheets/ruby.css
 - lib/net
 - lib/net/ssh
 - lib/net/ssh/connection
@@ -274,25 +263,31 @@ files:
 - NEWS
 - THANKS
 - ChangeLog
-test_files: 
-- test/ALL-TESTS.rb
+has_rdoc: true
+homepage: http://net-ssh.rubyforge.org
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- rb-keygen
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: needle
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
+rubyforge_project: 
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: Net::SSH is a pure-Ruby implementation of the SSH2 client protocol.
+test_files: 
+- test/ALL-TESTS.rb

data/doc/manual-html/chapter-1.html

@@ -1,388 +0,0 @@
-<html>
-  <head>
-    <title>Net::SSH Manual :: Chapter 1: Introduction</title>
-    <link type="text/css" rel="stylesheet" href="stylesheets/manual.css" />
-  </head>
-  
-  <body>
-    <div id="banner">
-      <table border='0' cellpadding='0' cellspacing='0' width='100%'>
-        <tr><td valign='top' align='left'>
-          <div class="title">
-            <span class="product">Net::SSH&mdash;</span><br />
-            <span class="tagline">Secure Shell for Ruby</span>
-          </div>
-        </td><td valign='middle' align='right'>
-          <div class="info">
-            Net::SSH Version: <strong>1.1.2</strong><br />
-            Manual Last Updated: <strong>2007-06-18 18:12 UTC</strong>
-          </div>
-        </td></tr>
-      </table>
-    </div>
-
-    <table border='0' width='100%' cellpadding='0' cellspacing='0'>
-      <tr><td valign='top'>
-
-        <div id="navigation">
-          <h1>Net::SSH Manual</h1>
-
-          <h2>Chapters</h2>
-          <ol type="I">
-          
-            <li><strong>
-                <a href="chapter-1.html">
-                Introduction
-                </a>
-                </strong> <big>&larr;</big>
-              <ol type="1">
-                
-                  <li><a href="chapter-1.html#s1">What is Net::SSH?</a></li>
-                
-                  <li><a href="chapter-1.html#s2">What isn&#8217;t Net::SSH?</a></li>
-                
-                  <li><a href="chapter-1.html#s3">Getting Net::SSH</a></li>
-                
-                  <li><a href="chapter-1.html#s4">License Information</a></li>
-                
-                  <li><a href="chapter-1.html#s5">Support</a></li>
-                
-                  <li><a href="chapter-1.html#s6">About the Author</a></li>
-                
-              </ol>
-            </li>
-          
-            <li>
-                <a href="chapter-2.html">
-                Starting a Session
-                </a>
-                
-              <ol type="1">
-                
-                  <li><a href="chapter-2.html#s1">Using Net::SSH.start</a></li>
-                
-                  <li><a href="chapter-2.html#s2">Using a Public/Private Key</a></li>
-                
-                  <li><a href="chapter-2.html#s3">Options</a></li>
-                
-                  <li><a href="chapter-2.html#s4">Using Net::SSH::Session</a></li>
-                
-              </ol>
-            </li>
-          
-            <li>
-                <a href="chapter-3.html">
-                Channels
-                </a>
-                
-              <ol type="1">
-                
-                  <li><a href="chapter-3.html#s1">What are Channels?</a></li>
-                
-                  <li><a href="chapter-3.html#s2">Session.loop</a></li>
-                
-                  <li><a href="chapter-3.html#s3">Channel Types</a></li>
-                
-                  <li><a href="chapter-3.html#s4">Opening a Channel</a></li>
-                
-                  <li><a href="chapter-3.html#s5">Callbacks</a></li>
-                
-                  <li><a href="chapter-3.html#s6">Channel Operations</a></li>
-                
-              </ol>
-            </li>
-          
-            <li>
-                <a href="chapter-4.html">
-                Executing Commands
-                </a>
-                
-              <ol type="1">
-                
-                  <li><a href="chapter-4.html#s1">Using Channels</a></li>
-                
-                  <li><a href="chapter-4.html#s2">Using #process.open</a></li>
-                
-                  <li><a href="chapter-4.html#s3">Using #process.popen3</a></li>
-                
-              </ol>
-            </li>
-          
-            <li>
-                <a href="chapter-5.html">
-                User Shells
-                </a>
-                
-              <ol type="1">
-                
-                  <li><a href="chapter-5.html#s1">Introduction</a></li>
-                
-                  <li><a href="chapter-5.html#s2">Using Channels</a></li>
-                
-                  <li><a href="chapter-5.html#s3">Shell Service</a></li>
-                
-                  <li><a href="chapter-5.html#s4">SyncShell Service</a></li>
-                
-                  <li><a href="chapter-5.html#s5">Terminal Clients</a></li>
-                
-              </ol>
-            </li>
-          
-            <li>
-                <a href="chapter-6.html">
-                Port Forwarding
-                </a>
-                
-              <ol type="1">
-                
-                  <li><a href="chapter-6.html#s1">Introduction</a></li>
-                
-                  <li><a href="chapter-6.html#s2">Local-to-Remote</a></li>
-                
-                  <li><a href="chapter-6.html#s3">Remote-to-Local</a></li>
-                
-                  <li><a href="chapter-6.html#s4">Direct Channels</a></li>
-                
-                  <li><a href="chapter-6.html#s5">Remote-to-Local Handlers</a></li>
-                
-              </ol>
-            </li>
-          
-            <li>
-                <a href="chapter-7.html">
-                Using Proxies
-                </a>
-                
-              <ol type="1">
-                
-                  <li><a href="chapter-7.html#s1">Introduction</a></li>
-                
-                  <li><a href="chapter-7.html#s2"><span class="caps">HTTP</span></a></li>
-                
-                  <li><a href="chapter-7.html#s3"><span class="caps">SOCKS</span></a></li>
-                
-              </ol>
-            </li>
-          
-          </ol>
-
-          <h2>Other Documentation</h2>
-
-          <ul>
-            <li><a href="http://net-ssh.rubyforge.org/api/index.html">Net::SSH API</a></li>
-            <li><a href="http://rubyforge.org/tracker/?atid=1842&group_id=274&func=browse">Net::SSH FAQ</a></li>
-          </ul>
-
-          <h2>Tutorials</h2>
-          <ol>
-          
-          </ol>
-
-          <p align="center"><strong>More To Come...</strong></p>
-
-          <div class="license">
-            <a href="http://creativecommons.org/licenses/by-sa/2.0/"><img alt="Creative Commons License" border="0" src="http://creativecommons.org/images/public/somerights" /></a><br />
-            This manual is licensed under a <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons License</a>.
-          </div>
-        </div>
-
-      </td><td valign='top' width="100%">
-
-        <div id="content">
-
-           <div class="top"><div class="prevnext">
-  
-  <a href="index.html">Up</a>
-  
-    | <a href="chapter-2.html">Next (2. Starting a Session)</a>
-  
-</div></div>
-
-<h1>1. Introduction</h1>
-
-
-
-     <h2>
-       <a name="s1"></a>
-       1.1. What is Net::SSH?
-     </h2>
-
-   
-
-   <div class="section">
-     <p>Net::SSH is a pure-Ruby implementation of the <span class="caps">SSH2</span> client protocol. It supports the following features:</p>
-
-
-	<ul>
-	<li>User authentication via explicit username/password, or using a public-key/private-key pair.</li>
-		<li>Port forwarding, both from the local host to a remote computer via the remote host, and from the remote host to the local host.</li>
-		<li>Execute processes on the remote machine, both interactively and non-interactively (&#8220;batch&#8221;).</li>
-	</ul>
-   </div>
-
-
-
-     <h2>
-       <a name="s2"></a>
-       1.2. What isn&#8217;t Net::SSH?
-     </h2>
-
-   
-
-   <div class="section">
-     <p>Net::SSH is only a <em>client</em> implementation, not a server. Given sufficient motivation and encouragement from the community, perhaps it will someday include an <span class="caps">SSH</span> server, but as of right now, it does not.</p>
-
-
-	<p>Furthermore, it is only an <em><span class="caps">SSH2</span></em> client. This means that it cannot connect to <span class="caps">SSH</span> servers that only understand the older <span class="caps">SSH1</span> protocol.</p>
-   </div>
-
-
-
-     <h2>
-       <a name="s3"></a>
-       1.3. Getting Net::SSH
-     </h2>
-
-   
-
-   <div class="section">
-     <h3>Prerequisites:</h3>
-
-
-	<p>In order to use Net::SSH, you must be using a supported version of Ruby&#8217;s OpenSSL module. The version distributed with Ruby 1.8.1 and earlier is not sufficient, and is lacking several features that Net::SSH relies on. If you are using Ruby 1.8.1 (or earlier), you should either upgrade to 1.8.2, or download and install an updated version of the OpenSSL module. You can download a usable snapshot from the <a href="http://rubyforge.org/projects/net-ssh">Net::SSH downloads page</a>.</p>
-
-
-	<p>Furthermore, you must make sure that Ruby&#8217;s OpenSSL module has been compiled against <em>at least</em> version 0.9.7 of the OpenSSL library. Prior versions lacked functionality that Net::SSH depends on (notably, the &#8216;padding&#8217; property of ciphers).</p>
-
-
-	<p>Optionally, you can install the <a href="http://raa.ruby-lang.org/project/ruby-termios">ruby-termios</a>. If you do, then your passwords won&#8217;t be echoed to the screen when prompting you for the passphrases needed to load your keys (if your keys have passphrases).</p>
-
-
-	<h3>Using <a href="http://rubygems.rubyforge.org">RubyGems</a></h3>
-
-
-	<p>If you have <a href="http://rubygems.rubyforge.org">RubyGems</a> installed, installing Net::SSH is simple:</p>
-
-
-	<div class='figure'>
-<span class='caption'>Using Rubygems to install Net::SSH [shell]</span>
-<div class='body'><link rel='stylesheet' type='text/css' href='stylesheets/shell.css' /><div class='shell'><pre>gem install net-ssh</pre></div></div></div>
-
-
-	<p>You still need to make sure you have a working version of Ruby&#8217;s OpenSSL module, but other than that, you should be good to go!</p>
-
-
-	<h3>Using <a href="http://rpa-base.rubyforge.org">rpa-base</a></h3>
-
-
-	<p>If you have <a href="http://rpa-base.rubyforge.org">rpa-base</a> installed:</p>
-
-
-	<div class='figure'>
-<span class='caption'>Using RPA to install Net::SSH [shell]</span>
-<div class='body'><link rel='stylesheet' type='text/css' href='stylesheets/shell.css' /><div class='shell'><pre>rpa install net-ssh</pre></div></div></div>
-
-
-	<p>As with the gem install, you still need to make sure you have a working version of Ruby&#8217;s OpenSSL module, but other than that, you should be good to go!</p>
-
-
-	<h3>Doing it the hard way</h3>
-
-
-	<p>If you don&#8217;t have <a href="http://rubygems.rubyforge.org">RubyGems</a> or <a href="http://rpa-base.rubyforge.org">rpa-base</a>, or if you just prefer to install things by hand, you can always go to the <a href="http://rubyforge.org/projects/net-ssh">Net::SSH downloads page</a> and grab the package of your choice: <code>tar.gz</code>, <code>tar.bz2</code>, or <code>zip</code>.</p>
-
-
-	<p>Then, unpack the archive and run the <code>setup.rb</code> script:</p>
-
-
-	<div class='figure'>
-<span class='caption'>Using setup.rb to install Net::SSH [shell]</span>
-<div class='body'><link rel='stylesheet' type='text/css' href='stylesheets/shell.css' /><div class='shell'><pre>ruby setup.rb config
-ruby setup.rb setup
-ruby setup.rb install</pre></div></div></div>
-   </div>
-
-
-
-     <h2>
-       <a name="s4"></a>
-       1.4. License Information
-     </h2>
-
-   
-
-   <div class="section">
-     <p>Net::SSH is made available under either the <span class="caps">BSD</span> license, or the same license Ruby (which, by extension, also allows the <span class="caps">GPL</span> as a permissable license as well). You can view the full text of any of these licenses in the <code>doc</code> subdirectory of the Net::SSH distrubtion. The texts of the <span class="caps">BSD</span> and <span class="caps">GPL</span> licenses are also available online: <a href="http://www.opensource.org/licenses/bsd-license.php"><span class="caps">BSD</span></a> and <a href="http://www.opensource.org/licenses/gpl-license.php"><span class="caps">GPL</span></a>.</p>
-
-
-	<p>This manual (in any form, be it source or otherwise) and the scripts and templates used to generate it, are all distributed under the <a href="http://creativecommons.org">Creative Commons</a> <a href="http://creativecommons.org/licenses/by-sa/2.0">Attribution-ShareAlike</a> license.</p>
-
-
-	<p>If you desire permission to use either Net::SSH or the manual in a manner incompatible with these licenses, please contact the copyright holder (<a href="mailto:jamis@37signals.com">Jamis Buck</a>) in order to negotiate a more compatible license.</p>
-   </div>
-
-
-
-     <h2>
-       <a name="s5"></a>
-       1.5. Support
-     </h2>
-
-   
-
-   <div class="section">
-     <p>Mailing lists, bug trackers, feature requests, and public forums are all available (courtesty of <a href="http://rubyforge.org">RubyForge</a>) at the <a href="http://rubyforge.org/projects/net-ssh">Net::SSH project page</a>.</p>
-
-
-	<h3>Mailing Lists</h3>
-
-
-	<table>
-		<tr>
-			<th><strong>List Name</strong> </th>
-			<th>&#8212;</th>
-			<th><strong>Description</strong> </th>
-		</tr>
-		<tr>
-			<td style="vertical-align:top;text-align:center;"><a href="http://rubyforge.org/pipermail/net-ssh-users">net-ssh-users</a></td>
-			<td style="vertical-align:top;text-align:center;"><a href="http://rubyforge.org/mailman/listinfo/net-ssh-users">subscribe / unsubscribe</a></td>
-			<td> The Net::SSH users list is devoted to the discussion of and questions about the usage of the Net::SSH module. If you can&#8217;t quite figure out how to get a feature of Net::SSH to work, this is the list you would go to in order to ask your questions.</td>
-		</tr>
-		<tr>
-			<td style="vertical-align:top;text-align:center;"><a href="http://rubyforge.org/pipermail/net-ssh-devel">net-ssh-devel</a></td>
-			<td style="vertical-align:top;text-align:center;"><a href="http://rubyforge.org/mailman/listinfo/net-ssh-devel">subscribe / unsubscribe</a></td>
-			<td> The Net::SSH developers list is devoted to the discussion of Net::SSH&#8217;s implementation. If you have created a patch that you would like to discuss, or if you would like to discuss a new feature, this is the list for you.</td>
-		</tr>
-	</table>
-   </div>
-
-
-
-     <h2>
-       <a name="s6"></a>
-       1.6. About the Author
-     </h2>
-
-   
-
-   <div class="section">
-     <p>Net::SSH was written by <a href="mailto:jamis@37signals.com">Jamis Buck</a>. Feel free to send him compliments, candy, money, praise, or new feature patches&#8212;he likes all those things. You can send him questions and suggestions, too, if you really want to. However, for bug reports and general feature requests, please use the trackers on the <a href="http://rubyforge.org/projects/net-ssh">Net::SSH project page</a>.</p>
-   </div>
-
-
-
-<div class="bottom"><div class="prevnext">
-  
-  <a href="index.html">Up</a>
-  
-    | <a href="chapter-2.html">Next (2. Starting a Session)</a>
-  
-</div></div>
-
-
-        </div>
-
-      </td></tr>
-    </table>
-  </body>
-</html>