net-ssh 6.2.0.rc1 → 7.0.0.beta1

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

@@ -1,10 +1,9 @@
 require 'socket'
 require 'net/ssh/proxy/errors'
 
-module Net 
-  module SSH 
+module Net
+  module SSH
     module Proxy
-
       # An implementation of an HTTP proxy. To use it, instantiate it, then
       # pass the instantiated object via the :proxy key to Net::SSH.start:
       #
@@ -26,14 +25,14 @@ module Net
       class HTTP
         # The hostname or IP address of the HTTP proxy.
         attr_reader :proxy_host
-    
+
         # The port number of the proxy.
         attr_reader :proxy_port
-    
+
         # The map of additional options that were given to the object at
         # initialization.
         attr_reader :options
-    
+
         # Create a new socket factory that tunnels via the given host and
         # port. The +options+ parameter is a hash of additional settings that
         # can be used to tweak this proxy connection. Specifically, the following
@@ -41,52 +40,52 @@ module Net
         #
         # * :user => the user name to use when authenticating to the proxy
         # * :password => the password to use when authenticating
-        def initialize(proxy_host, proxy_port=80, options={})
+        def initialize(proxy_host, proxy_port = 80, options = {})
           @proxy_host = proxy_host
           @proxy_port = proxy_port
           @options = options
         end
-    
+
         # Return a new socket connected to the given host and port via the
         # proxy that was requested when the socket factory was instantiated.
         def open(host, port, connection_options)
           socket = establish_connection(connection_options[:timeout])
           socket.write "CONNECT #{host}:#{port} HTTP/1.1\r\n"
           socket.write "Host: #{host}:#{port}\r\n"
-    
+
           if options[:user]
             credentials = ["#{options[:user]}:#{options[:password]}"].pack("m*").gsub(/\s/, "")
             socket.write "Proxy-Authorization: Basic #{credentials}\r\n"
           end
-    
+
           socket.write "\r\n"
-    
+
           resp = parse_response(socket)
-    
+
           return socket if resp[:code] == 200
-    
+
           socket.close
           raise ConnectError, resp.inspect
         end
-    
+
         protected
-    
+
         def establish_connection(connect_timeout)
           Socket.tcp(proxy_host, proxy_port, nil, nil,
                      connect_timeout: connect_timeout)
         end
-    
+
         def parse_response(socket)
           version, code, reason = socket.gets.chomp.split(/ /, 3)
           headers = {}
-    
+
           while (line = socket.gets) && (line.chomp! != "")
             name, value = line.split(/:/, 2)
             headers[name.strip] = value.strip
           end
-    
+
           body = socket.read(headers["Content-Length"].to_i) if headers["Content-Length"]
-    
+
           return { version: version,
                    code: code.to_i,
                    reason: reason,
@@ -94,7 +93,6 @@ module Net
                    body: body }
         end
       end
-
     end
   end
 end

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

@@ -3,10 +3,9 @@ require 'openssl'
 require 'net/ssh/proxy/errors'
 require 'net/ssh/proxy/http'
 
-module Net 
-  module SSH 
+module Net
+  module SSH
     module Proxy
-
       # A specialization of the HTTP proxy which encrypts the whole connection
       # using OpenSSL. This has the advantage that proxy authentication
       # information is not sent in plaintext.
@@ -17,27 +16,27 @@ module Net
         # taken by Net::SSH::Proxy::HTTP it supports:
         #
         # * :ssl_context => the SSL configuration to use for the connection
-        def initialize(proxy_host, proxy_port=80, options={})
+        def initialize(proxy_host, proxy_port = 80, options = {})
           @ssl_context = options.delete(:ssl_context) ||
                            OpenSSL::SSL::SSLContext.new
           super(proxy_host, proxy_port, options)
         end
-    
+
         protected
-    
+
         # Shim to make OpenSSL::SSL::SSLSocket behave like a regular TCPSocket
         # for all intents and purposes of Net::SSH::BufferedIo
         module SSLSocketCompatibility
-          def self.extended(object) #:nodoc:
+          def self.extended(object) # :nodoc:
             object.define_singleton_method(:recv, object.method(:sysread))
             object.sync_close = true
           end
-    
+
           def send(data, _opts)
             syswrite(data)
           end
         end
-    
+
         def establish_connection(connect_timeout)
           plain_socket = super(connect_timeout)
           OpenSSL::SSL::SSLSocket.new(plain_socket, @ssl_context).tap do |socket|
@@ -46,7 +45,6 @@ module Net
           end
         end
       end
-
     end
   end
 end

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

@@ -1,10 +1,9 @@
 require 'uri'
 require 'net/ssh/proxy/command'
 
-module Net 
-  module SSH 
+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:
@@ -18,39 +17,38 @@ module Net
       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 = "ssh".dup
           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/proxy/socks4.rb

@@ -6,7 +6,6 @@ require 'net/ssh/proxy/errors'
 module Net
   module SSH
     module Proxy
-
       # An implementation of a SOCKS4 proxy. To use it, instantiate it, then
       # pass the instantiated object via the :proxy key to Net::SSH.start:
       #
