hrr_rb_ssh 0.4.0.pre1 → 0.4.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bab944f20759d7530c45a2b305e75786a1550434acd505a92042a49631447065
-  data.tar.gz: 4c57b3e6df49eecc99b8e3415915df6c58827fd7c79030bdeaee8c397a00b302
+  metadata.gz: c30f9080fe870a47276559ae2d1588f29b2f3d9c90cdaea619e0c970d9c26c6e
+  data.tar.gz: 7c35bae6dd374c12c0931d260ce3304ea7e81a3922a47cc3c0ecb8f90b2bf595
 SHA512:
-  metadata.gz: a725f5873e844406368f9958308ea95ed1a755a35cada1af968ae1c5c642d890483ca51eaf39f1512403ff7eda7da7760ee93f041a02e42c105a7d32517d5ff5
-  data.tar.gz: 7c594a07bddba8a7068c99ddee48a1188cf0d63bf7210307acc872b8d162103b5b6e39aa848f1547bfad7a7abc3f92c5720ed626b1970af8eb5aa02fedefad69
+  metadata.gz: ebb98c0c172d302717ae84340693257eca78bba519901654b36913feb2f411a3dbb68e3bd11aa6aa42e14c9387173d860fa2992bec9e9a0dcc9fe6cc6233c2be
+  data.tar.gz: 79f2911726153c16c0acecc9fa34794bf734dfcd1bead634fab377816d0410ed113d5f229e2edc70eafd17fdccda86fad19eaa4a7fc06a2e0d61db190d478ab2

data/README.md

@@ -82,25 +82,33 @@ require 'hrr_rb_ssh'
 
 __IMPORTANT__: DEBUG log level outputs all communications between local and remote in human-readable plain-text including password and any secret. Be careful to use logging.
 
-The library provides logging functionality. To enable logging of the library, you are to initialize `HrrRbSsh::Logger` class.
+The library provides logging functionality. To enable logging in the library, you are to give a `logger` to `Server.new` or `Client.new`.
 
 ```ruby
-HrrRbSsh::Logger.initialize logger
+HrrRbSsh::Server.new options, logger: logger
 ```
 
-Where, the `logger` variable can be an instance of standard Logger class or user-defined logger class. What `HrrRbSsh::Logger` class requires for `logger` variable is that the `logger` instance responds to `#fatal`, `#error`, `#warn`, `#info` and `#debug`.
+or
 
-For instance, `logger` variable can be prepared like below.
+```ruby
+HrrRbSsh::Client.new target, options, logger: logger
+```
+
+Where, the `logger` variable can be an instance of standard Logger class or user-defined logger class. What the library requires for `logger` variable is that the `logger` instance responds to `#fatal`, `#error`, `#warn`, `#info` and `#debug` with the following syntax.
 
 ```ruby
-logger = Logger.new STDOUT
-logger.level = Logger::INFO
+logger.fatal(progname){ message }
+logger.error(progname){ message }
+logger.warn(progname){ message }
+logger.info(progname){ message }
+logger.debug(progname){ message }
 ```
 
-To disable logging, you can un-initialize `HrrRbSsh::Logger`.
+For instance, `logger` variable can be prepared like below.
 
 ```ruby
-HrrRbSsh::Logger.uninitialize
+logger = Logger.new STDOUT
+logger.level = Logger::INFO
 ```
 
 ### Writing standard SSH server

data/demo/client.rb

@@ -11,9 +11,7 @@ rescue LoadError
 end
 
 logger = Logger.new STDOUT
-logger.level = Logger::INFO
 logger.level = Logger::DEBUG
-HrrRbSsh::Logger.initialize logger
 
 target = ['localhost', 10022]
 options = {
@@ -25,7 +23,7 @@ options = {
     #'password2' # when keyboard-interactive authentication requires 2nd response
   ],
 }
