hrr_rb_ssh 0.4.0.pre2 → 0.4.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30f9080fe870a47276559ae2d1588f29b2f3d9c90cdaea619e0c970d9c26c6e
-  data.tar.gz: 7c35bae6dd374c12c0931d260ce3304ea7e81a3922a47cc3c0ecb8f90b2bf595
+  metadata.gz: fff6a446ca6bc1035e2118c0e7a569aa74ae870feecc74ae08a544da2a7aa7b7
+  data.tar.gz: daafac5b3866a8d0139f170130867f420593e7ce0a1f72cb7a9734f5467bbc51
 SHA512:
-  metadata.gz: ebb98c0c172d302717ae84340693257eca78bba519901654b36913feb2f411a3dbb68e3bd11aa6aa42e14c9387173d860fa2992bec9e9a0dcc9fe6cc6233c2be
-  data.tar.gz: 79f2911726153c16c0acecc9fa34794bf734dfcd1bead634fab377816d0410ed113d5f229e2edc70eafd17fdccda86fad19eaa4a7fc06a2e0d61db190d478ab2
+  metadata.gz: 6702107a31da914abcacc80f8cc8a918adc47f23521bc716a4b4aed3b9ca5a7a0330cdeba6119891c9dbe02457bdf139d93688cc67c8b307a0e8207c097b57ac
+  data.tar.gz: c9ce61c6880b7b4f14e7f0006afe66bf2e9cf4bd589a83769e3392227632ed3ba123fdadc18e40f774cdd32c043f3f4dffc6c4d84f5ecd69c8578ca31090831a

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

@@ -8,10 +8,8 @@ module HrrRbSsh
   module Algorithm
     class Publickey
       module EcdsaSha2
-        module EcdsaSignatureBlob
-          class << self
-            include Codable
-          end
+        class EcdsaSignatureBlob
+          include Codable
           DEFINITION = [
             [DataType::Mpint, :'r'],
             [DataType::Mpint, :'s'],

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

@@ -8,10 +8,8 @@ module HrrRbSsh
   module Algorithm
     class Publickey
       module EcdsaSha2
-        module PublicKeyBlob
-          class << self
-            include Codable
-          end
+        class PublicKeyBlob
+          include Codable
           DEFINITION = [
             [DataType::String, :'public key algorithm name'],
             [DataType::String, :'identifier'],

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

@@ -8,10 +8,8 @@ module HrrRbSsh
   module Algorithm
     class Publickey
       module EcdsaSha2
-        module Signature
-          class << self
-            include Codable
-          end
+        class Signature
+          include Codable
           DEFINITION = [
             [DataType::String, :'public key algorithm name'],
             [DataType::String, :'ecdsa signature blob'],

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

@@ -24,7 +24,7 @@ module HrrRbSsh
         end
 
         def new_by_public_key_blob public_key_blob
-          public_key_blob_h = PublicKeyBlob.decode public_key_blob, logger: logger
+          public_key_blob_h = PublicKeyBlob.new(logger: logger).decode public_key_blob
           @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
@@ -39,7 +39,7 @@ module HrrRbSsh
             :'identifier'                => self.class::IDENTIFIER,
             :'Q'                         => @publickey.public_key.to_bn.to_s(2)
           }
-          PublicKeyBlob.encode public_key_blob_h, logger: logger
+          PublicKeyBlob.new(logger: logger).encode public_key_blob_h
         end
 
         def ecdsa_signature_blob signature_blob
@@ -52,7 +52,7 @@ module HrrRbSsh
             :'r' => r,
             :'s' => s,
           }
-          EcdsaSignatureBlob.encode ecdsa_signature_blob_h, logger: logger
+          EcdsaSignatureBlob.new(logger: logger).encode ecdsa_signature_blob_h
         end
 
         def sign signature_blob
@@ -60,12 +60,12 @@ module HrrRbSsh
             :'public key algorithm name' => self.class::NAME,
             :'ecdsa signature blob'      => ecdsa_signature_blob(signature_blob),
           }
-          Signature.encode signature_h, logger: logger
+          Signature.new(logger: logger).encode signature_h
         end
 
         def verify signature, signature_blob
