net-ssh 4.0.0.alpha4 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 605f2f4e21417ab58a6a2a595ddd3025bcc99316
-  data.tar.gz: 74fc3fd5555a76d221673d6d304fb5558d80795f
+  metadata.gz: d025eee7824e27e0335a51be6851449e02c0b5e0
+  data.tar.gz: 26ec72c6a40090938e90a01f8bf038802aff27f7
 SHA512:
-  metadata.gz: 8bde41de1967a8b9b4c1bda6b77112fdaa4e2c22b917e3eb08f0cfd7035863ed1fccf46a07ad9de176b5f8f943c730bd4379317a3fd02997619b3abb8a2ad4e5
-  data.tar.gz: 24f50e2aa4254bcc22b961dd5a8acbf75649658a0f06d3afe9e32b5ef3e8fa88ef7716aa774b06c1a86b078377d33dbfe86ef14c63211fd44c16a79f782f6f72
+  metadata.gz: fc0fffec6a7fc76d68155dc5016c04f2b484d51a2537c4f4c822427e16f6d8ccb8fe9ce822f6a855905e06f480152d204b12be56f7b01740cb7fe9acbd35d080
+  data.tar.gz: 6adc48f5d3eae3f8396d2ccfb8605b74ab578114a98a662ff1d159ff1e0c6e728ae693338b2d465204b01db09e8538467edd82e070158c1286b42e7e79e07d43

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-"��H��h_�(C�gj�]�ޜ\�rp���Y�Z�����E����C���N�~�=�[V�-�x[��$��|g�,n�I�b�_/���"���9�f��[�?v8�P"�[�E�J7��ݔ��zԼ��?��G�� �±��d1I$�8R�i���˓30O����vO�J��Ǩ|w�:>:��I��(��0�_����-W����.�W�(�
+��6j|x��9/�����xĆ2���x�5��f~
+��3�������N%�#i5�v��A�҄�YR��B�ԊPv��7��L�_wv�,/��9�''�(a�\v���b��+	,��T��t�>A�OG9^��cݛ�Lp���*�Ll%+�[��1?�s=5���x�4�6�r�Hޣ���vT�nb00�׷��u����%Q��)��yqt

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
-  - jruby-9.0.5.0
+  - jruby-9.1.2.0
   - rbx-3.25
   - ruby-head
 env:
@@ -16,23 +16,25 @@ env:
 matrix:
   exclude:
     - rvm: rbx-3.25
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
   include:
     - rvm: rbx-3.25
       env: NET_SSH_RUN_INTEGRATION_TESTS=
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
       env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false' NET_SSH_RUN_INTEGRATION_TESTS=
+  fast_finish: true
   allow_failures:
-    - rvm: ruby-head
     - rvm: rbx-3.25
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.2.0
 
 install:
   - export JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false'
   - sudo pip install ansible
   - gem install bundler -v "= 1.11.2"
   - bundle _1.11.2_ install
+  - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.11.2_ install
   - sudo ansible-galaxy install rvm_io.rvm1-ruby
+  - sudo chown -R travis:travis /home/travis/.ansible
   - 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:

data/CHANGES.txt

@@ -1,3 +1,9 @@
+=== 4.0.0.beta
+
+* Fix pageant [elconas, #235]
+* Relaxed rbnacl,rbnacl-selenium contstraints ang give better errors about them [Miklos Fazekas, #398]
+* Fix UTF-8 encoding issues [Ethan J. Brown, #407]
+
 === 4.0.0.alpha4
 
 * Experimental event loop abstraction [Miklos Fazekas]

data/appveyor.yml

@@ -10,9 +10,11 @@ environment:
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - gem install bundler --no-document -v 1.11.2
-  - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.11.2_ install --retry=3
+  - SET BUNDLE_GEMFILE=Gemfile.norbnacl
+  - bundle _1.11.2_ install --retry=3
 
 test_script:
-  - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.11.2_ exec rake test
+  - SET BUNDLE_GEMFILE=Gemfile.norbnacl
+  - bundle _1.11.2_ exec rake test
 
 build: off

data/lib/net/ssh.rb

@@ -71,7 +71,8 @@ module Net
       :known_hosts, :global_known_hosts_file, :user_known_hosts_file, :host_key_alias,
       :host_name, :user, :properties, :passphrase, :keys_only, :max_pkt_size,
       :max_win_size, :send_env, :use_agent, :number_of_password_prompts,
-      :append_supported_algorithms, :non_interactive, :password_prompt, :agent_socket_factory
+      :append_supported_algorithms, :non_interactive, :password_prompt, :agent_socket_factory,
+      :minimum_dh_bits
     ]
 
     # The standard means of starting a new SSH connection. When used with a
@@ -206,6 +207,8 @@ module Net
         raise ArgumentError, "invalid option(s): #{invalid_options.join(', ')}"
       end
 
+      assign_defaults(options)
+
       if options.values.include? nil
         nil_options = options.keys.select { |k| options[k].nil? }
         raise ArgumentError, "Value(s) have been set to nil: #{nil_options.join(', ')}"
@@ -215,17 +218,10 @@ module Net
       options = configuration_for(host, options.fetch(:config, true)).merge(options)
       host = options.fetch(:host_name, host)
 
-      if !options.key?(:logger)
-        options[:logger] = Logger.new(STDERR)
-        options[:logger].level = Logger::FATAL
-      end
-
       if options[:non_interactive]
         options[:number_of_password_prompts] = 0
       end
 
-      options[:password_prompt] ||= Prompt.default(options)
-
       if options[:verbose]
         options[:logger].level = case options[:verbose]
           when Fixnum then options[:verbose]
@@ -277,5 +273,14 @@ module Net
 
       Net::SSH::Config.for(host, files)
     end
+
+    def self.assign_defaults(options)
+      if !options[:logger]
+        options[:logger] = Logger.new(STDERR)
+        options[:logger].level = Logger::FATAL
+      end
+
+      options[:password_prompt] ||= Prompt.default(options)
+    end
   end
 end

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

@@ -1,5 +1,5 @@
-gem 'rbnacl-libsodium', '~> 1.0.10'
-gem 'rbnacl', '~> 3.3.0'
+gem 'rbnacl-libsodium', '>= 1.0.10'
+gem 'rbnacl', '>= 3.2.0', '< 4.0'
 gem 'bcrypt_pbkdf', '~> 1.0.0.alpha1' unless RUBY_PLATFORM == "java"
 
 require 'rbnacl/libsodium'
@@ -14,6 +14,7 @@ require 'base64'
 require 'net/ssh/transport/cipher_factory'
 require 'bcrypt_pbkdf' unless RUBY_PLATFORM == "java"
 
+module Net; module SSH; module Authentication
 module ED25519
   class SigningKeyFromFile < RbNaCl::Signatures::Ed25519::SigningKey
     def initialize(pk,sk)
@@ -32,7 +33,7 @@ module ED25519
     end
 
     def to_blob
-      Net::SSH::Buffer.from(:string,"ssh-ed25519",:string,@verify_key.to_bytes).to_s
+      Net::SSH::Buffer.from(:mstring,"ssh-ed25519",:string,@verify_key.to_bytes).to_s
     end
 
     def ssh_type
@@ -132,4 +133,5 @@ module ED25519
       ED25519::PubKey.read_keyblob(buffer)
     end
   end
-end
+end
+end; end; end

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

@@ -0,0 +1,21 @@
+module Net; module SSH; module Authentication
+
+# Loads ED25519 support which requires optinal dependecies like
+# rbnacl-libsodium, rbnacl, bcrypt_pbkdf
+module ED25519Loader
+
+begin
+  require 'net/ssh/authentication/ed25519'
+  LOADED = true
+  ERROR = nil
+rescue LoadError => e
+  ERROR = e
+  LOADED = false
+end
+
+def self.raiseUnlessLoaded(message)
+  raise NotImplementedError, "#{message} -- see #{ED25519_LOAD_ERROR}" unless LOADED
+end
+
+end
+end; end; end

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

@@ -147,7 +147,7 @@ module Net
 
           if info[:key]
             return Net::SSH::Buffer.from(:string, identity.ssh_type,
-              :string, info[:key].ssh_do_sign(data.to_s)).to_s
+              :mstring, info[:key].ssh_do_sign(data.to_s)).to_s
           end
 
           if info[:from] == :agent

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

@@ -254,7 +254,7 @@ module Net; module SSH; module Authentication
         Win.GetTokenInformation(token_handle,
                                 token_information_class,
                                 Win::NULL, 0, preturn_length)
-        ptoken_information = malloc_ptr(preturn_length.ptr.to_i)
+        ptoken_information = malloc_ptr(preturn_length.to_s(Win::SIZEOF_DWORD).unpack('L')[0])
 
         # This call is going to write the requested information to
         # the memory location referenced by token_information.

data/lib/net/ssh/buffer.rb

@@ -1,6 +1,8 @@
 require 'net/ssh/ruby_compat'
 require 'net/ssh/transport/openssl'
 
+require 'net/ssh/authentication/ed25519_loader'
+
 module Net; module SSH
 
   # Net::SSH::Buffer is a flexible class for building and parsing binary
@@ -34,6 +36,7 @@ module Net; module SSH
     # * :long => write a 4-byte integer (#write_long)
     # * :byte => write a single byte (#write_byte)
     # * :string => write a 4-byte length followed by character data (#write_string)
+    # * :mstring => same as string, but caller cannot resuse the string, avoids potential duplication (#write_moved)
     # * :bool => write a single byte, interpreted as a boolean (#write_bool)
     # * :bignum => write an SSH-encoded bignum (#write_bignum)
     # * :key => write an SSH-encoded key value (#write_key)
@@ -182,7 +185,7 @@ module Net; module SSH
       consume!
       data
     end
-      
+
     # Return the next 8 bytes as a 64-bit integer (in network byte order).
     # Returns nil if there are less than 8 bytes remaining to be read in the
     # buffer.
@@ -256,8 +259,8 @@ module Net; module SSH
           key.n = read_bignum
 
         when /^ssh-ed25519$/
-          key = ED25519::PubKey.read_keyblob(self)
-
+          Net::SSH::Authentication::ED25519Loader.raiseUnlessLoaded("unsupported key type `#{type}'")
+          key = Net::SSH::Authentication::ED25519::PubKey.read_keyblob(self)
         when /^ecdsa\-sha2\-(\w*)$/
           unless defined?(OpenSSL::PKey::EC)
             raise NotImplementedError, "unsupported key type `#{type}'"
@@ -284,7 +287,14 @@ module Net; module SSH
     # Writes the given data literally into the string. Does not alter the
     # read position. Returns the buffer object.
     def write(*data)
-      data.each { |datum| @content << datum }
+      data.each { |datum| @content << datum.dup.force_encoding('BINARY') }
+      self
+    end
+
+    # Optimized version of write where the caller gives up ownership of string
+    # to the method. This way we can mutate the string.
+    def write_moved(string)
+      @content << string.force_encoding('BINARY')
       self
     end
 
@@ -327,6 +337,19 @@ module Net; module SSH
       self
     end
 
+    # Writes each argument to the buffer as an SSH2-encoded string. Each
+    # string is prefixed by its length, encoded as a 4-byte long integer.
+    # Does not alter the read position. Returns the buffer object.
+    # Might alter arguments see write_moved
+    def write_mstring(*text)
+      text.each do |string|
+        s = string.to_s
+        write_long(s.bytesize)
+        write_moved(s)
+      end
+      self
+    end
+
     # Writes each argument to the buffer as a (C-style) boolean, with 1
     # meaning true, and 0 meaning false. Does not alter the read position.
     # Returns the buffer object.

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

@@ -390,6 +390,7 @@ module Net; module SSH; module Connection
       channel.wait
 
       channel[:result] ||= "" unless block
+      channel[:result] &&= channel[:result].force_encoding("UTF-8") unless block
 
       return channel[:result]
     end

data/lib/net/ssh/key_factory.rb

@@ -1,10 +1,7 @@
 require 'net/ssh/transport/openssl'
 require 'net/ssh/prompt'
 
-begin
-  require 'net/ssh/authentication/ed25519'
-rescue Gem::LoadError => e # rubocop:disable Lint/HandleExceptions
-end
+require 'net/ssh/authentication/ed25519_loader'
 
 module Net; module SSH
 
@@ -26,7 +23,7 @@ module Net; module SSH
     }
     if defined?(OpenSSL::PKey::EC)
       MAP["ecdsa"] = OpenSSL::PKey::EC
-      MAP["ed25519"] = ED25519::PrivKey if defined? ED25519
+      MAP["ed25519"] = Net::SSH::Authentication::ED25519::PrivKey if defined? Net::SSH::Authentication::ED25519
     end
 
     class <<self
@@ -112,7 +109,11 @@ module Net; module SSH
       # appropriately.
       def classify_key(data, filename)
         if data.match(/-----BEGIN OPENSSH PRIVATE KEY-----/)
-          return ->(key_data, passphrase) { ED25519::PrivKey.read(key_data, passphrase) }, ArgumentError
+          if defined?(Net::SSH::Authentication::ED25519)
+            return ->(key_data, passphrase) { Net::SSH::Authentication::ED25519::PrivKey.read(key_data, passphrase) }, ArgumentError
+          else
+            raise OpenSSL::PKey::PKeyError, "OpenSSH keys only supported if ED25519 is available - #{ED25519_LOAD_ERROR}"
+          end
         elsif OpenSSL::PKey.respond_to?(:read)
           return ->(key_data, passphrase) { OpenSSL::PKey.read(key_data, passphrase) }, ArgumentError
         elsif data.match(/-----BEGIN DSA PRIVATE KEY-----/)

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

@@ -287,8 +287,8 @@ module Net; module SSH; module Transport
 
         Net::SSH::Buffer.from(:byte, KEXINIT,
           :long, [rand(0xFFFFFFFF), rand(0xFFFFFFFF), rand(0xFFFFFFFF), rand(0xFFFFFFFF)],
-          :string, [kex, host_key, encryption, encryption, hmac, hmac],
-          :string, [compression, compression, language, language],
+          :mstring, [kex, host_key, encryption, encryption, hmac, hmac],
+          :mstring, [compression, compression, language, language],
           :bool, false, :long, 0)
       end
 
@@ -357,6 +357,7 @@ module Net; module SSH; module Transport
           :server_algorithm_packet => @server_packet,
           :client_algorithm_packet => @client_packet,
           :need_bytes => kex_byte_requirement,
+          :minimum_dh_bits => options[:minimum_dh_bits],
           :logger => logger)
         result = algorithm.exchange_keys
 

data/lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha1.rb

@@ -23,8 +23,10 @@ module Net::SSH::Transport::Kex
         # for Compatibility: OpenSSH requires (need_bits * 2 + 1) length of parameter
         need_bits = data[:need_bytes] * 8 * 2 + 1
 
-        if need_bits < MINIMUM_BITS
-          need_bits = MINIMUM_BITS
+        data[:minimum_dh_bits] ||= MINIMUM_BITS
+
+        if need_bits < data[:minimum_dh_bits]
+          need_bits = data[:minimum_dh_bits]
         elsif need_bits > MAXIMUM_BITS
           need_bits = MAXIMUM_BITS
         end
@@ -38,7 +40,7 @@ module Net::SSH::Transport::Kex
         compute_need_bits
 
         # request the DH key parameters for the given number of bits.
-        buffer = Net::SSH::Buffer.from(:byte, KEXDH_GEX_REQUEST, :long, MINIMUM_BITS,
+        buffer = Net::SSH::Buffer.from(:byte, KEXDH_GEX_REQUEST, :long, data[:minimum_dh_bits],
           :long, data[:need_bits], :long, MAXIMUM_BITS)
         connection.send_message(buffer)
 

data/lib/net/ssh/transport/kex/ecdh_sha2_nistp256.rb

@@ -57,7 +57,7 @@ module Net; module SSH; module Transport; module Kex
       # send the KEXECDH_INIT message
       ## byte     SSH_MSG_KEX_ECDH_INIT
       ## string   Q_C, client's ephemeral public key octet string
-      buffer = Net::SSH::Buffer.from(:byte, init, :string, ecdh.public_key.to_bn.to_s(2))
+      buffer = Net::SSH::Buffer.from(:byte, init, :mstring, ecdh.public_key.to_bn.to_s(2))
       connection.send_message(buffer)
 
       # expect the following KEXECDH_REPLY message

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

@@ -185,7 +185,7 @@ module OpenSSL
         def to_blob
           @blob ||= Net::SSH::Buffer.from(:string, ssh_type,
                                           :string, CurveNameAliasInv[self.group.curve_name],
-                                          :string, self.public_key.to_bn.to_s(2)).to_s
+                                          :mstring, self.public_key.to_bn.to_s(2)).to_s
           @blob
         end
 

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

