net-ssh 5.0.0.beta1 → 5.0.0.beta2

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

@@ -1,30 +1,34 @@
-module Net; module SSH; module Authentication
-
-# Loads ED25519 support which requires optinal dependecies like
-# 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)
-  description = ERROR.is_a?(LoadError) ? dependenciesRequiredForED25519 : ''
-  description << "#{ERROR.class} : \"#{ERROR.message}\"\n" if ERROR
-  raise NotImplementedError, "#{message}\n#{description}" unless LOADED
-end
-
-def self.dependenciesRequiredForED25519
-  result = "net-ssh requires the following gems for ed25519 support:\n"
-  result << " * ed25519 (>= 1.2, < 2.0)\n"
-  result << " * bcrypt_pbkdf (>= 1.0, < 2.0)\n" unless RUBY_PLATFORM == "java"
-  result << "See https://github.com/net-ssh/net-ssh/issues/565 for more information\n"
-end
+module Net 
+  module SSH 
+    module Authentication
 
+      # Loads ED25519 support which requires optinal dependecies like
+      # 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)
+          description = ERROR.is_a?(LoadError) ? dependenciesRequiredForED25519 : ''
+          description << "#{ERROR.class} : \"#{ERROR.message}\"\n" if ERROR
+          raise NotImplementedError, "#{message}\n#{description}" unless LOADED
+        end
+      
+        def self.dependenciesRequiredForED25519
+          result = "net-ssh requires the following gems for ed25519 support:\n"
+          result << " * ed25519 (>= 1.2, < 2.0)\n"
+          result << " * bcrypt_pbkdf (>= 1.0, < 2.0)\n" unless RUBY_PLATFORM == "java"
+          result << "See https://github.com/net-ssh/net-ssh/issues/565 for more information\n"
+        end
+      
+      end
+    end
+  end
 end
-end; end; end

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

@@ -43,7 +43,7 @@ module Net
           self.logger = logger
           @key_files = []
           @key_data = []
-          @use_agent = !(options[:use_agent] == false)
+          @use_agent = options[:use_agent] != false
           @known_identities = {}
           @agent = nil
           @options = options
@@ -182,6 +182,10 @@ module Net
           nil
         end
 
+        def no_keys?
+          key_files.empty? && key_data.empty?
+        end
+
         private
 
         # Prepares identities from user key_files for loading, preserving their order and sources.
@@ -235,7 +239,6 @@ module Net
               else
                 identity
               end
-
             rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError, OpenSSL::PKey::ECError, OpenSSL::PKey::PKeyError, ArgumentError => e
               if ignore_decryption_errors
                 identity
@@ -260,7 +263,6 @@ module Net
             raise e
           end
         end
-
       end
     end
   end

data/lib/net/ssh/authentication/methods/abstract.rb

@@ -3,62 +3,68 @@ require 'net/ssh/errors'
 require 'net/ssh/loggable'
 require 'net/ssh/authentication/constants'
 
-module Net; module SSH; module Authentication; module Methods
+module Net
+  module SSH
+    module Authentication
+      module Methods
 
-  # The base class of all user authentication methods. It provides a few
-  # bits of common functionality.
-  class Abstract
-    include Constants, Loggable
+        # The base class of all user authentication methods. It provides a few
+        # bits of common functionality.
+        class Abstract
+          include Loggable
+          include Constants
 
-    # The authentication session object
-    attr_reader :session
+          # The authentication session object
+          attr_reader :session
 
-    # The key manager object. Not all authentication methods will require
-    # this.
-    attr_reader :key_manager
+          # The key manager object. Not all authentication methods will require
+          # this.
+          attr_reader :key_manager
 
-    # Instantiates a new authentication method.
-    def initialize(session, options={})
-      @session = session
-      @key_manager = options[:key_manager]
-      @options = options
-      @prompt = options[:password_prompt]
-      self.logger = session.logger
-    end
+          # Instantiates a new authentication method.
+          def initialize(session, options={})
+            @session = session
+            @key_manager = options[:key_manager]
+            @options = options
+            @prompt = options[:password_prompt]
+            self.logger = session.logger
+          end
 
