hrr_rb_ssh 0.3.0.pre1 → 0.4.2

data/lib/hrr_rb_ssh/message/090_ssh_msg_channel_open.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_OPEN
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_OPEN
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 90

data/lib/hrr_rb_ssh/message/091_ssh_msg_channel_open_confirmation.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_OPEN_CONFIRMATION
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_OPEN_CONFIRMATION
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 91

data/lib/hrr_rb_ssh/message/092_ssh_msg_channel_open_failure.rb

@@ -6,7 +6,7 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_OPEN_FAILURE
+    class SSH_MSG_CHANNEL_OPEN_FAILURE
       module ReasonCode
         SSH_OPEN_ADMINISTRATIVELY_PROHIBITED = 1
         SSH_OPEN_CONNECT_FAILED              = 2
@@ -14,9 +14,7 @@ module HrrRbSsh
         SSH_OPEN_RESOURCE_SHORTAGE           = 4
       end
 
-      class << self
-        include Codable
-      end
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 92

data/lib/hrr_rb_ssh/message/093_ssh_msg_channel_window_adjust.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_WINDOW_ADJUST
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_WINDOW_ADJUST
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 93

data/lib/hrr_rb_ssh/message/094_ssh_msg_channel_data.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_DATA
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_DATA
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 94

data/lib/hrr_rb_ssh/message/095_ssh_msg_channel_extended_data.rb

@@ -6,14 +6,12 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_EXTENDED_DATA
+    class SSH_MSG_CHANNEL_EXTENDED_DATA
       module DataTypeCode
         SSH_EXTENDED_DATA_STDERR = 1
       end
 
-      class << self
-        include Codable
-      end
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 95

data/lib/hrr_rb_ssh/message/096_ssh_msg_channel_eof.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_EOF
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_EOF
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 96

data/lib/hrr_rb_ssh/message/097_ssh_msg_channel_close.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_CLOSE
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_CLOSE
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 97

data/lib/hrr_rb_ssh/message/098_ssh_msg_channel_request.rb

@@ -6,7 +6,7 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_REQUEST
+    class SSH_MSG_CHANNEL_REQUEST
       module SignalName
         ABRT = 'ABRT'
         ALRM = 'ALRM'
@@ -82,14 +82,12 @@ module HrrRbSsh
         TTY_OP_OSPEED = 129
       end
 
-      class << self
-        include Codable
-      end
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 98
 
