net-ssh 4.1.0.beta1 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ddb17acb82519ed776b8253f91d7ce18fefdf51
-  data.tar.gz: 15b3ed1a09ac2284404592c7aa75258960acd0db
+  metadata.gz: b8e122ba1d132741655fe9c8eef7c1944fbe32da
+  data.tar.gz: f51ce5fc9dbe822a5b0841d8c557dc51dfa45bf4
 SHA512:
-  metadata.gz: 929f76416e948641680d7355c1e86d8614799b6ed874de172111a1d66d0dcfe2b5ef715e4d4bf10c2bc3d8268e5ffcbd9b487544e00c802d3c5069549789cb48
-  data.tar.gz: 8fefcbc82dc35a448abe499a5656245c1d7c3959abea95e1629bbbe390bb7f73cd53bd3b0c96cc18e6d03f831c370ad0d4a1af9cc699e48f564621e5e52b3d07
+  metadata.gz: 36a6fe3552dd86088280b12d59c725448a677b778709bada2bed8b1ede1660b29ea0018aace99d288ab8231e4f60fa9f2a4826b969218f4d6e646f46e60402e2
+  data.tar.gz: 4f3129e8b6521debd7810977089cfb6fafb5bcff397cae1f045c673bac30157e9aa0be3e3fd722602975b44272af198e3238c70afddcd0a42b21710e307b55dd

data/.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 sudo: true
 dist: trusty
 
+addon:
+  hosts:
+    gateway.netssh
+
 rvm:
   - 2.0
   - 2.1
@@ -40,6 +44,7 @@ install:
   - ansible-playbook ./test/integration/playbook.yml -i "localhost," --become -c local -e 'no_rvm=true' -e 'myuser=travis' -e 'mygroup=travis' -e 'homedir=/home/travis'
 
 script:
+  - ssh -V
   - bundle _1.13.7_ exec rake test
   - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.13.7_ exec rake test
   - bundle _1.13.7_ exec rake test_test

data/CHANGES.txt

@@ -1,3 +1,8 @@
+=== 4.1.0.rc1
+
+ * ProxyJump support [Ryan McGeary, #500]
+ * Fix agent detection on Windows [Christian Koehler, #495]
+
 === 4.1.0.beta1
 
  * Fix nil error when libsodium is not there [chapmajs ,#488]

data/lib/net/ssh/authentication/agent.rb

@@ -79,7 +79,7 @@ module Net; module SSH; module Authentication
       @socket =
         if agent_socket_factory
           agent_socket_factory.call
-        elsif ENV['SSH_AUTH_SOCK'] && defined?(unix_socket_class)
+        elsif ENV['SSH_AUTH_SOCK'] && unix_socket_class
           unix_socket_class.open(ENV['SSH_AUTH_SOCK'])
         elsif Gem.win_platform? && RUBY_ENGINE != "jruby"
           Pageant::Socket.open
@@ -181,7 +181,7 @@ module Net; module SSH; module Authentication
     private
 
     def unix_socket_class
-      UNIXSocket
+      defined?(UNIXSocket) && UNIXSocket
     end
 
     # Send a new packet of the given type, with the associated data.

data/lib/net/ssh/config.rb

@@ -27,6 +27,7 @@ module Net; module SSH
   # * Port => :port
   # * PreferredAuthentications => maps to the :auth_methods option
   # * ProxyCommand => maps to the :proxy option
+  # * ProxyJump => maps to the :proxy option
   # * PubKeyAuthentication => maps to the :auth_methods option
   # * RekeyLimit => :rekey_limit
   # * User => :user
@@ -156,93 +157,7 @@ module Net; module SSH
         auth_methods = default_auth_methods.clone
         (auth_methods << 'challenge-response').uniq!
         ret = settings.inject({auth_methods: auth_methods}) do |hash, (key, value)|
-          case key
-          when 'bindaddress' then
-            hash[:bind_address] = value
-          when 'ciphers' then
-            hash[:encryption] = value.split(/,/)
-          when 'compression' then
-            hash[:compression] = value
-          when 'compressionlevel' then
-            hash[:compression_level] = value
-          when 'connecttimeout' then
-            hash[:timeout] = value
-          when 'forwardagent' then
-            hash[:forward_agent] = value
-          when 'identitiesonly' then
-            hash[:keys_only] = value
-          when 'globalknownhostsfile'
-            hash[:global_known_hosts_file] = value
-          when 'hostbasedauthentication' then
-            if value
-              (hash[:auth_methods] << "hostbased").uniq!
-            else
-              hash[:auth_methods].delete("hostbased")
-            end
-          when 'hostkeyalgorithms' then
-            hash[:host_key] = value.split(/,/)
-          when 'hostkeyalias' then
-            hash[:host_key_alias] = value
-          when 'hostname' then
-            hash[:host_name] = value.gsub(/%h/, settings['host'])
-          when 'identityfile' then
-            hash[:keys] = value
-          when 'macs' then
-            hash[:hmac] = value.split(/,/)
-          when 'serveralivecountmax'
-            hash[:keepalive_maxcount] = value.to_i if value
-          when 'serveraliveinterval'
-            if value && value.to_i > 0
-              hash[:keepalive] = true
-              hash[:keepalive_interval] = value.to_i
-            else
-              hash[:keepalive] = false
-            end
-          when 'passwordauthentication'
-            if value
-              (hash[:auth_methods] << 'password').uniq!
-            else
-              hash[:auth_methods].delete('password')
-            end
-          when 'challengeresponseauthentication'
-            if value
-              (hash[:auth_methods] << 'challenge-response').uniq!
-            else
-              hash[:auth_methods].delete('challenge-response')
-            end
-          when 'kbdinteractiveauthentication'
-            if value
-              (hash[:auth_methods] << 'keyboard-interactive').uniq!
-            else
-              hash[:auth_methods].delete('keyboard-interactive')
-            end
-          when 'port'
-            hash[:port] = value
-          when 'preferredauthentications'
-            hash[:auth_methods] = value.split(/,/) # TODO we should place to preferred_auth_methods rather than auth_methods
-          when 'proxycommand'
-            if value and !(value =~ /^none$/)
-              require 'net/ssh/proxy/command'
-              hash[:proxy] = Net::SSH::Proxy::Command.new(value)
-            end
-          when 'pubkeyauthentication'
-            if value
-              (hash[:auth_methods] << 'publickey').uniq!
-            else
-              hash[:auth_methods].delete('publickey')
-            end
-          when 'rekeylimit'
-            hash[:rekey_limit] = interpret_size(value)
-          when 'user'
-            hash[:user] = value
-          when 'userknownhostsfile'
-            hash[:user_known_hosts_file] = value
-          when 'sendenv'
-            multi_send_env = value.to_s.split(/\s+/)
-            hash[:send_env] = multi_send_env.map { |e| Regexp.new pattern2regex(e).source, false }
-          when 'numberofpasswordprompts'
-            hash[:number_of_password_prompts] = value.to_i
-          end
+          translate_config_key(hash, key.to_sym, value, settings)
           hash
         end
         merge_challenge_response_with_keyboard_interactive(ret)
@@ -262,6 +177,93 @@ module Net; module SSH
 
       private
 
+        def translate_config_key(hash, key, value, settings)
+          rename = {
+            bindaddress: :bind_address,
+            compression: :compression,
+            compressionlevel: :compression_level,
+            connecttimeout: :timeout,
+            forwardagent: :forward_agent,
+            identitiesonly: :keys_only,
+            globalknownhostsfile: :global_known_hosts_file,
+            hostkeyalias: :host_key_alias,
+            identityfile: :keys,
+            port: :port,
+            user: :user,
+            userknownhostsfile: :user_known_hosts_file
+          }
+          case key
+            when :ciphers
+              hash[:encryption] = value.split(/,/)
+            when :hostbasedauthentication
+              if value
+                (hash[:auth_methods] << "hostbased").uniq!
+              else
+                hash[:auth_methods].delete("hostbased")
+              end
+            when :hostkeyalgorithms
+              hash[:host_key] = value.split(/,/)
+            when :hostname
+              hash[:host_name] = value.gsub(/%h/, settings['host'])
+            when :macs
+              hash[:hmac] = value.split(/,/)
+            when :serveralivecountmax
+              hash[:keepalive_maxcount] = value.to_i if value
+            when :serveraliveinterval
+              if value && value.to_i > 0
+                hash[:keepalive] = true
+                hash[:keepalive_interval] = value.to_i
+              else
+                hash[:keepalive] = false
+              end
+            when :passwordauthentication
+              if value
+                (hash[:auth_methods] << 'password').uniq!
+              else
+                hash[:auth_methods].delete('password')
+              end
+            when :challengeresponseauthentication
+              if value
+                (hash[:auth_methods] << 'challenge-response').uniq!
+              else
+                hash[:auth_methods].delete('challenge-response')
+              end
+            when :kbdinteractiveauthentication
+              if value
+                (hash[:auth_methods] << 'keyboard-interactive').uniq!
+              else
+                hash[:auth_methods].delete('keyboard-interactive')
+              end
+            when :preferredauthentications
+              hash[:auth_methods] = value.split(/,/) # TODO we should place to preferred_auth_methods rather than auth_methods
+            when :proxycommand
+              if value and !(value =~ /^none$/)
+                require 'net/ssh/proxy/command'
+                hash[:proxy] = Net::SSH::Proxy::Command.new(value)
+              end
+            when :proxyjump
+              if value
+                require 'net/ssh/proxy/jump'
+                hash[:proxy] = Net::SSH::Proxy::Jump.new(value)
+              end
+            when :pubkeyauthentication
+              if value
+                (hash[:auth_methods] << 'publickey').uniq!
+              else
+                hash[:auth_methods].delete('publickey')
+              end
+            when :rekeylimit
+              hash[:rekey_limit] = interpret_size(value)
+            when :sendenv
+              multi_send_env = value.to_s.split(/\s+/)
+              hash[:send_env] = multi_send_env.map { |e| Regexp.new pattern2regex(e).source, false }
+            when :numberofpasswordprompts
+              hash[:number_of_password_prompts] = value.to_i
+            when *rename.keys
+              hash[rename[key]] = value
+          end
+        end
+
         # Converts an ssh_config pattern into a regex for matching against
         # host names.
         def pattern2regex(pattern)

data/lib/net/ssh/connection/channel.rb

@@ -613,7 +613,7 @@ module Net; module SSH; module Connection
         if callback = pending_requests.shift
           callback.call(self, false)
         else
-          error { "channel failure recieved with no pending request to handle it (bug?)" }
+          error { "channel failure received with no pending request to handle it (bug?)" }
         end
       end
 
@@ -623,7 +623,7 @@ module Net; module SSH; module Connection
         if callback = pending_requests.shift
           callback.call(self, true)
         else
-          error { "channel success recieved with no pending request to handle it (bug?)" }
+          error { "channel success received with no pending request to handle it (bug?)" }
         end
       end
 

data/lib/net/ssh/proxy/jump.rb

@@ -0,0 +1,53 @@
+require 'uri'
+require 'net/ssh/proxy/command'
+
+module Net; module SSH; module Proxy
+
+  # An implementation of a jump proxy. To use it, instantiate it,
+  # then pass the instantiated object via the :proxy key to
+  # Net::SSH.start:
+  #
+  #   require 'net/ssh/proxy/jump'
+  #
+  #   proxy = Net::SSH::Proxy::Jump.new('user@proxy')
+  #   Net::SSH.start('host', 'user', :proxy => proxy) do |ssh|
+  #     ...
+  #   end
+  class Jump < Command
+
+    # The jump proxies
+    attr_reader :jump_proxies
+
+    # Create a new socket factory that tunnels via multiple jump proxes as
+    # [user@]host[:port].
+    def initialize(jump_proxies)
+      @jump_proxies = jump_proxies
+    end
+
+    # Return a new socket connected to the given host and port via the jump
+    # proxy that was requested when the socket factory was instantiated.
+    def open(host, port, connection_options = nil)
+      build_proxy_command_equivalent(connection_options)
+      super
+    end
+
+    # We cannot build the ProxyCommand template until we know if the :config
+    # option was specified during `Net::SSH.start`.
+    def build_proxy_command_equivalent(connection_options = nil)
+      first_jump, extra_jumps = jump_proxies.split(",", 2)
+      config = connection_options && connection_options[:config]
+      uri = URI.parse("ssh://#{first_jump}")
+
+      template = "ssh"
+      template << " -l #{uri.user}"    if uri.user
+      template << " -p #{uri.port}"    if uri.port
+      template << " -J #{extra_jumps}" if extra_jumps
+      template << " -F #{config}" if config != true && config
+      template << " -W %h:%p "
+      template << uri.host
+
+      @command_line_template = template
+    end
+  end
+
+end; end; end

data/lib/net/ssh/transport/algorithms.rb

@@ -121,7 +121,7 @@ module Net; module SSH; module Transport
 
     # Start the algorithm negotation
     def start
-      raise ArgumentError, "Cannot call start if it's negoitation started or done" if @pending || @initialized
+      raise ArgumentError, "Cannot call start if it's negotiation started or done" if @pending || @initialized
       send_kexinit
     end
 
@@ -135,7 +135,7 @@ module Net; module SSH; module Transport
       send_kexinit
     end
 
-    # Called by the transport layer when a KEXINIT packet is recieved, indicating
+    # Called by the transport layer when a KEXINIT packet is received, indicating
     # that the server wants to exchange keys. This can be spontaneous, or it
     # can be in response to a client-initiated rekey request (see #rekey!). Either
     # way, this will block until the key exchange completes.

data/lib/net/ssh/transport/session.rb

@@ -198,7 +198,7 @@ module Net; module SSH; module Transport
           raise Net::SSH::Disconnect, "disconnected: #{packet[:description]} (#{packet[:reason_code]})"
 
         when IGNORE
-          debug { "IGNORE packet recieved: #{packet[:data].inspect}" }
+          debug { "IGNORE packet received: #{packet[:data].inspect}" }
 
         when UNIMPLEMENTED
           lwarn { "UNIMPLEMENTED: #{packet[:number]}" }

data/lib/net/ssh/version.rb

@@ -55,7 +55,7 @@ module Net; module SSH
 
     # The prerelease component of this version of the Net::SSH library
     # nil allowed
-    PRE   = "beta1"
+    PRE   = "rc1"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta1
+  version: 4.1.0.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -32,7 +32,7 @@ cert_chain:
   L4d54WIy4HkZCqQXoTSiK5HZMIdXkPk3F1bZdJ8Dy1sMRru0rUkkM5mW7TQ75mfW
   Zp0QrZyNZhtitrXFbZneGRrIA/8G2Krft5Ly/A==
   -----END CERTIFICATE-----
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,7 @@ files:
 - lib/net/ssh/proxy/errors.rb
 - lib/net/ssh/proxy/http.rb
 - lib/net/ssh/proxy/https.rb
+- lib/net/ssh/proxy/jump.rb
 - lib/net/ssh/proxy/socks4.rb
 - lib/net/ssh/proxy/socks5.rb
 - lib/net/ssh/ruby_compat.rb

metadata.gz.sig

@@ -1 +1,2 @@
-����*�'�C��Y�D��lD*���h�GE����YL�;�H9<��8��kj�����|���x�����^���4K{���?t4�\���Q�Gn�c@����P��$�P�"�y��D�*Yl5N���4����;_t9�>{nO���"��~�2:�:>UGK�2aap_�~��v��K��
zu�3��	��}٠?�����	Ч[�D$�����=�0�z��h\uD$|�JiS�%W�7T�SHPg
+�C�� e-��w@*���-QW}0�d�c>�˭+:�<�xY�g��O��ge����/	�U����V��0ڤfO)S��z�
+�.C ��