@@ -192,7 +192,7 @@ module Net; module SSH; module Transport
 
       def update_next_iv(data, reset=false)
         @next_iv << data
-        @next_iv = @next_iv[-cipher.iv_len..-1]
+        @next_iv = @next_iv[@next_iv.size-cipher.iv_len..-1]
 
         if reset
           cipher.reset

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   = "alpha4"
+    PRE   = "beta1"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-ssh.gemspec

@@ -29,16 +29,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   unless ENV['NET_SSH_NO_RBNACL']
-    spec.add_development_dependency("rbnacl-libsodium", ">= 1.0.2")
-    spec.add_development_dependency("rbnacl", ">= 3.1.2")
-    spec.add_development_dependency("bcrypt_pbkdf", "= 1.0.0.alpha1") unless RUBY_PLATFORM == "java"
+    spec.add_development_dependency("rbnacl-libsodium", "~> 1.0.10")
+    spec.add_development_dependency("rbnacl", "~> 3.4.0")
+    spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0.0.alpha1") unless RUBY_PLATFORM == "java"
   end
 
-  spec.add_development_dependency "bundler", "~> 1.11.2"
+  spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 11.1"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rubocop", "~> 0.39.0"
   spec.add_development_dependency "mocha", ">= 1.1.0"
+  spec.add_development_dependency("byebug") if RUBY_ENGINE == "ruby"
 
   spec.add_dependency('jruby-pageant', '>= 1.1.1') if RUBY_PLATFORM == 'jruby'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha4
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,48 +31,48 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl-libsodium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0.alpha1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0.alpha1
 - !ruby/object:Gem::Dependency
@@ -81,14 +81,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It
   allows you to write programs that invoke and interact with processes on remote servers,
   via SSH2.'
@@ -176,6 +190,7 @@ files:
 - lib/net/ssh/authentication/agent/socket.rb
 - lib/net/ssh/authentication/constants.rb
 - lib/net/ssh/authentication/ed25519.rb
+- lib/net/ssh/authentication/ed25519_loader.rb
 - lib/net/ssh/authentication/key_manager.rb
 - lib/net/ssh/authentication/methods/abstract.rb
 - lib/net/ssh/authentication/methods/hostbased.rb