@@ -38,7 +37,7 @@ module Net
         # Create a new proxy connection to the given proxy host and port.
         # Optionally, a :user key may be given to identify the username
         # with which to authenticate.
-        def initialize(proxy_host, proxy_port=1080, options={})
+        def initialize(proxy_host, proxy_port = 1080, options = {})
           @proxy_host = proxy_host
           @proxy_port = proxy_port
           @options = options
@@ -50,7 +49,7 @@ module Net
           socket = Socket.tcp(proxy_host, proxy_port, nil, nil,
                               connect_timeout: connection_options[:timeout])
           ip_addr = IPAddr.new(Resolv.getaddress(host))
-          
+
           packet = [VERSION, CONNECT, port.to_i, ip_addr.to_i, options[:user]].pack("CCnNZ*")
           socket.send packet, 0
 
@@ -63,7 +62,6 @@ module Net
           return socket
         end
       end
-
     end
   end
 end

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

@@ -4,7 +4,6 @@ require 'net/ssh/proxy/errors'
 module Net
   module SSH
     module Proxy
-
       # An implementation of a SOCKS5 proxy. To use it, instantiate it, then
       # pass the instantiated object via the :proxy key to Net::SSH.start:
       #
@@ -53,7 +52,7 @@ module Net
         # Create a new proxy connection to the given proxy host and port.
         # Optionally, :user and :password options may be given to
         # identify the username and password with which to authenticate.
-        def initialize(proxy_host, proxy_port=1080, options={})
+        def initialize(proxy_host, proxy_port = 1080, options = {})
           @proxy_host = proxy_host
           @proxy_port = proxy_port
           @options = options
@@ -94,7 +93,7 @@ module Net
 
           packet << [port].pack("n")
           socket.send packet, 0
-          
+
           version, reply, = socket.recv(2).unpack("C*")
           socket.recv(1)
           address_type = socket.recv(1).getbyte(0)
@@ -111,7 +110,7 @@ module Net
             raise ConnectError, "Illegal response type"
           end
           portnum = socket.recv(2)
-          
+
           unless reply == SUCCESS
             socket.close
             raise ConnectError, "#{reply}"
@@ -136,7 +135,6 @@ module Net
           end
         end
       end
-
     end
   end
 end

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

@@ -3,7 +3,6 @@ require 'net/ssh/loggable'
 module Net
   module SSH
     module Service
-
       # This class implements various port forwarding services for use by
       # Net::SSH clients. The Forward class should never need to be instantiated
       # directly; instead, it should be accessed via the singleton instance
@@ -18,7 +17,7 @@ module Net
         attr_reader :session
 
         # A simple class for representing a requested remote forwarded port.
-        Remote = Struct.new(:host, :port) #:nodoc:
+        Remote = Struct.new(:host, :port) # :nodoc:
 
         # Instantiates a new Forward service instance atop the given connection
         # service session. This will register new channel open handlers to handle
@@ -106,7 +105,7 @@ module Net
         #
         #   ssh.forward.cancel_local(1234)
         #   ssh.forward.cancel_local(1234, "0.0.0.0")
-        def cancel_local(port, bind_address="127.0.0.1")
+        def cancel_local(port, bind_address = "127.0.0.1")
           socket = @local_forwarded_ports.delete([port, bind_address])
           socket.shutdown rescue nil
           socket.close rescue nil
@@ -215,7 +214,7 @@ module Net
         #     raise Net::SSH::Exception, "remote forwarding request failed"
         #   end
         #
-        def remote(port, host, remote_port, remote_host="127.0.0.1")
+        def remote(port, host, remote_port, remote_host = "127.0.0.1")
           session.send_global_request("tcpip-forward", :string, remote_host, :long, remote_port) do |success, response|
             if success
               remote_port = response.read_long if remote_port == 0
@@ -249,7 +248,7 @@ module Net
         #
         #   ssh.forward.cancel_remote(1234, "0.0.0.0")
         #   ssh.loop { ssh.forward.active_remotes.include?([1234, "0.0.0.0"]) }
-        def cancel_remote(port, host="127.0.0.1")
+        def cancel_remote(port, host = "127.0.0.1")
           session.send_global_request("cancel-tcpip-forward", :string, host, :long, port) do |success, response|
             if success
               @remote_forwarded_ports.delete([port, host])
@@ -290,6 +289,7 @@ module Net
         #    end
         def agent(channel)
           return if @agent_forwarded
+
           @agent_forwarded = true
 
           channel.send_channel_request("auth-agent-req@openssh.com") do |achannel, success|
@@ -388,12 +388,13 @@ module Net
           originator_address = packet.read_string
           originator_port    = packet.read_long
 
+          puts "REMOTE 0: #{connected_port} #{connected_address} #{originator_address} #{originator_port}"
           remote = @remote_forwarded_ports[[connected_port, connected_address]]
-
           if remote.nil?
             raise Net::SSH::ChannelOpenFailed.new(1, "unknown request from remote forwarded connection on #{connected_address}:#{connected_port}")
           end
 
