net-ssh 3.2.1.beta1 → 3.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b70a2425fdf49f8f1e6353496a73a40c9652fae
-  data.tar.gz: 818db2812acacebc41e27025eeff31465ecb3fef
+  metadata.gz: b4ac524bacb278642fe098d34f8f85d1a4f0579f
+  data.tar.gz: b6725236e2cae6de59f5994602cf3ead0c39bd8d
 SHA512:
-  metadata.gz: dc0f9d07cf95a5ec2a80664027fe4b86f780b3cdba4ec8bdbf4127dfed157c3f0b335dfb7305929605ef4faa9868451e246fde3c5e255a1933c5cefc4cc43389
-  data.tar.gz: 00362b48e089f72fedf9ef432c7bc04b91ad81d09fd773683c752e4953ac8e3cd89492a559ef492b9400f7d216bf5c01e3fc0fdd32a4f936e02fed8932bc1c2d
+  metadata.gz: d3e76a59cde72ff7dba71135482a0409b295e6b624a5b7c870bb8fd87d55af9c3cc446237dd8ffa3e53da453fbda52e3d96979e83d032c22177b7dfb62ebeca2
+  data.tar.gz: adcd1157982585d306d5bed0fcf5b64e9c001674d511054b683a4fee1ac0a75aa023fb462ff02f335570717fc6d011dc14bd6bc7273d2b2cf80437909f7d88f4

data/.travis.yml

@@ -7,7 +7,6 @@ rvm:
   - 2.3.0
   - jruby-head
   - jruby-19mode
-  - rbx-2
 
 install: gem install test-unit mocha
 

data/CHANGES.txt

@@ -1,3 +1,7 @@
+=== 3.3.0 beta 1
+
+* UTF-8 buffer building encoding fixes [Ethan J. Brown, #434]
+
 === 3.2.1 beta 1
 
 * Fix pageant/windows [Elconas, #385]

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/buffer.rb

@@ -34,6 +34,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 +183,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.
@@ -281,7 +282,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
 
@@ -324,6 +332,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

@@ -368,6 +368,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/transport/algorithms.rb

@@ -295,8 +295,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
 

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/version.rb

@@ -48,10 +48,10 @@ module Net; module SSH
     MAJOR = 3
 
     # The minor component of this version of the Net::SSH library
-    MINOR = 2
+    MINOR = 3
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 1
+    TINY  = 0
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed

data/net-ssh.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: net-ssh 3.2.1.beta1 ruby lib
+# stub: net-ssh 3.3.0.beta1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.2.1.beta1"
+  s.version = "3.3.0.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   s.cert_chain = ["net-ssh-public_cert.pem"]
-  s.date = "2016-08-10"
+  s.date = "2016-11-09"
   s.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."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [
@@ -144,6 +144,7 @@ Gem::Specification.new do |s|
     "test/integration/Vagrantfile",
     "test/integration/common.rb",
     "test/integration/playbook.yml",
+    "test/integration/test_encoding.rb",
     "test/integration/test_forward.rb",
     "test/integration/test_id_rsa_keys.rb",
     "test/integration/test_proxy.rb",
@@ -191,7 +192,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0")
   s.rubyforge_project = "net-ssh"
-  s.rubygems_version = "2.4.6"
+  s.rubygems_version = "2.5.1"
   s.signing_key = "/mnt/gem/net-ssh-private_key.pem"
   s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 

data/test/integration/test_encoding.rb

@@ -0,0 +1,23 @@
+require_relative 'common'
+require 'fileutils'
+require 'tmpdir'
+
+require 'net/ssh'
+
+class TestEncoding < NetSSHTest
+  def test_unicode_character
+    ret = Net::SSH.start("localhost", "net_ssh_1", password: 'foopwd') do |ssh|
+      ssh.exec! "echo \"hello from:$USER\" \u2603"
+    end
+    assert_equal ret, "hello from:net_ssh_1 \u2603\n"
+  end
+
+  def test_long_command_with_unicode_in_it
+    string = "eeeeeeeeeeeeeeeeeeeeeeeeeewwowowowìeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
+    command = "echo \"#{string}\""
+    ret = Net::SSH.start("localhost", "net_ssh_1", password: 'foopwd') do |ssh|
+      ssh.exec! command
+    end
+    assert_equal ret, "#{string}\n"
+  end
+end

data/test/test_buffer.rb

@@ -26,6 +26,34 @@ class TestBuffer < Test::Unit::TestCase
     assert_equal "\1\0\0\0\2\0\0\0\0\0\0\0\3\0\0\0\0014\1\0\000\000\000\004I\226\002\322something", buffer.to_s
   end
 
+  def test_from_should_build_new_buffer_that_includes_utf8_string_128_characters
+    length = 128
+    # letter A has a 1 byte UTF8 representation
+    buffer = Net::SSH::Buffer.from(:long, 2, :string, 'A' * length)
+    # long of 2 + length 128 as network endian + 128 A's
+    expected = "\x00\x00\x00\x02" + [length].pack('N*') + ("\x41" * length)
+    assert_equal expected, buffer.to_s
+  end
+
+  def test_from_should_build_new_buffer_with_frozen_strings
+    foo = 'foo'.freeze
+    buffer = Net::SSH::Buffer.from(:string, foo)
+    assert_equal "\0\0\0\3foo", buffer.to_s
+  end
+
+  def test_from_should_build_new_buffer_with_utf8_frozen_strings
+    foo = "\u2603".freeze
+    buffer = Net::SSH::Buffer.from(:string, foo)
+    assert_equal "\0\0\0\3\u2603".force_encoding('BINARY'), buffer.to_s
+  end
+
+  def test_from_should_not_change_regular_paramaters
+    foo = "\u2603"
+    buffer = Net::SSH::Buffer.from(:string, foo)
+    assert_equal "\0\0\0\3\u2603".force_encoding('BINARY'), buffer.to_s
+    assert_equal foo.encoding.to_s, "UTF-8"
+  end
+
   def test_from_with_array_argument_should_write_multiple_of_the_given_type
     buffer = Net::SSH::Buffer.from(:byte, [1,2,3,4,5])
     assert_equal "\1\2\3\4\5", buffer.to_s
@@ -33,7 +61,7 @@ class TestBuffer < Test::Unit::TestCase
 
   def test_from_should_measure_bytesize_of_utf_8_string_correctly
     buffer = Net::SSH::Buffer.from(:string, "\u2603") # Snowman is 3 bytes
-    assert_equal "\0\0\0\3\u2603", buffer.to_s
+    assert_equal "\0\0\0\3\u2603".force_encoding('BINARY'), buffer.to_s
   end
 
   def test_read_without_argument_should_read_to_end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 3.2.1.beta1
+  version: 3.3.0.beta1
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -195,6 +195,7 @@ files:
 - test/integration/Vagrantfile
 - test/integration/common.rb
 - test/integration/playbook.yml
+- test/integration/test_encoding.rb
 - test/integration/test_forward.rb
 - test/integration/test_id_rsa_keys.rb
 - test/integration/test_proxy.rb
@@ -257,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: net-ssh
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'

metadata.gz.sig

@@ -1,3 +1 @@
-B[�����|�a}-X8q��N���u�]K-��Z�[��(�%�!
-���
-srU��Qh���5����� �ȡ/�m���CE"G=����R�^�8��O��@`8�W�Y��o���!�k�G~�o�bP��"�w��$��I7^��V��i V�'l�;t
+�������v��qD�8�6�����6(k�M�Q^�:gI�}I����Օ����6|�A��޲�c��#_���>H��'�K��֡�?\�c'��{��}�KXm/Eu��9�(�d�s����2���_UӔ}��!ܪ�a�w@���G��:\>�!Ӛ`lŖ`��G�\�r<а���П�t���W�zБ��v�;�Zָ��{4���Hĝ^�b���7m*&R�n
��<' ӟ( �����p�[t���7