-    # Returns the session-id, as generated during the first key exchange of
-    # an SSH connection.
-    def session_id
-      session.transport.algorithms.session_id
-    end
+          # Returns the session-id, as generated during the first key exchange of
+          # an SSH connection.
+          def session_id
+            session.transport.algorithms.session_id
+          end
 
-    # Sends a message via the underlying transport layer abstraction. This
-    # will block until the message is completely sent.
-    def send_message(msg)
-      session.transport.send_message(msg)
-    end
+          # Sends a message via the underlying transport layer abstraction. This
+          # will block until the message is completely sent.
+          def send_message(msg)
+            session.transport.send_message(msg)
+          end
 
-    # Creates a new USERAUTH_REQUEST packet. The extra arguments on the end
-    # must be either boolean values or strings, and are tacked onto the end
-    # of the packet. The new packet is returned, ready for sending.
-    def userauth_request(username, next_service, auth_method, *others)
-      buffer = Net::SSH::Buffer.from(:byte, USERAUTH_REQUEST,
-        :string, username, :string, next_service, :string, auth_method)
+          # Creates a new USERAUTH_REQUEST packet. The extra arguments on the end
+          # must be either boolean values or strings, and are tacked onto the end
+          # of the packet. The new packet is returned, ready for sending.
+          def userauth_request(username, next_service, auth_method, *others)
+            buffer = Net::SSH::Buffer.from(:byte, USERAUTH_REQUEST,
+              :string, username, :string, next_service, :string, auth_method)
 
-      others.each do |value|
-        case value
-        when true, false then buffer.write_bool(value)
-        when String      then buffer.write_string(value)
-        else raise ArgumentError, "don't know how to write #{value.inspect}"
-        end
-      end
+            others.each do |value|
+              case value
+              when true, false then buffer.write_bool(value)
+              when String      then buffer.write_string(value)
+              else raise ArgumentError, "don't know how to write #{value.inspect}"
+              end
+            end
 
-      buffer
-    end
+            buffer
+          end
 
-    private
+          private
 
-    attr_reader :prompt
+          attr_reader :prompt
+        end
+      end
+    end
   end
-
-end; end; end; end
+end

data/lib/net/ssh/authentication/methods/hostbased.rb

@@ -24,49 +24,48 @@ module Net
 
           private
 
-            # Returns the hostname as reported by the underlying socket.
-            def hostname
-              session.transport.socket.client_name
-            end
-
-            # Attempts to perform host-based authentication of the user, using
-            # the given host identity (key).
-            def authenticate_with(identity, next_service, username, key_manager)
-              debug { "trying hostbased (#{identity.fingerprint})" }
-              client_username = ENV['USER'] || username
+          # Returns the hostname as reported by the underlying socket.
+          def hostname
+            session.transport.socket.client_name
+          end
 
-              req = build_request(identity, next_service, username, "#{hostname}.", client_username)
-              sig_data = Buffer.from(:string, session_id, :raw, req)
+          # Attempts to perform host-based authentication of the user, using
+          # the given host identity (key).
+          def authenticate_with(identity, next_service, username, key_manager)
+            debug { "trying hostbased (#{identity.fingerprint})" }
+            client_username = ENV['USER'] || username
 
-              sig = key_manager.sign(identity, sig_data.to_s)
+            req = build_request(identity, next_service, username, "#{hostname}.", client_username)
+            sig_data = Buffer.from(:string, session_id, :raw, req)
 
-              message = Buffer.from(:raw, req, :string, sig)
+            sig = key_manager.sign(identity, sig_data.to_s)
 
-              send_message(message)
-              message = session.next_message
+            message = Buffer.from(:raw, req, :string, sig)
 
-              case message.type
-                when USERAUTH_SUCCESS
-                  info { "hostbased succeeded (#{identity.fingerprint})" }
-                  return true
-                when USERAUTH_FAILURE
-                  info { "hostbased failed (#{identity.fingerprint})" }
+            send_message(message)
+            message = session.next_message
 
-                  raise Net::SSH::Authentication::DisallowedMethod unless
-                    message[:authentications].split(/,/).include? 'hostbased'
+            case message.type
+            when USERAUTH_SUCCESS
+              info { "hostbased succeeded (#{identity.fingerprint})" }
+              return true
+            when USERAUTH_FAILURE
+              info { "hostbased failed (#{identity.fingerprint})" }
 