-          signature_h = Signature.decode signature, logger: logger
-          ecdsa_signature_blob_h = EcdsaSignatureBlob.decode signature_h[:'ecdsa signature blob'], logger: logger
+          signature_h = Signature.new(logger: logger).decode signature
+          ecdsa_signature_blob_h = EcdsaSignatureBlob.new(logger: logger).decode signature_h[:'ecdsa signature blob']
           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/public_key_blob.rb

@@ -8,10 +8,8 @@ module HrrRbSsh
   module Algorithm
     class Publickey
       class SshDss
-        module PublicKeyBlob
-          class << self
-            include Codable
-          end
+        class PublicKeyBlob
+          include Codable
           DEFINITION = [
             [DataType::String, :'public key algorithm name'],
             [DataType::Mpint,  :'p'],

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

@@ -8,10 +8,8 @@ module HrrRbSsh
   module Algorithm
     class Publickey
       class SshDss
-        module Signature
-          class << self
-            include Codable
-          end
+        class Signature
+          include Codable
           DEFINITION = [
             [DataType::String, :'public key algorithm name'],
             [DataType::String, :'signature blob'],

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

@@ -26,7 +26,7 @@ module HrrRbSsh
         end
 
         def new_by_public_key_blob public_key_blob
-          public_key_blob_h = PublicKeyBlob.decode public_key_blob, logger: logger
+          public_key_blob_h = PublicKeyBlob.new(logger: logger).decode public_key_blob
           @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']
@@ -54,7 +54,7 @@ module HrrRbSsh
             :'g'                         => @publickey.g.to_i,
             :'y'                         => @publickey.pub_key.to_i,
           }
-          PublicKeyBlob.encode public_key_blob_h, logger: logger
+          PublicKeyBlob.new(logger: logger).encode public_key_blob_h
         end
 
         def sign signature_blob
@@ -67,11 +67,11 @@ module HrrRbSsh
             :'public key algorithm name' => self.class::NAME,
             :'signature blob'            => (sign_r + sign_s),
           }
-          Signature.encode signature_h, logger: logger
+          Signature.new(logger: logger).encode signature_h
         end
 
         def verify signature, signature_blob
-          signature_h = Signature.decode signature, logger: logger
+          signature_h = Signature.new(logger: logger).decode signature
           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/public_key_blob.rb

@@ -8,10 +8,8 @@ module HrrRbSsh
   module Algorithm
     class Publickey
       class SshRsa
-        module PublicKeyBlob
-          class << self
-            include Codable
-          end
+        class PublicKeyBlob
+          include Codable
           DEFINITION = [
             [DataType::String, :'public key algorithm name'],
             [DataType::Mpint,  :'e'],

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

@@ -8,10 +8,8 @@ module HrrRbSsh
   module Algorithm
     class Publickey
       class SshRsa
-        module Signature
-          class << self
-            include Codable
-          end
+        class Signature
+          include Codable
           DEFINITION = [
             [DataType::String, :'public key algorithm name'],
             [DataType::String, :'signature blob'],

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

@@ -26,7 +26,7 @@ module HrrRbSsh
         end
 
         def new_by_public_key_blob public_key_blob
-          public_key_blob_h = PublicKeyBlob.decode public_key_blob, logger: logger
+          public_key_blob_h = PublicKeyBlob.new(logger: logger).decode public_key_blob
           @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
@@ -46,7 +46,7 @@ module HrrRbSsh
             :'e'                         => @publickey.e.to_i,
             :'n'                         => @publickey.n.to_i,
           }
-          PublicKeyBlob.encode public_key_blob_h, logger: logger
+          PublicKeyBlob.new(logger: logger).encode public_key_blob_h
         end
 
         def sign signature_blob
@@ -54,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, logger: logger
+          Signature.new(logger: logger).encode signature_h
         end
 
         def verify signature, signature_blob
-          signature_h = Signature.decode signature, logger: logger
+          signature_h = Signature.new(logger: logger).decode signature
           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/info_request.rb

@@ -37,7 +37,7 @@ module HrrRbSsh
           end
 
           def to_payload
-            Message::SSH_MSG_USERAUTH_INFO_REQUEST.encode self.to_message, logger: logger
+            Message::SSH_MSG_USERAUTH_INFO_REQUEST.new(logger: logger).encode self.to_message
           end
         end
       end

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

@@ -18,7 +18,7 @@ module HrrRbSsh
             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, logger: logger
+              message = Message::SSH_MSG_USERAUTH_INFO_RESPONSE.new(logger: logger).decode payload
               @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

@@ -39,13 +39,13 @@ module HrrRbSsh
             :"language tag"   => "",
             :'submethods'     => "",
           }