+          puts "REMOTE: #{remote.host} #{remote.port}"
           client = TCPSocket.new(remote.host, remote.port)
           info { "connected #{connected_address}:#{connected_port} originator #{originator_address}:#{originator_port}" }
 
@@ -420,7 +421,6 @@ module Net
           end
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
-module Net 
-  module SSH 
+module Net
+  module SSH
     module Test
-
       # A mock channel, used for scripting actions in tests. It wraps a
       # Net::SSH::Test::Script instance, and delegates to it for the most part.
       # This class has little real functionality on its own, but rather acts as
@@ -19,34 +18,34 @@ module Net
       class Channel
         # The Net::SSH::Test::Script instance employed by this mock channel.
         attr_reader :script
-    
+
         # Sets the local-id of this channel object (the id assigned by the client).
         attr_writer :local_id
-    
+
         # Sets the remote-id of this channel object (the id assigned by the mock-server).
         attr_writer :remote_id
-    
+
         # Creates a new Test::Channel instance on top of the given +script+ (which
         # must be a Net::SSH::Test::Script instance).
         def initialize(script)
           @script = script
           @local_id = @remote_id = nil
         end
-    
+
         # Returns the local (client-assigned) id for this channel, or a Proc object
         # that will return the local-id later if the local id has not yet been set.
         # (See Net::SSH::Test::Packet#instantiate!.)
         def local_id
           @local_id || Proc.new { @local_id or raise "local-id has not been set yet!" }
         end
-    
+
         # Returns the remote (server-assigned) id for this channel, or a Proc object
         # that will return the remote-id later if the remote id has not yet been set.
         # (See Net::SSH::Test::Packet#instantiate!.)
         def remote_id
           @remote_id || Proc.new { @remote_id or raise "remote-id has not been set yet!" }
         end
-    
+
         # Because adjacent calls to #gets_data will sometimes cause the data packets
         # to be concatenated (causing expectations in tests to fail), you may
         # need to separate those calls with calls to #inject_remote_delay! (which
@@ -58,62 +57,62 @@ module Net
         def inject_remote_delay!
           gets_data("")
         end
-    
-        # Scripts the sending of an "exec" channel request packet to the mock 
+
+        # Scripts the sending of an "exec" channel request packet to the mock
         # server. If +reply+ is true, then the server is expected to reply to the
         # request, otherwise no response to this request will be sent. If +success+
         # is +true+, then the request will be successful, otherwise a failure will
         # be scripted.
         #
         #   channel.sends_exec "ls -l"
-        def sends_exec(command, reply=true, success=true)
+        def sends_exec(command, reply = true, success = true)
           script.sends_channel_request(self, "exec", reply, command, success)
         end
-    
+
         # Scripts the sending of a "subsystem" channel request packet to the mock
         # server. See #sends_exec for a discussion of the meaning of the +reply+
         # and +success+ arguments.
         #
         #   channel.sends_subsystem "sftp"
-        def sends_subsystem(subsystem, reply=true, success=true)
+        def sends_subsystem(subsystem, reply = true, success = true)
           script.sends_channel_request(self, "subsystem", reply, subsystem, success)
         end
-    
+
         # Scripts the sending of a data packet across the channel.
         #
         #   channel.sends_data "foo"
         def sends_data(data)
           script.sends_channel_data(self, data)
         end
-    
+
         # Scripts the sending of an EOF packet across the channel.
         #
         #   channel.sends_eof
         def sends_eof
           script.sends_channel_eof(self)
         end
-    
+
         # Scripts the sending of a "channel close" packet across the channel.
         #
         #   channel.sends_close
         def sends_close
           script.sends_channel_close(self)
         end
-    
+
         # Scripts the sending of a "request pty" request packet across the channel.
         #
         #   channel.sends_request_pty
         def sends_request_pty
           script.sends_channel_request_pty(self)
         end
-    
+
         # Scripts the reception of a channel data packet from the remote end.
         #
         #   channel.gets_data "bar"
         def gets_data(data)
           script.gets_channel_data(self, data)
         end
-    
+
         # Scripts the reception of a channel extended data packet from the remote
         # end.
         #
@@ -121,21 +120,21 @@ module Net
         def gets_extended_data(data)
           script.gets_channel_extended_data(self, data)
         end
-    
+
         # Scripts the reception of an "exit-status" channel request packet.
         #
         #   channel.gets_exit_status(127)
-        def gets_exit_status(status=0)
+        def gets_exit_status(status = 0)
           script.gets_channel_request(self, "exit-status", false, status)
         end
-    
+
         # Scripts the reception of an EOF packet from the remote end.
         #
         #   channel.gets_eof
         def gets_eof
           script.gets_channel_eof(self)
         end
-    
+
         # Scripts the reception of a "channel close" packet from the remote end.
         #
         #   channel.gets_close
@@ -143,7 +142,6 @@ module Net
           script.gets_channel_close(self)
         end
       end
-
     end
   end
 end