-                  return false
-                else
-                  raise Net::SSH::Exception, "unexpected server response to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
-              end
-            end
+              raise Net::SSH::Authentication::DisallowedMethod unless
+                message[:authentications].split(/,/).include? 'hostbased'
 
-            # Build the "core" hostbased request string.
-            def build_request(identity, next_service, username, hostname, client_username)
-              userauth_request(username, next_service, "hostbased", identity.ssh_type,
-                Buffer.from(:key, identity).to_s, hostname, client_username).to_s
+              return false
+            else
+              raise Net::SSH::Exception, "unexpected server response to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
             end
+          end
 
+          # Build the "core" hostbased request string.
+          def build_request(identity, next_service, username, hostname, client_username)
+            userauth_request(username, next_service, "hostbased", identity.ssh_type,
+              Buffer.from(:key, identity).to_s, hostname, client_username).to_s
+          end
         end
 
       end

data/lib/net/ssh/authentication/methods/keyboard_interactive.rb

@@ -40,12 +40,10 @@ module Net
                 instruction = message.read_string
                 debug { "keyboard-interactive info request" }
 
-                if password.nil? && interactive? && prompter.nil?
-                  prompter = prompt.start(type: 'keyboard-interactive', name: name, instruction: instruction)
-                end
+                prompter = prompt.start(type: 'keyboard-interactive', name: name, instruction: instruction) if password.nil? && interactive? && prompter.nil?
 
                 _ = message.read_string # lang_tag
-                responses =[]
+                responses = []
 
                 message.read_long.times do
                   text = message.read_string

data/lib/net/ssh/authentication/methods/none.rb

@@ -14,18 +14,18 @@ module Net
             message = session.next_message
             
             case message.type
-              when USERAUTH_SUCCESS
-                debug { "none succeeded" }
-                return true
-              when USERAUTH_FAILURE
-                debug { "none failed" }
+            when USERAUTH_SUCCESS
+              debug { "none succeeded" }
+              return true
+            when USERAUTH_FAILURE
+              debug { "none failed" }
               
-                raise Net::SSH::Authentication::DisallowedMethod unless
-                  message[:authentications].split(/,/).include? 'none'
+              raise Net::SSH::Authentication::DisallowedMethod unless
+                message[:authentications].split(/,/).include? 'none'
               
-                return false
-              else
-                raise Net::SSH::Exception, "unexpected reply to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
+              return false
+            else
+              raise Net::SSH::Exception, "unexpected reply to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
             end   
             
           end

data/lib/net/ssh/authentication/methods/password.rb

@@ -14,7 +14,7 @@ module Net
           def authenticate(next_service, username, password=nil)
             clear_prompter!
             retries = 0
-            max_retries =  get_max_retries
+            max_retries = get_max_retries
             return false if !password && max_retries == 0
 
             begin
@@ -34,17 +34,17 @@ module Net
             end until (message.type != USERAUTH_FAILURE || retries >= max_retries)
 
             case message.type
-              when USERAUTH_SUCCESS
-                debug { "password succeeded" }
-                @prompter.success if @prompter
-                return true
-              when USERAUTH_FAILURE
-                return false
-              when USERAUTH_PASSWD_CHANGEREQ
-                debug { "password change request received, failing" }
-                return false
-              else
-                raise Net::SSH::Exception, "unexpected reply to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
+            when USERAUTH_SUCCESS
+              debug { "password succeeded" }
+              @prompter.success if @prompter
+              return true
+            when USERAUTH_FAILURE
+              return false
+            when USERAUTH_PASSWD_CHANGEREQ
+              debug { "password change request received, failing" }
+              return false
+            else
+              raise Net::SSH::Exception, "unexpected reply to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
             end
           end
 
@@ -59,7 +59,7 @@ module Net
 
           def ask_password(username)
             host = session.transport.host
-            prompt_info = {type: 'password', user: username, host: host}
+            prompt_info = { type: 'password', user: username, host: host }
             if @prompt_info != prompt_info
               @prompt_info = prompt_info
               @prompter = prompt.start(prompt_info)

data/lib/net/ssh/authentication/methods/publickey.rb

@@ -25,69 +25,68 @@ module Net
 
           private
 