-          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message, logger: logger
+          payload = Message::SSH_MSG_USERAUTH_REQUEST.new(logger: logger).encode message
           @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, logger: logger
+            message = Message::SSH_MSG_USERAUTH_INFO_REQUEST.new(logger: logger).decode payload
             num_responses = @options['client_authentication_keyboard_interactive'].size
             message = {
               :'message number' => Message::SSH_MSG_USERAUTH_INFO_RESPONSE::VALUE,
@@ -55,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, logger: logger
+            payload = Message::SSH_MSG_USERAUTH_INFO_RESPONSE.new(logger: logger).encode message
             @transport.send payload
             @transport.receive
           else

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

@@ -34,7 +34,7 @@ module HrrRbSsh
             :"service name"   => service_name,
             :"method name"    => NAME,
           }
-          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message, logger: logger
+          payload = Message::SSH_MSG_USERAUTH_REQUEST.new(logger: logger).encode message
           @transport.send payload
           payload = @transport.receive
         end

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

@@ -40,7 +40,7 @@ module HrrRbSsh
             :"FALSE"              => false,
             :"plaintext password" => password,
           }
-          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message, logger: logger
+          payload = Message::SSH_MSG_USERAUTH_REQUEST.new(logger: logger).encode message
           @transport.send payload
 
           payload = @transport.receive

data/lib/hrr_rb_ssh/authentication/method/publickey/algorithm/functionable.rb

@@ -38,7 +38,7 @@ module HrrRbSsh
                   :'public key algorithm name' => message[:'public key algorithm name'],
                   :'public key blob'           => message[:'public key blob'],
                 }
-                signature_blob = SignatureBlob.encode signature_blob_h, logger: logger
+                signature_blob = SignatureBlob.new(logger: logger).encode signature_blob_h
                 publickey = HrrRbSsh::Algorithm::Publickey[self.class::NAME].new message[:'public key blob'], logger: logger
                 publickey.verify message[:'signature'], signature_blob
               rescue => e
@@ -65,7 +65,7 @@ module HrrRbSsh
                 :'public key algorithm name' => self.class::NAME,
                 :'public key blob'           => publickey_blob
               }
-              signature_blob = SignatureBlob.encode signature_blob_h, logger: logger
+              signature_blob = SignatureBlob.new(logger: logger).encode signature_blob_h
               publickey.sign signature_blob
             end
           end

data/lib/hrr_rb_ssh/authentication/method/publickey/algorithm/signature_blob.rb

@@ -9,10 +9,8 @@ module HrrRbSsh
     class Method
       class Publickey
         class Algorithm
-          module SignatureBlob
-            class << self
-              include Codable
-            end
+          class SignatureBlob
+            include Codable
             DEFINITION = [
               [DataType::String,  :'session identifier'],
               [DataType::Byte,    :'message number'],

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

@@ -47,7 +47,7 @@ module HrrRbSsh
             :'public key algorithm name from the request' => public_key_algorithm_name,
             :'public key blob from the request'           => public_key_blob,
           }
-          payload = Message::SSH_MSG_USERAUTH_PK_OK.encode message, logger: logger
+          payload = Message::SSH_MSG_USERAUTH_PK_OK.new(logger: logger).encode message
         end
 
         def request_authentication username, service_name
@@ -75,7 +75,7 @@ module HrrRbSsh
             :'public key algorithm name' => public_key_algorithm_name,
             :'public key blob'           => public_key_blob,
           }
-          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message, logger: logger
+          payload = Message::SSH_MSG_USERAUTH_REQUEST.new(logger: logger).encode message
           @transport.send payload
         end
 