-      TERMINAL_MODE_INV = TerminalMode.constants.map{|c| [TerminalMode.const_get(c), c.to_s]}.to_h
+      TERMINAL_MODE_INV = TerminalMode.constants.map{|c| [TerminalMode.const_get(c), c.to_s]}.inject(Hash.new){ |h, (k, v)| h.update({k => v}) }
 
       DEFINITION = [
         #[DataType, Field Name]

data/lib/hrr_rb_ssh/message/099_ssh_msg_channel_success.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_SUCCESS
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_SUCCESS
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 99

data/lib/hrr_rb_ssh/message/100_ssh_msg_channel_failure.rb

@@ -6,10 +6,8 @@ require 'hrr_rb_ssh/codable'
 
 module HrrRbSsh
   module Message
-    module SSH_MSG_CHANNEL_FAILURE
-      class << self
-        include Codable
-      end
+    class SSH_MSG_CHANNEL_FAILURE
+      include Codable
 
       ID    = self.name.split('::').last
       VALUE = 100

data/lib/hrr_rb_ssh/server.rb

@@ -1,29 +1,35 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 require 'hrr_rb_ssh/transport'
 require 'hrr_rb_ssh/authentication'
 require 'hrr_rb_ssh/connection'
 
 module HrrRbSsh
   class Server
-    def self.start io, options={}
-      server = self.new options
+    include Loggable
+
+    def self.start io, options={}, logger: nil
+      server = self.new options, logger: logger
       server.start io
     end
 
-    def initialize options={}
-      @logger = Logger.new self.class.name
+    def initialize options={}, logger: nil
+      self.logger = logger
       @options = options
     end
 
     def start io
-      @logger.info { "start server service" }
-      transport      = HrrRbSsh::Transport.new      io, HrrRbSsh::Mode::SERVER, @options
-      authentication = HrrRbSsh::Authentication.new transport, @options
-      connection     = HrrRbSsh::Connection.new     authentication, @options
-      connection.start
+      log_info { "start server service" }
+      transport      = Transport.new      io, Mode::SERVER, @options, logger: logger
+      authentication = Authentication.new transport, Mode::SERVER, @options, logger: logger
+      connection     = Connection.new     authentication, Mode::SERVER, @options, logger: logger
+      begin
+        connection.start
+      rescue Error::ClosedConnection
+      end
+      log_info { "server service finished" }
     end
   end
 end

data/lib/hrr_rb_ssh/transport.rb

@@ -3,7 +3,7 @@
 
 require 'monitor'
 require 'hrr_rb_ssh/version'
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message'
 require 'hrr_rb_ssh/error/closed_transport'
@@ -20,10 +20,12 @@ require 'hrr_rb_ssh/transport/compression_algorithm'
 
 module HrrRbSsh
   class Transport
+    include Loggable
     include Constant
 
     attr_reader \
       :io,
+      :mode,
       :supported_encryption_algorithms,
       :supported_server_host_key_algorithms,
       :supported_kex_algorithms,
@@ -49,20 +51,19 @@ module HrrRbSsh
       :i_s,
       :session_id
 
-    def initialize io, mode, options={}
+    def initialize io, mode, options={}, logger: nil
+      self.logger = logger
+
       @io = io
       @mode = mode
       @options = options
 
-      @logger = Logger.new self.class.name
-
       @closed = nil
-      @disconnected = nil
 
       @in_kex = false
 
-      @sender   = Sender.new
-      @receiver = Receiver.new
+      @sender   = Sender.new logger: logger
+      @receiver = Receiver.new logger: logger
 
       @sender_monitor   = Monitor.new
       @receiver_monitor = Monitor.new
@@ -86,15 +87,16 @@ module HrrRbSsh
     end
 
     def send payload
+      raise Error::ClosedTransport if @closed
       @sender_monitor.synchronize do
         begin
           @sender.send self, payload
-        rescue Errno::EPIPE => e
-          @logger.warn { "IO is Broken PIPE" }
+        rescue IOError, SystemCallError => e
+          log_info { "#{e.message} (#{e.class})" }
           close
           raise Error::ClosedTransport
         rescue => e
-          @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+          log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
           close
           raise Error::ClosedTransport
         end
@@ -108,25 +110,24 @@ module HrrRbSsh
           payload = @receiver.receive self
           case payload[0,1].unpack("C")[0]
           when Message::SSH_MSG_DISCONNECT::VALUE
-            message = Message::SSH_MSG_DISCONNECT.decode payload
-            @logger.debug { "received disconnect message: #{message.inspect}" }
-            @disconnected = true
+            log_info { "received disconnect message" }
+            message = Message::SSH_MSG_DISCONNECT.new(logger: logger).decode payload
             close
             raise Error::ClosedTransport
           when Message::SSH_MSG_IGNORE::VALUE
-            message = Message::SSH_MSG_IGNORE.decode payload
-            @logger.debug { "received ignore message: #{message.inspect}" }
+            log_info { "received ignore message" }
+            message = Message::SSH_MSG_IGNORE.new(logger: logger).decode payload
             receive
           when Message::SSH_MSG_UNIMPLEMENTED::VALUE
-            message = Message::SSH_MSG_UNIMPLEMENTED.decode payload
-            @logger.debug { "received unimplemented message: #{message.inspect}" }
+            log_info { "received unimplemented message" }
+            message = Message::SSH_MSG_UNIMPLEMENTED.new(logger: logger).decode payload
             receive
           when Message::SSH_MSG_DEBUG::VALUE
-            message = Message::SSH_MSG_DEBUG.decode payload
-            @logger.debug { "received debug message: #{message.inspect}" }
+            log_info { "received debug message" }
+            message = Message::SSH_MSG_DEBUG.new(logger: logger).decode payload
             receive
           when Message::SSH_MSG_KEXINIT::VALUE
-            @logger.debug { "received kexinit message" }
+            log_info { "received kexinit message" }
             if @in_kex
               payload
             else
@@ -137,20 +138,13 @@ module HrrRbSsh
             payload
           end
         rescue Error::ClosedTransport
-          raise Error::ClosedTransport
-        rescue EOFError => e
-          close
-          raise Error::ClosedTransport
-        rescue IOError => e
-          @logger.warn { "IO is closed" }
-          close
-          raise Error::ClosedTransport
-        rescue Errno::ECONNRESET => e
-          @logger.warn { "IO is RESET" }
+          raise
+        rescue EOFError, IOError, SystemCallError => e
+          log_info { "#{e.message} (#{e.class})" }
           close
           raise Error::ClosedTransport
         rescue => e
-          @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+          log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
           close
           raise Error::ClosedTransport
         end
@@ -158,36 +152,47 @@ module HrrRbSsh
     end
 
     def start
-      @logger.info { "start transport" }
-
+      log_info { "start transport" }
       begin
         exchange_version
         exchange_key
-
         case @mode
         when Mode::SERVER
           verify_service_request
+        when Mode::CLIENT
+          send_service_request
         end
-
         @closed = false
-      rescue EOFError => e
+      rescue Error::ClosedTransport
+        raise
+      rescue EOFError, IOError, SystemCallError => e
+        log_info { "#{e.message} (#{e.class})" }
         close
+        raise Error::ClosedTransport
       rescue => e
-        @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+        log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
         close
+        raise Error::ClosedTransport
       else
-        @logger.info { "transport started" }
+        log_info { "transport started" }
       end
     end
 
     def close
-      return if @closed
-      @logger.info { "close transport" }
-      @closed = true
-      disconnect
-      @incoming_compression_algorithm.close
-      @outgoing_compression_algorithm.close
-      @logger.info { "transport closed" }
+      @sender_monitor.synchronize do
+        return if @closed
+        log_info { "close transport" }
+        begin
+          disconnect
+          @incoming_compression_algorithm.close
+          @outgoing_compression_algorithm.close
+        rescue => e
+          log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+        ensure
+          @closed = true
+          log_info { "transport closed" }
+        end
+      end
     end
 
     def closed?
@@ -195,17 +200,9 @@ module HrrRbSsh
     end
 
     def disconnect
-      return if @disconnected
-      @logger.info { "disconnect transport" }
-      @disconnected = true
-      begin
-        send_disconnect
-      rescue IOError
-        @logger.warn { "IO is closed" }
-      rescue => e
-        @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-      end
-      @logger.info { "transport disconnected" }
+      log_info { "disconnect transport" }
+      send_disconnect
+      log_info { "transport disconnected" }
     end
 
     def exchange_version
@@ -235,7 +232,7 @@ module HrrRbSsh
     end
 
     def start_kex_algorithm
-      @kex_algorithm.start self, @mode
+      @kex_algorithm.start self
     end
 
     def verify_service_request
@@ -314,10 +311,10 @@ module HrrRbSsh
         if str_io.string[-2..-1] == "#{CR}#{LF}"
           if str_io.string[0..3] == "SSH-"
             @remote_version = str_io.string[0..-3]
-            @logger.info { "received remote version string: #{@remote_version}" }
+            log_info { "received remote version string: #{@remote_version}" }
             break
           else
-            @logger.info { "received message before remote version string: #{str_io.string}" }
+            log_info { "received message before remote version string: #{str_io.string}" }
             str_io.rewind
             str_io.truncate(0)
           end
@@ -343,8 +340,16 @@ module HrrRbSsh
         :'description'    => "disconnected by user",
         :'language tag'   => ""
       }