-HrrRbSsh::Client.start(target, options){ |conn|
+HrrRbSsh::Client.start(target, options, logger: logger){ |conn|
   puts conn.exec!('ls -l') # => [out, err]
 
   puts conn.exec!('ls -l', pty: true) # => [out, err] # "ls -l" command will be run on PTY

data/demo/echo_server.rb

@@ -12,8 +12,6 @@ def start_service io, logger=nil
     require 'hrr_rb_ssh'
   end
 
-  HrrRbSsh::Logger.initialize logger if logger
-
   auth_password = HrrRbSsh::Authentication::Authenticator.new { |context|
     true # accept any user and password
   }
@@ -39,7 +37,7 @@ def start_service io, logger=nil
   options['authentication_password_authenticator'] = auth_password
   options['connection_channel_request_shell']      = conn_echo
 
-  server = HrrRbSsh::Server.new options
+  server = HrrRbSsh::Server.new options, logger: logger
   server.start io
 end
 

data/demo/more_flexible_auth.rb

@@ -15,8 +15,6 @@ def start_service io, logger=nil
     require 'hrr_rb_ssh'
   end
 
-  HrrRbSsh::Logger.initialize logger if logger
-
   auth_none = HrrRbSsh::Authentication::Authenticator.new { |context|
     context.authentication_methods.push 'publickey'
     HrrRbSsh::Authentication::PARTIAL_SUCCESS
@@ -66,7 +64,7 @@ def start_service io, logger=nil
   options['connection_channel_request_exec']          = HrrRbSsh::Connection::RequestHandler::ReferenceExecRequestHandler.new
   options['connection_channel_request_window_change'] = HrrRbSsh::Connection::RequestHandler::ReferenceWindowChangeRequestHandler.new
 
-  server = HrrRbSsh::Server.new options
+  server = HrrRbSsh::Server.new options, logger: logger
   server.start io
 end
 

data/demo/multi_step_auth.rb

@@ -15,8 +15,6 @@ def start_service io, logger=nil
     require 'hrr_rb_ssh'
   end
 
-  HrrRbSsh::Logger.initialize logger if logger
-
   auth_publickey = HrrRbSsh::Authentication::Authenticator.new { |context|
     users = ['user1', 'user2']
     is_verified = users.any?{ |username|
@@ -60,7 +58,7 @@ def start_service io, logger=nil
   options['connection_channel_request_exec']          = HrrRbSsh::Connection::RequestHandler::ReferenceExecRequestHandler.new
   options['connection_channel_request_window_change'] = HrrRbSsh::Connection::RequestHandler::ReferenceWindowChangeRequestHandler.new
 
-  server = HrrRbSsh::Server.new options
+  server = HrrRbSsh::Server.new options, logger: logger
   server.start io
 end
 

data/demo/server.rb

@@ -15,8 +15,6 @@ def start_service io, logger=nil
     require 'hrr_rb_ssh'
   end
 
-  HrrRbSsh::Logger.initialize logger if logger
-
   tran_preferred_encryption_algorithms      = %w(aes128-ctr aes192-ctr aes256-ctr aes128-cbc 3des-cbc blowfish-cbc cast128-cbc aes192-cbc aes256-cbc arcfour)
   tran_preferred_server_host_key_algorithms = %w(ecdsa-sha2-nistp521 ecdsa-sha2-nistp384 ecdsa-sha2-nistp256 ssh-rsa ssh-dss)
   tran_preferred_kex_algorithms             = %w(ecdh-sha2-nistp521 ecdh-sha2-nistp384 ecdh-sha2-nistp256 diffie-hellman-group14-sha1 diffie-hellman-group1-sha1)
@@ -89,7 +87,7 @@ OfeosJOO9twerD7pPhmXREkygblPsEXaVA==
   options['connection_channel_request_exec']          = HrrRbSsh::Connection::RequestHandler::ReferenceExecRequestHandler.new
   options['connection_channel_request_window_change'] = HrrRbSsh::Connection::RequestHandler::ReferenceWindowChangeRequestHandler.new
 
-  server = HrrRbSsh::Server.new options
+  server = HrrRbSsh::Server.new options, logger: logger
   server.start io
 end
 

data/demo/subsystem_echo_server.rb

@@ -12,8 +12,6 @@ def start_service io, logger=nil
     require 'hrr_rb_ssh'
   end
 
-  HrrRbSsh::Logger.initialize logger if logger
-
   auth_password = HrrRbSsh::Authentication::Authenticator.new { |context|
     true # accept any user and password
   }
@@ -47,7 +45,7 @@ def start_service io, logger=nil
   options['authentication_password_authenticator'] = auth_password
   options['connection_channel_request_subsystem']  = conn_echo
 
-  server = HrrRbSsh::Server.new options
+  server = HrrRbSsh::Server.new options, logger: logger
   server.start io
 end
 

data/hrr_rb_ssh.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.16"
 end

data/lib/hrr_rb_ssh/algorithm/publickey/ecdsa_sha2.rb

@@ -1,14 +1,17 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 require 'hrr_rb_ssh/data_type'
 
 module HrrRbSsh
   module Algorithm
     class Publickey
       module EcdsaSha2
-        def initialize arg
+        include Loggable
+
+        def initialize arg, logger: nil
+          self.logger = logger
           begin
             new_by_key_str arg
           rescue OpenSSL::PKey::ECError
@@ -21,7 +24,7 @@ module HrrRbSsh
         end
 
         def new_by_public_key_blob public_key_blob
-          public_key_blob_h = PublicKeyBlob.decode(public_key_blob)
+          public_key_blob_h = PublicKeyBlob.decode public_key_blob, logger: logger
           @publickey = OpenSSL::PKey::EC.new(self.class::CURVE_NAME)
           @publickey.public_key = OpenSSL::PKey::EC::Point.new(@publickey.group, OpenSSL::BN.new(public_key_blob_h[:'Q'], 2))
         end
@@ -36,20 +39,20 @@ module HrrRbSsh
             :'identifier'                => self.class::IDENTIFIER,
             :'Q'                         => @publickey.public_key.to_bn.to_s(2)
           }
-          PublicKeyBlob.encode(public_key_blob_h)
+          PublicKeyBlob.encode public_key_blob_h, logger: logger
         end
 
         def ecdsa_signature_blob signature_blob
           hash = OpenSSL::Digest.digest(self.class::DIGEST, signature_blob)
           sign_der = @publickey.dsa_sign_asn1(hash)
-          sign_asn1 = OpenSSL::ASN1.decode(sign_der)
+          sign_asn1 = OpenSSL::ASN1.decode sign_der
           r = sign_asn1.value[0].value.to_i
           s = sign_asn1.value[1].value.to_i
           ecdsa_signature_blob_h = {
             :'r' => r,
             :'s' => s,
           }
-          EcdsaSignatureBlob.encode ecdsa_signature_blob_h
+          EcdsaSignatureBlob.encode ecdsa_signature_blob_h, logger: logger
         end
 
         def sign signature_blob
@@ -57,12 +60,12 @@ module HrrRbSsh
             :'public key algorithm name' => self.class::NAME,
             :'ecdsa signature blob'      => ecdsa_signature_blob(signature_blob),
           }
-          Signature.encode signature_h
+          Signature.encode signature_h, logger: logger
         end
 
         def verify signature, signature_blob
-          signature_h = Signature.decode signature
-          ecdsa_signature_blob_h = EcdsaSignatureBlob.decode signature_h[:'ecdsa signature blob']
+          signature_h = Signature.decode signature, logger: logger
+          ecdsa_signature_blob_h = EcdsaSignatureBlob.decode signature_h[:'ecdsa signature blob'], logger: logger
           r = ecdsa_signature_blob_h[:'r']
           s = ecdsa_signature_blob_h[:'s']
           sign_asn1 = OpenSSL::ASN1::Sequence.new(

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_dss.rb

@@ -1,16 +1,19 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   module Algorithm
     class Publickey
       class SshDss < Publickey
+        include Loggable
+
         NAME = 'ssh-dss'
         DIGEST = 'sha1'
 
-        def initialize arg
+        def initialize arg, logger: nil
+          self.logger = logger
           begin
             new_by_key_str arg
           rescue OpenSSL::PKey::DSAError
@@ -23,7 +26,7 @@ module HrrRbSsh
         end
 
         def new_by_public_key_blob public_key_blob
-          public_key_blob_h = PublicKeyBlob.decode(public_key_blob)
+          public_key_blob_h = PublicKeyBlob.decode public_key_blob, logger: logger
           @publickey = OpenSSL::PKey::DSA.new
           if @publickey.respond_to?(:set_pqg)
             @publickey.set_pqg public_key_blob_h[:'p'], public_key_blob_h[:'q'], public_key_blob_h[:'g']
@@ -51,24 +54,24 @@ module HrrRbSsh
             :'g'                         => @publickey.g.to_i,
             :'y'                         => @publickey.pub_key.to_i,
           }
-          PublicKeyBlob.encode(public_key_blob_h)
+          PublicKeyBlob.encode public_key_blob_h, logger: logger
         end
 
         def sign signature_blob
           hash = OpenSSL::Digest.digest(self.class::DIGEST, signature_blob)
           sign_der = @publickey.syssign(hash)
-          sign_asn1 = OpenSSL::ASN1.decode(sign_der)
+          sign_asn1 = OpenSSL::ASN1.decode sign_der
           sign_r = sign_asn1.value[0].value.to_s(2).rjust(20, ["00"].pack("H"))
           sign_s = sign_asn1.value[1].value.to_s(2).rjust(20, ["00"].pack("H"))
           signature_h = {
             :'public key algorithm name' => self.class::NAME,
             :'signature blob'            => (sign_r + sign_s),
           }
-          Signature.encode signature_h
+          Signature.encode signature_h, logger: logger
         end
 
         def verify signature, signature_blob
-          signature_h = Signature.decode signature
+          signature_h = Signature.decode signature, logger: logger
           sign_r = signature_h[:'signature blob'][ 0, 20]
           sign_s = signature_h[:'signature blob'][20, 20]
           sign_asn1 = OpenSSL::ASN1::Sequence.new(

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_rsa.rb

@@ -1,16 +1,19 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   module Algorithm
     class Publickey
       class SshRsa < Publickey
+        include Loggable
+
         NAME = 'ssh-rsa'
         DIGEST = 'sha1'
 
-        def initialize arg
+        def initialize arg, logger: nil
+          self.logger = logger
           begin
             new_by_key_str arg
           rescue OpenSSL::PKey::RSAError
@@ -23,7 +26,7 @@ module HrrRbSsh
         end
 
         def new_by_public_key_blob public_key_blob
-          public_key_blob_h = PublicKeyBlob.decode(public_key_blob)
+          public_key_blob_h = PublicKeyBlob.decode public_key_blob, logger: logger
           @publickey = OpenSSL::PKey::RSA.new
           if @publickey.respond_to?(:set_key)
             @publickey.set_key public_key_blob_h[:'n'], public_key_blob_h[:'e'], nil
@@ -43,7 +46,7 @@ module HrrRbSsh
             :'e'                         => @publickey.e.to_i,
             :'n'                         => @publickey.n.to_i,
           }
-          PublicKeyBlob.encode(public_key_blob_h)
+          PublicKeyBlob.encode public_key_blob_h, logger: logger
         end
 
         def sign signature_blob
@@ -51,11 +54,11 @@ module HrrRbSsh
             :'public key algorithm name' => self.class::NAME,
             :'signature blob'            => @publickey.sign(self.class::DIGEST, signature_blob),
           }
-          Signature.encode signature_h
+          Signature.encode signature_h, logger: logger
         end
 
         def verify signature, signature_blob
-          signature_h = Signature.decode signature
+          signature_h = Signature.decode signature, logger: logger
           signature_h[:'public key algorithm name'] == self.class::NAME && @publickey.verify(self.class::DIGEST, signature_h[:'signature blob'], signature_blob)
         end
       end

data/lib/hrr_rb_ssh/authentication/method/keyboard_interactive/context.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 require 'hrr_rb_ssh/authentication/method/keyboard_interactive/info_request'
 require 'hrr_rb_ssh/authentication/method/keyboard_interactive/info_response'
 
@@ -10,6 +10,8 @@ module HrrRbSsh
     class Method
       class KeyboardInteractive
         class Context
+          include Loggable
+
           attr_reader \
             :username,
             :submethods,
@@ -18,22 +20,21 @@ module HrrRbSsh
             :vars,
             :authentication_methods
 
-          def initialize transport, username, submethods, variables, authentication_methods
+          def initialize transport, username, submethods, variables, authentication_methods, logger: nil
+            self.logger = logger
             @transport = transport
             @username = username
             @submethods = submethods
             @variables = variables
             @vars = variables
             @authentication_methods = authentication_methods
-
-            @logger = Logger.new self.class.name
           end
 
           def info_request name, instruction, language_tag, prompts
-            @logger.info { "send userauth info request" }
-            @transport.send InfoRequest.new(name, instruction, language_tag, prompts).to_payload
-            @logger.info { "receive userauth info response" }
-            @info_response = InfoResponse.new @transport.receive
+            log_info { "send userauth info request" }
+            @transport.send InfoRequest.new(name, instruction, language_tag, prompts, logger: logger).to_payload
+            log_info { "receive userauth info response" }
+            @info_response = InfoResponse.new @transport.receive, logger: logger
           end
         end
       end

data/lib/hrr_rb_ssh/authentication/method/keyboard_interactive/info_request.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 require 'hrr_rb_ssh/message'
 
 module HrrRbSsh
@@ -9,13 +9,14 @@ module HrrRbSsh
     class Method
       class KeyboardInteractive
         class InfoRequest
-          def initialize name, instruction, language_tag, prompts
+          include Loggable
+
+          def initialize name, instruction, language_tag, prompts, logger: nil
+            self.logger = logger
             @name         = name
             @instruction  = instruction
             @language_tag = language_tag
             @prompts      = prompts
-
-            @logger = Logger.new self.class.name
           end
 
           def to_message
@@ -36,7 +37,7 @@ module HrrRbSsh
           end
 
           def to_payload
-            Message::SSH_MSG_USERAUTH_INFO_REQUEST.encode self.to_message
+            Message::SSH_MSG_USERAUTH_INFO_REQUEST.encode self.to_message, logger: logger
           end
         end
       end

data/lib/hrr_rb_ssh/authentication/method/keyboard_interactive/info_response.rb

@@ -8,14 +8,17 @@ module HrrRbSsh
     class Method
       class KeyboardInteractive
         class InfoResponse
+          include Loggable
+
           attr_reader \
             :num_responses,
             :responses
 
-          def initialize payload
+          def initialize payload, logger: nil
+            self.logger = logger
             case payload[0,1].unpack("C")[0]
             when Message::SSH_MSG_USERAUTH_INFO_RESPONSE::VALUE
-              message = Message::SSH_MSG_USERAUTH_INFO_RESPONSE.decode payload
+              message = Message::SSH_MSG_USERAUTH_INFO_RESPONSE.decode payload, logger: logger
               @num_responses = message[:'num-responses']
               @responses = Array.new(message[:'num-responses']){ |i| message[:"response[#{i+1}]"] }
             else

data/lib/hrr_rb_ssh/authentication/method/keyboard_interactive.rb

@@ -1,30 +1,32 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Authentication
     class Method
       class KeyboardInteractive < Method
+        include Loggable
+
         NAME = 'keyboard-interactive'
         PREFERENCE = 30
 
-        def initialize transport, options, variables, authentication_methods
-          @logger = Logger.new(self.class.name)
+        def initialize transport, options, variables, authentication_methods, logger: nil
+          self.logger = logger
           @transport = transport
           @options = options
-          @authenticator = options.fetch( 'authentication_keyboard_interactive_authenticator', Authenticator.new { false } )
+          @authenticator = options.fetch( 'authentication_keyboard_interactive_authenticator', Authenticator.new{ false } )
           @variables = variables
           @authentication_methods = authentication_methods
         end
 
         def authenticate userauth_request_message
-          @logger.info { "authenticate" }
-          @logger.debug { "userauth request: " + userauth_request_message.inspect }
+          log_info { "authenticate" }
+          log_debug { "userauth request: " + userauth_request_message.inspect }
           username = userauth_request_message[:'user name']
           submethods = userauth_request_message[:'submethods']
-          context = Context.new(@transport, username, submethods, @variables, @authentication_methods)
+          context = Context.new(@transport, username, submethods, @variables, @authentication_methods, logger: logger)
           @authenticator.authenticate context
         end
 
@@ -37,13 +39,13 @@ module HrrRbSsh
             :"language tag"   => "",
             :'submethods'     => "",
           }
-          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message
+          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message, logger: logger
           @transport.send payload
 
           payload = @transport.receive
           case payload[0,1].unpack("C")[0]
           when Message::SSH_MSG_USERAUTH_INFO_REQUEST::VALUE
-            message = Message::SSH_MSG_USERAUTH_INFO_REQUEST.decode payload
+            message = Message::SSH_MSG_USERAUTH_INFO_REQUEST.decode payload, logger: logger
             num_responses = @options['client_authentication_keyboard_interactive'].size
             message = {
               :'message number' => Message::SSH_MSG_USERAUTH_INFO_RESPONSE::VALUE,
@@ -53,7 +55,7 @@ module HrrRbSsh
               {:"response[#{i+1}]" => response}
             }.inject(Hash.new){ |a, b| a.merge(b) }
             message.update(message_responses)
-            payload = Message::SSH_MSG_USERAUTH_INFO_RESPONSE.encode message
+            payload = Message::SSH_MSG_USERAUTH_INFO_RESPONSE.encode message, logger: logger
             @transport.send payload
             @transport.receive
           else

data/lib/hrr_rb_ssh/authentication/method/none/context.rb

@@ -1,31 +1,32 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Authentication
     class Method
       class None
         class Context
+          include Loggable
+
           attr_reader \
             :username,
             :variables,
             :vars,
             :authentication_methods
 
-          def initialize username, variables, authentication_methods
+          def initialize username, variables, authentication_methods, logger: nil
+            self.logger = logger
             @username = username
             @variables = variables
             @vars = variables
             @authentication_methods = authentication_methods
-
-            @logger = Logger.new self.class.name
           end
 
           def verify username
-            @logger.info { "verify username" }
-            @logger.debug { "username is #{username}, @username is #{@username}" }
+            log_info { "verify username" }
+            log_debug { "username is #{username}, @username is #{@username}" }
             username == @username
           end
         end

data/lib/hrr_rb_ssh/authentication/method/none.rb

@@ -1,27 +1,29 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Authentication
     class Method
       class None < Method
+        include Loggable
+
         NAME = 'none'
         PREFERENCE = 0
 
-        def initialize transport, options, variables, authentication_methods
-          @logger = Logger.new(self.class.name)
+        def initialize transport, options, variables, authentication_methods, logger: nil
+          self.logger = logger
           @transport = transport
-          @authenticator = options.fetch( 'authentication_none_authenticator', Authenticator.new { false } )
+          @authenticator = options.fetch( 'authentication_none_authenticator', Authenticator.new{ false } )
           @variables = variables
           @authentication_methods = authentication_methods
         end
 
         def authenticate userauth_request_message
-          @logger.info { "authenticate" }
-          @logger.debug { "userauth request: " + userauth_request_message.inspect }
-          context = Context.new(userauth_request_message[:'user name'], @variables, @authentication_methods)
+          log_info { "authenticate" }
+          log_debug { "userauth request: " + userauth_request_message.inspect }
+          context = Context.new(userauth_request_message[:'user name'], @variables, @authentication_methods, logger: logger)
           @authenticator.authenticate context
         end
 
@@ -32,7 +34,7 @@ module HrrRbSsh
             :"service name"   => service_name,
             :"method name"    => NAME,
           }
-          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message
+          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message, logger: logger
           @transport.send payload
           payload = @transport.receive
         end

data/lib/hrr_rb_ssh/authentication/method/password/context.rb

@@ -1,13 +1,15 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Authentication
     class Method
       class Password
         class Context
+          include Loggable
+
           attr_reader \
             :username,
             :password,
@@ -15,19 +17,18 @@ module HrrRbSsh
             :vars,
             :authentication_methods
 
-          def initialize username, password, variables, authentication_methods
+          def initialize username, password, variables, authentication_methods, logger: nil
+            self.logger = logger
             @username = username
             @password = password
             @variables = variables
             @vars = variables
             @authentication_methods = authentication_methods
-
-            @logger = Logger.new self.class.name
           end
 
           def verify username, password
-            @logger.info { "verify username and password" }
-            @logger.debug { "username is #{username}, @username is #{@username}, and password is #{password}, @password is #{@password}" }
+            log_info { "verify username and password" }
+            log_debug { "username is #{username}, @username is #{@username}, and password is #{password}, @password is #{@password}" }
             username == @username and password == @password
           end
         end