@@ -93,7 +93,7 @@ module HrrRbSsh
             :'public key blob'           => public_key_blob,
             :'signature'                 => signature,
           }
-          payload = Message::SSH_MSG_USERAUTH_REQUEST.encode message, logger: logger
+          payload = Message::SSH_MSG_USERAUTH_REQUEST.new(logger: logger).encode message
           @transport.send payload
         end
       end

data/lib/hrr_rb_ssh/authentication.rb

@@ -87,7 +87,7 @@ module HrrRbSsh
         payload = @transport.receive
         case payload[0,1].unpack("C")[0]
         when Message::SSH_MSG_USERAUTH_REQUEST::VALUE
-          userauth_request_message = Message::SSH_MSG_USERAUTH_REQUEST.decode payload, logger: logger
+          userauth_request_message = Message::SSH_MSG_USERAUTH_REQUEST.new(logger: logger).decode payload
           method_name = userauth_request_message[:'method name']
           log_info { "authentication method: #{method_name}" }
           method = Method[method_name].new(@transport, {'session id' => @transport.session_id}.merge(@options), @variables, authentication_methods, logger: logger)
@@ -143,7 +143,7 @@ module HrrRbSsh
           @closed = false
           break
         when Message::SSH_MSG_USERAUTH_FAILURE::VALUE
-          message = Message::SSH_MSG_USERAUTH_FAILURE.decode payload, logger: logger
+          message = Message::SSH_MSG_USERAUTH_FAILURE.new(logger: logger).decode payload
           partial_success = message[:'partial success']
           if partial_success
             log_info { "partially verified" }
@@ -169,7 +169,7 @@ module HrrRbSsh
         :'authentications that can continue' => authentication_methods,
         :'partial success'                   => partial_success,
       }
-      payload = Message::SSH_MSG_USERAUTH_FAILURE.encode message, logger: logger
+      payload = Message::SSH_MSG_USERAUTH_FAILURE.new(logger: logger).encode message
       @transport.send payload
     end
 
@@ -177,7 +177,7 @@ module HrrRbSsh
       message = {
         :'message number' => Message::SSH_MSG_USERAUTH_SUCCESS::VALUE,
       }
-      payload = Message::SSH_MSG_USERAUTH_SUCCESS.encode message, logger: logger
+      payload = Message::SSH_MSG_USERAUTH_SUCCESS.new(logger: logger).encode message
       @transport.send payload
     end
 

data/lib/hrr_rb_ssh/codable.rb

@@ -5,39 +5,34 @@ require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   module Codable
-    class LoggableClass
-      include Loggable
+    include Loggable
 
-      def initialize logger
-        self.logger = logger
-      end
+    def initialize logger: nil
+      self.logger = logger
     end
 
     def common_definition
-      self::DEFINITION
+      self.class::DEFINITION
     end
 
     def conditional_definition message
-      return [] unless self.const_defined? :CONDITIONAL_DEFINITION
+      return [] unless self.class.const_defined? :CONDITIONAL_DEFINITION
       message.inject([]){ |a, (k,v)|
         field_name  = k
         field_value = if v.instance_of? ::Proc then v.call else v end
-        a + (self::CONDITIONAL_DEFINITION.fetch(field_name, {})[field_value] || [])
+        a + (self.class::CONDITIONAL_DEFINITION.fetch(field_name, {})[field_value] || [])
       }
     end
 
-    def encode message, complementary_message={}, logger: nil
-      loggable_instalce = LoggableClass.new(logger)
-      loggable_instalce.log_key = self.to_s
-
-      loggable_instalce.log_debug { 'encoding message: ' + message.inspect }
+    def encode message, complementary_message={}
+      log_debug { 'encoding message: ' + message.inspect }
       definition = common_definition + conditional_definition(message.merge complementary_message)
       definition.map{ |data_type, field_name|
         begin
           field_value = if message[field_name].instance_of? ::Proc then message[field_name].call else message[field_name] end
           data_type.encode field_value
         rescue => e
-          loggable_instalce.log_debug { "'field_name', 'field_value': #{field_name.inspect}, #{field_value.inspect}" }
+          log_debug { "'field_name', 'field_value': #{field_name.inspect}, #{field_value.inspect}" }
           raise e
         end
       }.join