-      payload = Message::SSH_MSG_DISCONNECT.encode message
-      send payload
+      payload = Message::SSH_MSG_DISCONNECT.new(logger: logger).encode message
+      @sender_monitor.synchronize do
+        begin
+          @sender.send self, payload
+        rescue IOError, SystemCallError => e
+          log_info { "#{e.message} (#{e.class})" }
+        rescue => e
+          log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+        end
+      end
     end
 
     def send_kexinit
@@ -364,7 +369,7 @@ module HrrRbSsh
         :'first_kex_packet_follows'                => false,
         :'0 (reserved for future extension)'       => 0,
       }
-      payload = Message::SSH_MSG_KEXINIT.encode message
+      payload = Message::SSH_MSG_KEXINIT.new(logger: logger).encode message
       send payload
 
       case @mode
@@ -382,7 +387,7 @@ module HrrRbSsh
       when Mode::CLIENT
         @i_s = payload
       end
-      message = Message::SSH_MSG_KEXINIT.decode payload
+      message = Message::SSH_MSG_KEXINIT.new(logger: logger).decode payload
       update_remote_algorithms message
     end
 
@@ -390,28 +395,38 @@ module HrrRbSsh
         message = {
           :'message number' => Message::SSH_MSG_NEWKEYS::VALUE,
         }