-            # Builds a packet that contains the request formatted for sending
-            # a public-key request to the server.
-            def build_request(pub_key, username, next_service, has_sig)
-              blob = Net::SSH::Buffer.new
-              blob.write_key pub_key
-
-              userauth_request(username, next_service, "publickey", has_sig,
-                pub_key.ssh_type, blob.to_s)
-            end
+          # Builds a packet that contains the request formatted for sending
+          # a public-key request to the server.
+          def build_request(pub_key, username, next_service, has_sig)
+            blob = Net::SSH::Buffer.new
+            blob.write_key pub_key
+
+            userauth_request(username, next_service, "publickey", has_sig,
+              pub_key.ssh_type, blob.to_s)
+          end
 
-            # Builds and sends a request formatted for a public-key
-            # authentication request.
-            def send_request(pub_key, username, next_service, signature=nil)
-              msg = build_request(pub_key, username, next_service, !signature.nil?)
-              msg.write_string(signature) if signature
-              send_message(msg)
-            end
+          # Builds and sends a request formatted for a public-key
+          # authentication request.
+          def send_request(pub_key, username, next_service, signature=nil)
+            msg = build_request(pub_key, username, next_service, !signature.nil?)
+            msg.write_string(signature) if signature
+            send_message(msg)
+          end
+
+          # Attempts to perform public-key authentication for the given
+          # username, with the given identity (public key). Returns +true+ if
+          # successful, or +false+ otherwise.
+          def authenticate_with(identity, next_service, username)
+            debug { "trying publickey (#{identity.fingerprint})" }
+            send_request(identity, username, next_service)
 
-            # Attempts to perform public-key authentication for the given
-            # username, with the given identity (public key). Returns +true+ if
-            # successful, or +false+ otherwise.
-            def authenticate_with(identity, next_service, username)
-              debug { "trying publickey (#{identity.fingerprint})" }
-              send_request(identity, username, next_service)
+            message = session.next_message
 
+            case message.type
+            when USERAUTH_PK_OK
+              buffer = build_request(identity, username, next_service, true)
+              sig_data = Net::SSH::Buffer.new
+              sig_data.write_string(session_id)
+              sig_data.append(buffer.to_s)
+
+              sig_blob = key_manager.sign(identity, sig_data)
+
+              send_request(identity, username, next_service, sig_blob.to_s)
               message = session.next_message
 
               case message.type
-                when USERAUTH_PK_OK
-                  buffer = build_request(identity, username, next_service, true)
-                  sig_data = Net::SSH::Buffer.new
-                  sig_data.write_string(session_id)
-                  sig_data.append(buffer.to_s)
-
-                  sig_blob = key_manager.sign(identity, sig_data)
-
-                  send_request(identity, username, next_service, sig_blob.to_s)
-                  message = session.next_message
-
-                  case message.type
-                    when USERAUTH_SUCCESS
-                      debug { "publickey succeeded (#{identity.fingerprint})" }
-                      return true
-                    when USERAUTH_FAILURE
-                      debug { "publickey failed (#{identity.fingerprint})" }
-
-                      raise Net::SSH::Authentication::DisallowedMethod unless
-                        message[:authentications].split(/,/).include? 'publickey'
-
-                      return false
-                    else
-                      raise Net::SSH::Exception,
-                        "unexpected server response to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
-                  end
-
-                when USERAUTH_FAILURE
-                  return false
-
-                else
-                  raise Net::SSH::Exception, "unexpected reply to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
+              when USERAUTH_SUCCESS
+                debug { "publickey succeeded (#{identity.fingerprint})" }
+                return true
+              when USERAUTH_FAILURE
+                debug { "publickey failed (#{identity.fingerprint})" }
+
+                raise Net::SSH::Authentication::DisallowedMethod unless
+                  message[:authentications].split(/,/).include? 'publickey'
+
+                return false
+              else
+                raise Net::SSH::Exception,
+                  "unexpected server response to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
               end
-            end
 
+            when USERAUTH_FAILURE
+              return false
+
+            else
+              raise Net::SSH::Exception, "unexpected reply to USERAUTH_REQUEST: #{message.type} (#{message.inspect})"
+            end
+          end
         end
 
       end