@@ -63,16 +58,13 @@ module HrrRbSsh
       end
     end
 
-    def decode payload, complementary_message={}, logger: nil
-      loggable_instalce = LoggableClass.new(logger)
-      loggable_instalce.log_key = self.to_s
-
+    def decode payload, complementary_message={}
       payload_io = StringIO.new payload
       decoded_message = decode_recursively(payload_io).inject(Hash.new){ |h, (k, v)| h.update({k => v}) }
       if complementary_message.any?
         decoded_message.merge! decode_recursively(payload_io, complementary_message.to_a).inject(Hash.new){ |h, (k, v)| h.update({k => v}) }
       end
-      loggable_instalce.log_debug { 'decoded message: ' + decoded_message.inspect }
+      log_debug { 'decoded message: ' + decoded_message.inspect }
       decoded_message
     end
   end

data/lib/hrr_rb_ssh/connection/channel.rb

@@ -405,7 +405,7 @@ module HrrRbSsh
           :'message number'    => Message::SSH_MSG_CHANNEL_SUCCESS::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = Message::SSH_MSG_CHANNEL_SUCCESS.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_SUCCESS.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -414,7 +414,7 @@ module HrrRbSsh
           :'message number'    => Message::SSH_MSG_CHANNEL_FAILURE::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = Message::SSH_MSG_CHANNEL_FAILURE.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_FAILURE.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -424,7 +424,7 @@ module HrrRbSsh
           :'recipient channel' => @remote_channel,
           :'bytes to add'      => INITIAL_WINDOW_SIZE,
         }
-        payload = Message::SSH_MSG_CHANNEL_WINDOW_ADJUST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_WINDOW_ADJUST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -434,7 +434,7 @@ module HrrRbSsh
           :'recipient channel' => @remote_channel,
           :'data'              => data,
         }
-        payload = Message::SSH_MSG_CHANNEL_DATA.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_DATA.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -445,7 +445,7 @@ module HrrRbSsh
           :'data type code'    => code,
           :'data'              => data,
         }
-        payload = Message::SSH_MSG_CHANNEL_EXTENDED_DATA.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_EXTENDED_DATA.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -462,7 +462,7 @@ module HrrRbSsh
           :'terminal height, pixels'         => term_height_pixel,
           :'encoded terminal modes'          => encoded_term_modes,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -475,7 +475,7 @@ module HrrRbSsh
           :'variable name'     => variable_name,
           :'variable value'    => variable_value,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -486,7 +486,7 @@ module HrrRbSsh
           :'request type'      => "shell",
           :'want reply'        => false,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -498,7 +498,7 @@ module HrrRbSsh
           :'want reply'        => false,
           :'command'           => command,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -510,7 +510,7 @@ module HrrRbSsh
           :'want reply'        => false,
           :'subsystem name'    => subsystem_name,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -525,7 +525,7 @@ module HrrRbSsh
           :'terminal width, pixels'  => term_width_pixel,
           :'terminal height, pixels' => term_height_pixel,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -537,7 +537,7 @@ module HrrRbSsh
           :'want reply'        => false,
           :'signal name'       => signal_name,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -549,7 +549,7 @@ module HrrRbSsh
           :'want reply'        => false,
           :'exit status'       => exitstatus,
         }
-        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -558,7 +558,7 @@ module HrrRbSsh
           :'message number'    => Message::SSH_MSG_CHANNEL_EOF::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = Message::SSH_MSG_CHANNEL_EOF.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_EOF.new(logger: logger).encode message
         @connection.send payload
       end
 
@@ -567,7 +567,7 @@ module HrrRbSsh
           :'message number'    => Message::SSH_MSG_CHANNEL_CLOSE::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = Message::SSH_MSG_CHANNEL_CLOSE.encode message, logger: logger
+        payload = Message::SSH_MSG_CHANNEL_CLOSE.new(logger: logger).encode message
         @connection.send payload
       end
     end