-        payload = Message::SSH_MSG_NEWKEYS.encode message
+        payload = Message::SSH_MSG_NEWKEYS.new(logger: logger).encode message
         send payload
     end
 
     def receive_newkeys payload
-      message = Message::SSH_MSG_NEWKEYS.decode payload
+      message = Message::SSH_MSG_NEWKEYS.new(logger: logger).decode payload
     end
 
-    def receive_service_request
+    def send_service_request
+      message = {
+        :'message number' => Message::SSH_MSG_SERVICE_REQUEST::VALUE,
+        :'service name' => 'ssh-userauth',
+      }
+      payload = Message::SSH_MSG_SERVICE_REQUEST.new(logger: logger).encode message
+      send payload
+
       payload = @receiver.receive self
-      message = Message::SSH_MSG_SERVICE_REQUEST.decode payload
+      message = Message::SSH_MSG_SERVICE_ACCEPT.new(logger: logger).decode payload
+    end
 
-      message
+    def receive_service_request
+      payload = @receiver.receive self
+      message = Message::SSH_MSG_SERVICE_REQUEST.new(logger: logger).decode payload
     end
 
     def send_service_accept service_name
-        message = {
-          :'message number' => Message::SSH_MSG_SERVICE_ACCEPT::VALUE,
-          :'service name'   => service_name,
-        }
-        payload = Message::SSH_MSG_SERVICE_ACCEPT.encode message
-        send payload
+      message = {
+        :'message number' => Message::SSH_MSG_SERVICE_ACCEPT::VALUE,
+        :'service name'   => service_name,
+      }
+      payload = Message::SSH_MSG_SERVICE_ACCEPT.new(logger: logger).encode message
+      send payload
     end
 
     def update_remote_algorithms message
@@ -430,14 +445,14 @@ module HrrRbSsh
       when Mode::SERVER
         kex_algorithm_name             = @remote_kex_algorithms.find{ |a| @local_kex_algorithms.include? a } or raise
         server_host_key_algorithm_name = @remote_server_host_key_algorithms.find{ |a| @local_server_host_key_algorithms.include? a } or raise
+        server_secret_host_key         = @options.fetch('transport_server_secret_host_keys', {}).fetch(server_host_key_algorithm_name, nil)
       when Mode::CLIENT
         kex_algorithm_name             = @local_kex_algorithms.find{ |a| @remote_kex_algorithms.include? a } or raise
         server_host_key_algorithm_name = @local_server_host_key_algorithms.find{ |a| @remote_server_host_key_algorithms.include? a } or raise
+        server_secret_host_key         = nil
       end
-
-      server_secret_host_key = @options.fetch('transport_server_secret_host_keys', {}).fetch(server_host_key_algorithm_name, nil)
-      @kex_algorithm             = KexAlgorithm[kex_algorithm_name].new
       @server_host_key_algorithm = ServerHostKeyAlgorithm[server_host_key_algorithm_name].new server_secret_host_key
+      @kex_algorithm             = KexAlgorithm[kex_algorithm_name].new
     end
 
     def update_encryption_mac_compression_algorithms
@@ -458,6 +473,15 @@ module HrrRbSsh
         outgoing_crpt_iv = @kex_algorithm.iv_s_to_c self, outgoing_encryption_algorithm_name
         incoming_crpt_key = @kex_algorithm.key_c_to_s self, incoming_encryption_algorithm_name
         outgoing_crpt_key = @kex_algorithm.key_s_to_c self, outgoing_encryption_algorithm_name
+      when Mode::CLIENT
+        encryption_algorithm_s_to_c_name = @local_encryption_algorithms_server_to_client.find{ |a| @remote_encryption_algorithms_server_to_client.include? a } or raise
+        encryption_algorithm_c_to_s_name = @local_encryption_algorithms_client_to_server.find{ |a| @remote_encryption_algorithms_client_to_server.include? a } or raise
+        incoming_encryption_algorithm_name = encryption_algorithm_s_to_c_name
+        outgoing_encryption_algorithm_name = encryption_algorithm_c_to_s_name
+        incoming_crpt_iv = @kex_algorithm.iv_s_to_c self, incoming_encryption_algorithm_name
+        outgoing_crpt_iv = @kex_algorithm.iv_c_to_s self, outgoing_encryption_algorithm_name
+        incoming_crpt_key = @kex_algorithm.key_s_to_c self, incoming_encryption_algorithm_name
+        outgoing_crpt_key = @kex_algorithm.key_c_to_s self, outgoing_encryption_algorithm_name
       end
       @incoming_encryption_algorithm = EncryptionAlgorithm[incoming_encryption_algorithm_name].new Direction::INCOMING, incoming_crpt_iv, incoming_crpt_key
       @outgoing_encryption_algorithm = EncryptionAlgorithm[outgoing_encryption_algorithm_name].new Direction::OUTGOING, outgoing_crpt_iv, outgoing_crpt_key
@@ -472,6 +496,13 @@ module HrrRbSsh
         outgoing_mac_algorithm_name = mac_algorithm_s_to_c_name
         incoming_mac_key = @kex_algorithm.mac_c_to_s self, incoming_mac_algorithm_name
         outgoing_mac_key = @kex_algorithm.mac_s_to_c self, outgoing_mac_algorithm_name
+      when Mode::CLIENT
+        mac_algorithm_s_to_c_name = @local_mac_algorithms_server_to_client.find{ |a| @remote_mac_algorithms_server_to_client.include? a } or raise
+        mac_algorithm_c_to_s_name = @local_mac_algorithms_client_to_server.find{ |a| @remote_mac_algorithms_client_to_server.include? a } or raise
+        incoming_mac_algorithm_name = mac_algorithm_s_to_c_name
+        outgoing_mac_algorithm_name = mac_algorithm_c_to_s_name
+        incoming_mac_key = @kex_algorithm.mac_s_to_c self, incoming_mac_algorithm_name
+        outgoing_mac_key = @kex_algorithm.mac_c_to_s self, outgoing_mac_algorithm_name
       end
       @incoming_mac_algorithm = MacAlgorithm[incoming_mac_algorithm_name].new incoming_mac_key
       @outgoing_mac_algorithm = MacAlgorithm[outgoing_mac_algorithm_name].new outgoing_mac_key
@@ -484,6 +515,11 @@ module HrrRbSsh
         compression_algorithm_s_to_c_name = @remote_compression_algorithms_server_to_client.find{ |a| @local_compression_algorithms_server_to_client.include? a } or raise
         incoming_compression_algorithm_name = compression_algorithm_c_to_s_name
         outgoing_compression_algorithm_name = compression_algorithm_s_to_c_name
+      when Mode::CLIENT
+        compression_algorithm_s_to_c_name = @local_compression_algorithms_server_to_client.find{ |a| @remote_compression_algorithms_server_to_client.include? a } or raise
+        compression_algorithm_c_to_s_name = @local_compression_algorithms_client_to_server.find{ |a| @remote_compression_algorithms_client_to_server.include? a } or raise
+        incoming_compression_algorithm_name = compression_algorithm_s_to_c_name
+        outgoing_compression_algorithm_name = compression_algorithm_c_to_s_name
       end
       @incoming_compression_algorithm.close
       @outgoing_compression_algorithm.close