net-ssh 3.2.0.rc1 → 3.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1477e274c366e8b51cf9112399b5c6b7854df2bd
-  data.tar.gz: 7e5884773d502b4dcde4013810e4be0369a77e9e
+  metadata.gz: 4bc08b5859ba2b8174bc55389dd24b304f4f1404
+  data.tar.gz: d620847f2da3225dccb38c971ef076a5fb437c56
 SHA512:
-  metadata.gz: 9f28aa655c03f370327c4a016652f8c48b535b6a7649d401763e28183e7718620eee881dfb4e0f40f1cda6d57954cd31ecd741be281bb2aa066fd8debd2d6637
-  data.tar.gz: 1b46532ef715789b9a81e2128a11cebcf332b7c413514b0ae3657b4ecafe2f519b90a10f20837ac217e60f7d3344b8b995df46de83e47c44fbdb8fa677ee43bc
+  metadata.gz: 2ca9e04291a887bc9fe4b303c0c8bb2fab017157ba96e2996aacfc5f724c9e53c01dec38de0a612e6351141c788f3b5fe4b15723e3893f395b0c122de9f03c14
+  data.tar.gz: 93b1c9d9f68860bbebb0bc213662848b768d442a4718ca9d3190473912dd48655457195ac6d44d6d9084a156befe567773a8ed48d6b8e909ebc3dbd17517cce6

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-?O���.-2~��}h��T�(����E1�JZ3�
��`�۷4RR�
[k����G>,}r�o
-;�|(��j���ã�:,nF����˶zn�XK�x�8^)1���Ȏo�q�ۃ�,�?��5���乨� '��٬�7�4������v�)�h�C�����ܰ\�%�!���1����7|�J�dmbˠ��~S̠�ˍV�-�Z�\]<�~��ܦ���J�4h�� ��f��������s �?lE�fT��
+8F�j�L�4G��_ط��bk
��ֲM��_�ȝ�[�����T��#xh;�<-(��W�Ҳ��˙�.�Sٹ��?�j��)�t�
U�*X-\30cI�g��-i
+�}MN��BQ�l%��4�}CM�%՞��gC�D�	��p3�N�(�^����V��_����zCtXe.��X��W����iS�c��Ql3���7����Xҕ]�E���I$��!��a.޹(2F\��c]`����N~��=�T��col��b_

data/lib/net/ssh.rb

@@ -70,7 +70,7 @@ 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
+      :append_supported_algorithms, :non_interactive, :agent_socket_factory
     ]
 
     # The standard means of starting a new SSH connection. When used with a
@@ -192,6 +192,9 @@ module Net
     #   password auth method
     # * :non_interactive => non interactive applications should set it to true
     #   to prefer failing a password/etc auth methods vs asking for password
+    # * :agent_socket_factory => enables the user to pass a lambda/block that will serve as the socket factory
+    #    Net::SSH::start(user,host,agent_socket_factory: ->{ UNIXSocket.open('/foo/bar') })
+    #    example: ->{ UNIXSocket.open('/foo/bar')}
     #
     # If +user+ parameter is nil it defaults to USER from ssh_config, or
     # local username

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

@@ -19,7 +19,7 @@ module Net; module SSH; module Authentication
 
     # Instantiates a new agent object, connects to a running SSH agent,
     # negotiates the agent protocol version, and returns the agent object.
-    def self.connect(logger=nil)
+    def self.connect(logger=nil, agent_socket_factory)
       agent = new(logger)
       agent.connect!
       agent

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

@@ -42,9 +42,9 @@ module Net; module SSH; module Authentication
 
     # Instantiates a new agent object, connects to a running SSH agent,
     # negotiates the agent protocol version, and returns the agent object.
-    def self.connect(logger=nil)
+    def self.connect(logger=nil, agent_socket_factory = nil)
       agent = new(logger)
-      agent.connect!
+      agent.connect!(agent_socket_factory)
       agent.negotiate!
       agent
     end
@@ -59,10 +59,10 @@ module Net; module SSH; module Authentication
     # given by the attribute writers. If the agent on the other end of the
     # socket reports that it is an SSH2-compatible agent, this will fail
     # (it only supports the ssh-agent distributed by OpenSSH).
-    def connect!
+    def connect!(agent_socket_factory = nil)
       begin
         debug { "connecting to ssh-agent" }
-        @socket = agent_socket_factory.open(ENV['SSH_AUTH_SOCK'])
+        @socket = agent_socket_factory.nil? ? socket_class.open(ENV['SSH_AUTH_SOCK']) : agent_socket_factory.call
       rescue
         error { "could not connect to ssh-agent" }
         raise AgentNotAvailable, $!.message
@@ -132,7 +132,7 @@ module Net; module SSH; module Authentication
     private
 
     # Returns the agent socket factory to use.
-    def agent_socket_factory
+    def socket_class
       if Net::SSH::Authentication::PLATFORM == :win32
         Pageant::Socket
       else

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

@@ -176,7 +176,7 @@ module Net
         # or if the agent is otherwise not available.
         def agent
           return unless use_agent?
-          @agent ||= Agent.connect(logger)
+          @agent ||= Agent.connect(logger, options[:agent_socket_factory])
         rescue AgentNotAvailable
           @use_agent = false
           nil

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

@@ -357,7 +357,7 @@ module Net; module SSH; module Service
         channel[:invisible] = true
 
         begin
-          agent = Authentication::Agent.connect(logger)
+          agent = Authentication::Agent.connect(logger, session.options[:agent_socket_factory])
           if (agent.socket.is_a? ::IO)
             prepare_client(agent.socket, channel, :agent)
           else

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   = "rc1"
+    PRE   = "rc2"
 
     # 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.2.0.rc1 ruby lib
+# stub: net-ssh 3.2.0.rc2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.2.0.rc1"
+  s.version = "3.2.0.rc2"
 
   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-05-27"
+  s.date = "2016-05-29"
   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/authentication/test_agent.rb

@@ -32,6 +32,11 @@ module Authentication
       agent(false).connect!
     end
 
+    def test_connect_should_use_agent_socket_factory_instead_of_factory
+      assert_equal agent.connect!, socket
+      assert_equal agent.connect!(agent_socket_factory), "/foo/bar.sock"
+    end
+
     def test_connect_should_raise_error_if_connection_could_not_be_established
       factory.expects(:open).raises(SocketError)
       assert_raises(Net::SSH::Authentication::AgentNotAvailable) { agent(false).connect! }
@@ -213,12 +218,15 @@ module Authentication
       def agent(auto=:connect)
         @agent ||= begin
           agent = Net::SSH::Authentication::Agent.new
-          agent.stubs(:agent_socket_factory).returns(factory)
+          agent.stubs(:socket_class).returns(factory)
           agent.connect! if auto == :connect
           agent
         end
       end
 
+      def agent_socket_factory
+        @agent_socket_factory ||= ->{"/foo/bar.sock"}
+      end
   end
 
 end

metadata

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