net-ssh 3.1.0.beta2 → 3.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8014163f04248cb8c0d06a2b0f9eb99650c4ca1f
-  data.tar.gz: 4a3a4ffd2cc73052808781409b6be9bdf7a336a8
+  metadata.gz: e9170e4ec18254639ebeab82be271d685637f44f
+  data.tar.gz: 02f77daa8e46de9274ee27a9c2a432a3283df456
 SHA512:
-  metadata.gz: e70e296ef1844a744fcbb69304203e8e758f5eaf2e5ab89ec3a4352c6fefd12a59395800aecf3efc4ba34b3dfed3ae6f0a729542da1c48173b88c5b0b4d15884
-  data.tar.gz: 4c10b1d730425a42f606fc0119080894de291d6d7949854246b71bfe1a62d7056d59edce2e789ca7ef8355e4c6d2ff1c2a0158089f4213d8b8516e08f2dc4c23
+  metadata.gz: b5c05d3ed42d10f531f644c6eed5d57e481a5c67f0948f17b2e410371e447bcf472293c3821cc66c54eaff6be4d144184e6be92a264402003b552417f6fe7853
+  data.tar.gz: 2014b67019c22d96d73248e90a0c086d90b0824c77b6fe23786dd6a33c38264b60d135f1aacd06087319668d59327c62fc7b9861ec873b8f8d120a14e9e27e5d

data/CHANGES.txt

@@ -1,4 +1,9 @@
-=== 3.1.0.beta1
+=== 3.1.0.beta3
+
+* forward/on_open_failed should stop listning closed socket otherwise it locks #269 [Miklos Fazekas,Scott McGillivray]
+* fix incorrect pattern handling in config files #310 [Miklos Fazekas]
+
+=== 3.1.0.beta2
 
 * trying to execute something on a not yet opend channel throws nicer messag [Miklos Fazekas]
 * calling close on a not opened channel marks the channel for close [Miklos Fazekas]

data/Rakefile

@@ -72,6 +72,31 @@ RDoc::Task.new do |rdoc|
 end
 end
 
+namespace :rdoc do
+desc "Update gh-pages branch"
+task :publish do
+  # copy/checkout
+  rm_rf "/tmp/net-ssh-rdoc"
+  rm_rf "/tmp/net-ssh-gh-pages"
+  cp_r "./rdoc", "/tmp/net-ssh-rdoc"
+  mkdir "/tmp/net-ssh-gh-pages"
+  Dir.chdir "/tmp/net-ssh-gh-pages" do
+    sh "git clone --branch gh-pages --single-branch https://github.com/net-ssh/net-ssh"
+    rm_rf "/tmp/net-ssh-gh-pages/net-ssh/*"
+  end
+  # update
+  sh "cp -rf ./rdoc/* /tmp/net-ssh-gh-pages/net-ssh/"
+  Dir.chdir "/tmp/net-ssh-gh-pages/net-ssh" do
+    sh "git add -A ."
+    sh "git commit -m \"Update docs\""
+  end
+  # publish
+  Dir.chdir "/tmp/net-ssh-gh-pages/net-ssh" do
+    sh "git push origin gh-pages"
+  end
+end
+end
+
 require 'rake/testtask'
 Rake::TestTask.new do |t|
   if ENV['NET_SSH_RUN_INTEGRATION_TESTS']

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

@@ -69,7 +69,7 @@ module Net; module SSH; module Authentication
           attempted << name
 
           debug { "trying #{name}" }
-          begin 
+          begin
             method = Methods.const_get(name.split(/\W+/).map { |p| p.capitalize }.join).new(self, :key_manager => key_manager)
           rescue NameError
             debug{"Mechanism #{name} was requested, but isn't a known type.  Ignoring it."}

data/lib/net/ssh/config.rb

@@ -242,11 +242,22 @@ module Net; module SSH
         # Converts an ssh_config pattern into a regex for matching against
         # host names.
         def pattern2regex(pattern)
-          pattern = "^" + pattern.to_s.gsub(/\./, "\\.").
-            gsub(/\?/, '.').
-            gsub(/([+\/])/, '\\\\\\0').
-            gsub(/\*/, '.*') + "$"
-          Regexp.new(pattern, true)
+          tail = pattern
+          prefix = ""
+          while !tail.empty? do
+            head,sep,tail = tail.partition(/[\*\?]/)
+            prefix = prefix + Regexp.quote(head)
+            case sep
+            when '*'
+              prefix += '.*'
+            when '?'
+              prefix += '.'
+            when ''
+            else
+              fail "Unpexpcted sep:#{sep}"
+            end
+          end
+          Regexp.new("^" + prefix + "$", true)
         end
 
         # Converts the given size into an integer number of bytes.

data/lib/net/ssh/known_hosts.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     class <<self
 
       # Searches all known host files (see KnownHosts.hostfiles) for all keys
-      # of the given host. Returns an array of keys found.
+      # of the given host. Returns an enumerable of keys found.
       def search_for(host, options={})
         HostKeys.new(search_in(hostfiles(options), host), host, self, options)
       end

data/lib/net/ssh/service/forward.rb

@@ -91,6 +91,7 @@ module Net; module SSH; module Service
 
         channel.on_open_failed do |ch, code, description|
           channel.error { "could not establish direct channel: #{description} (#{code})" }
+          session.stop_listening_to(channel[:socket])
           channel[:socket].close
         end
       end
@@ -273,7 +274,6 @@ module Net; module SSH; module Service
           ch[:socket].enqueue(data)
         end
 
-        # Handles server close on the sending side by Miklós Fazekas
         channel.on_eof do |ch|
           debug { "eof #{type} on #{type} forwarded channel" }
           begin

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

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.1.0.beta2 ruby lib
+# stub: net-ssh 3.1.0.beta3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.1.0.beta2"
+  s.version = "3.1.0.beta3"
 
   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-03-05"
+  s.date = "2016-03-07"
   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 = [

data/test/integration/test_forward.rb

@@ -287,8 +287,8 @@ class TestForward < Test::Unit::TestCase
     end
   end
 
-  def start_server
-    server = TCPServer.open(0)
+  def start_server(server = nil, &block)
+    server ||= TCPServer.open(0)
     Thread.start do
       loop do
         Thread.start(server.accept) do |client|
@@ -432,4 +432,101 @@ class TestForward < Test::Unit::TestCase
       end
     end
   end
+
+  def _run_reading_client(client_done, local_port)
+    Thread.start do
+      begin
+        client = TCPSocket.new(localhost, local_port)
+        data = client.read(4096)
+        client.close
+        client_done << data
+      rescue
+        client_done << $!
+      end
+    end
+  end
+
+  def test_cannot_open_connection_should_allow_further_connections_on_different_forward
+    setup_ssh_env do
+      session = Net::SSH.start(*ssh_start_params)
+      server = start_server do |client|
+        data = client.write "hello"
+        client.close
+      end
+      # Forward to a non existing port
+      non_existing_port = 1234
+      local_port = session.forward.local(0, localhost, non_existing_port)
+      # should return connection refused
+      client_done = Queue.new
+      _run_reading_client(client_done, local_port)
+      timeout(5) do
+        session.loop(0.1) { client_done.empty? }
+      end
+      assert_equal nil, client_done.pop
+      assert client_done.empty?
+      # Forward to existing port
+      remote_port = server.addr[1]
+      local_port = session.forward.local(0, localhost, remote_port)
+      _run_reading_client(client_done, local_port)
+      timeout(5) do
+        session.loop(0.1) { client_done.empty? }
+      end
+      assert_equal "hello", client_done.pop
+      assert client_done.empty?
+    end
+  end
+
+  def test_cannot_open_connection_should_allow_further_connections_on_same
+    setup_ssh_env do
+      session = Net::SSH.start(*ssh_start_params)
+      server = TCPServer.open(0)
+      # Forward to a non existing port
+      remote_port = server.addr[1]
+      server.close
+      local_port = session.forward.local(0, localhost, remote_port)
+      # should return connection refused
+      client_done = Queue.new
+      _run_reading_client(client_done, local_port)
+      timeout(5) do
+        session.loop(0.1) { client_done.empty? }
+      end
+      assert_equal nil, client_done.pop
+      assert client_done.empty?
+      # start server
+      server = TCPServer.open(remote_port)
+      server = start_server(server) do |client|
+        data = client.write "hello"
+        client.close
+      end
+      _run_reading_client(client_done, local_port)
+      timeout(5) do
+        session.loop(0.1) { client_done.empty? }
+      end
+      assert_equal "hello", client_done.pop
+      assert client_done.empty?
+    end
+  end
+
+  def test_cancel_local
+    setup_ssh_env do
+      session = Net::SSH.start(*ssh_start_params)
+      server = start_server(server) do |client|
+        data = client.write "hello"
+        client.close
+      end
+      remote_port = server.addr[1]
+      local_port = session.forward.local(0, localhost, remote_port)
+      # run client
+      client_done = Queue.new
+      _run_reading_client(client_done, local_port)
+      timeout(5) do
+        session.loop(0.1) { client_done.empty? }
+      end
+      assert_equal "hello", client_done.pop
+      # cancel
+      session.forward.cancel_local(local_port)
+      session.loop(0.1)
+      assert_equal({}, session.channels)
+    end
+  end
 end

data/test/test_config.rb

@@ -1,6 +1,7 @@
 require 'common'
 require 'net/ssh/config'
 require 'pathname'
+require 'tempfile'
 
 class TestConfig < Test::Unit::TestCase
   def test_home_should_be_absolute_path
@@ -41,6 +42,33 @@ class TestConfig < Test::Unit::TestCase
     assert !config.key?('compression')
   end
 
+  def test_load_with_pattern_does_match
+    data = %q{
+      Host test.*
+        Port 1234
+        Compression no
+    }
+    with_config_from_data data do |f|
+      config = Net::SSH::Config.load(f, "test.host")
+      assert_equal 1234, config['port']
+    end
+  end
+
+  def test_load_with_regex_chars
+    data = %q{
+      Host |
+        Port 1234
+        Compression no
+    }
+    with_config_from_data data do |f|
+      config = Net::SSH::Config.load(f, "test.host")
+      assert_equal nil, config['port']
+      config = Net::SSH::Config.load(f, "|")
+      assert_equal 1234, config['port']
+    end
+  end
+
+
   def test_for_should_load_all_files_and_translate_to_net_ssh_options
     config = Net::SSH::Config.for("test.host", [config(:exact_match), config(:wild_cards)])
     assert_equal 1234, config[:port]
@@ -229,4 +257,12 @@ class TestConfig < Test::Unit::TestCase
     def config(name)
       "test/configs/#{name}"
     end
+
+    def with_config_from_data(data, &block)
+      Tempfile.open('config') do |f|
+        f.write(data)
+        f.close
+        yield(f.path)
+      end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta2
+  version: 3.1.0.beta3
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit