em-ssh 0.6.5 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b1155815fe2d0f34c5f6a9042c6affe16bb4a3d2
+  data.tar.gz: 3f473143a7b7e43f00f6ca7a47e9122644869248
+SHA512:
+  metadata.gz: 2c64f15aeccde7c71cfd9c1b1e1ffca1b66a0ef44968239266a96db22ddc2748ee64b67799d35ef6b47dad42aede1f79bff91721387780c24b6586cfbc078171
+  data.tar.gz: a47b97dece38734b165a41ad0f2d6f5e7c86672737bb74f178db6a3c03eae3d9bb130b2abe2e31d2c6f4a15cfc17d6d1ab307af1ca8c06eb1e28a65550772ad5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.7.0
+- [88323761c67c433bd46fedfd042ae9a97b726cb6](https://github.com/simulacre/em-ssh/commit/88323761c67c433bd46fedfd042ae9a97b726cb6) - Deal with ssh servers that send algo data and server version at the same time (Dropbear). Discovered by [@mandre](https://github.com/mandre)
+
 0.6.5
 - [#26](https://github.com/simulacre/em-ssh/issues/26) - Remove echo binary
 

data/bin/em-ssh-debug

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+# Simple utility to print debug data for connection establishment to a remote server. Use
+# this script when em-ssh is failing to properly connect to a remote server. The debug
+# information can be used to troubleshoot the connection, or included in an issue ticket.
+
+require "bundler/setup"
+require 'eventmachine'
+require 'em-ssh/shell'
+
+def abort(msg)
+  puts msg
+  Process.exit
+end
+
+options = {
+    :prompt  => /[\-\w]# /,
+    :port => 22
+  }
+
+opts    = OptionParser.new
+opts.banner += " [user:[password]@]host[:port]"
+opts.on('-u', '--user String', String) { |u| options[:user] = u }
+opts.on('-p', '--password [String]', String) do |p|
+  options[:password] = p.nil? ? HighLine.new.ask("password: "){|q| q.echo = "*" } : p
+end
+opts.on('--prompt String', "Shell prompt [#{options[:prompt]}] to expect from the remote server") do |p|
+  options[:prompt] = p
+end
+opts.parse!
+
+host = ARGV.shift || abort("a host is required")
+
+options[:user], host               = *host.split('@') if host.include?('@')
+options[:user], options[:password] = *options[:user].split(':') if options[:user] && options[:user].include?(':')
+host, options[:port]               = *host.split(':') if host.include?(':')
+options[:user]                     = ENV['USER'] unless options[:user]
+options[:password]                 = HighLine.new.ask("#{options[:user]}'s password: "){|q| q.echo = "*" } unless options[:password]
+
+EM.run do
+  options[:logger] = EM::Ssh.logger(Logger::DEBUG)
+  EM::Ssh::Shell.new(host, options[:user], options[:password], options) do |shell|
+    shell.callback do
+      shell.expect(options[:prompt], :timeout => 10)
+      EM.stop
+    end
+    shell.errback do |err|
+      $stderr.puts "error: #{err} (#{err.class})"
+      EM.stop
+    end
+  end
+end
+

data/lib/em-ssh/connection.rb

@@ -216,6 +216,12 @@ module EventMachine
                 end # auth.authenticate("ssh-connection", user, options[:password])
               end.resume # Fiber
             end # :algo_init
+
+            # Some ssh servers, e.g. DropBear send the algo data immediately after sending the server version
+            # string without waiting for the client. In those cases the data buffer will now contain the algo
+            # strings, so we can't wait for the next call to #receive_data. We simulate it here to move the
+            # process forward.
+            receive_data("") unless @data.eof?
           end # :version_negotiated
 
         rescue Exception => e

data/lib/em-ssh/server-version.rb

@@ -19,8 +19,9 @@ module EventMachine
         cb = connection.on(:data) do |data|
           log.debug("#{self.class}.on(:data, #{data.inspect})")
           @version << data
-          @header = @version.clone
-          if @version[-1] == "\n"
+          if @version.include?("\n")
+            @version, _ = @version.split("\n", 2)
+            @header     = version.clone + "\n"
             @version.chomp!
             log.debug("server version: #{@version}")
             if !@version.match(/^SSH-(1\.99|2\.0)-/)

data/lib/em-ssh/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Ssh
-    VERSION='0.6.5'
-  end # class::Ssh
-end # module::EventMachine
+    VERSION='0.7.0'
+  end
+end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: em-ssh
 version: !ruby/object:Gem::Version
-  version: 0.6.5
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Caleb Crane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-termios
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -80,15 +71,22 @@ email:
 - em-ssh@simulacre.org
 executables:
 - em-ssh
+- em-ssh-debug
 - em-ssh-shell
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
+- bin/em-ssh
+- bin/em-ssh-debug
+- bin/em-ssh-shell
+- lib/em-ssh.rb
 - lib/em-ssh/authentication-session.rb
 - lib/em-ssh/callbacks.rb
+- lib/em-ssh/connection.rb
 - lib/em-ssh/connection/channel/interactive.rb
 - lib/em-ssh/connection/channel/null-logger.rb
-- lib/em-ssh/connection.rb
 - lib/em-ssh/ext/net/ssh/connection/channel.rb
 - lib/em-ssh/log.rb
 - lib/em-ssh/packet-stream.rb
@@ -96,35 +94,29 @@ files:
 - lib/em-ssh/session.rb
 - lib/em-ssh/shell.rb
 - lib/em-ssh/version.rb
-- lib/em-ssh.rb
-- bin/em-ssh
-- bin/em-ssh-shell
-- CHANGELOG.md
-- README.md
 homepage: http://github.com/simulacre/em-ssh
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An EventMachine compatible net-ssh
 test_files: []
 has_rdoc: