hrr_rb_ssh 0.1.2 → 0.1.3

data/lib/hrr_rb_ssh/connection/channel/channel_type.rb

@@ -4,22 +4,27 @@
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
-        def self.list
-          ChannelType.list
-        end
+      class ChannelType
+        @subclass_list = Array.new
+        class << self
+          def inherited klass
+            @subclass_list.push klass if @subclass_list
+          end
 
-        def self.name_list
-          ChannelType.name_list
-        end
+          def [] key
+            __subclass_list__(__method__).find{ |klass| klass::NAME == key }
+          end
+
+          def __subclass_list__ method_name
+            send(:method_missing, method_name) unless @subclass_list
+            @subclass_list
+          end
 
-        def self.[] key
-          ChannelType[key]
+          private :__subclass_list__
         end
       end
     end
   end
 end
 
-require 'hrr_rb_ssh/connection/channel/channel_type/channel_type'
 require 'hrr_rb_ssh/connection/channel/channel_type/session'

data/lib/hrr_rb_ssh/connection/channel.rb

@@ -209,7 +209,7 @@ module HrrRbSsh
 
       def request message, variables
         request_type = message['request type']
-        ChannelType[@channel_type][request_type].run @proc_chain, @connection.username, @request_handler_io, variables, message, @connection.options
+        ChannelType[@channel_type]::RequestType[request_type].run @proc_chain, @connection.username, @request_handler_io, variables, message, @connection.options
       end
 
       def send_channel_success

data/lib/hrr_rb_ssh/data_type.rb

@@ -0,0 +1,153 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'openssl'
+
+module HrrRbSsh
+  module DataType
+    class Byte
+      def self.encode arg
+        case arg
+        when 0x00..0xff
+          [arg].pack("C")
+        else
+          raise ArgumentError, "must be in #{0x00}..#{0xff}, but got #{arg.inspect}"
+        end
+      end
+
+      def self.decode io
+        io.read(1).unpack("C")[0]
+      end
+    end
+
+    class Boolean
+      def self.encode arg
+        case arg
+        when false
+          [0].pack("C")
+        when true
+          [1].pack("C")
+        else
+          raise ArgumentError, "must be #{true} or #{false}, but got #{arg.inspect}"
+        end
+      end
+
+      def self.decode io
+        if 0 == io.read(1).unpack("C")[0]
+          false
+        else
+          true
+        end
+      end
+    end
+
+    class Uint32
+      def self.encode arg
+        case arg
+        when 0x0000_0000..0xffff_ffff
+          [arg].pack("N")
+        else
+          raise ArgumentError, "must be in #{0x0000_0000}..#{0xffff_ffff}, but got #{arg.inspect}"
+        end
+      end
+
+      def self.decode io
+        io.read(4).unpack("N")[0]
+      end
+    end
+
+    class Uint64
+      def self.encode arg
+        case arg
+        when 0x0000_0000_0000_0000..0xffff_ffff_ffff_ffff
+          [arg >> 32].pack("N") + [arg & 0x0000_0000_ffff_ffff].pack("N")
+        else
+          raise ArgumentError, "must be in #{0x0000_0000_0000_0000}..#{0xffff_ffff_ffff_ffff}, but got #{arg.inspect}"
+        end
+      end
+
+      def self.decode io
+        (io.read(4).unpack("N")[0] << 32) + (io.read(4).unpack("N")[0])
+      end
+    end
+
+    class String
+      def self.encode arg
+        unless arg.kind_of? ::String
+          raise ArgumentError, "must be a kind of String, but got #{arg.inspect}"
+        end
+        if arg.length > 0xffff_ffff
+          raise ArgumentError, "must be shorter than or equal to #{0xffff_ffff}, but got length #{arg.length}"
+        end
+        [arg.length, arg].pack("Na*")
+      end
+
+      def self.decode io
+        length = io.read(4).unpack("N")[0]
+        io.read(length).unpack("a*")[0]
+      end
+    end
+
+    class Mpint
+      def self.encode arg
+        unless arg.kind_of? ::Integer
+          raise ArgumentError, "must be a kind of Integer, but got #{arg.inspect}"
+        end
+        if arg.size > 0xffff_ffff
+          raise ArgumentError, "must be shorter than or equal to #{0xffff_ffff}, but got length #{arg.size}"
+        end
+        bn = ::OpenSSL::BN.new(arg)
+        if bn < 0
+          # get 2's complement
+          tc = bn.to_i & ((1 << (bn.num_bytes * 8)) - 1)
+          # get hex representation
+          hex_str = "%x" % tc
+
+          if tc[(bn.num_bytes * 8) - 1] == 1
+            [bn.num_bytes, hex_str].pack("NH*")
+          else
+            [bn.num_bytes + 1, "ff" + hex_str].pack("NH*")
+          end
+        else
+          bn.to_s(0)
+        end
+      end
+
+      def self.decode io
+        length = io.read(4).unpack("N")[0]
+        hex_str = io.read(length).unpack("H*")[0]
+        # get temporal integer value
+        value = hex_str.hex
+        if length == 0
+          0
+        elsif value[(length * 8) - 1] == 0
+          value
+        else
+          num_bytes = if hex_str.start_with?("ff") then length - 1 else length end
+          - (((~ value) & ((1 << (num_bytes * 8)) - 1)) + 1)
+        end
+      end
+    end
+
+    class NameList
+      def self.encode arg
+        unless arg.kind_of? Array
+          raise ArgumentError, "must be a kind of Array, but got #{arg.inspect}"
+        end
+        unless (arg.map(&:class) - [::String]).empty?
+          raise ArgumentError, "must be with all elements of String, but got #{arg.inspect}"
+        end
+        joined_arg = arg.join(',')
+        if joined_arg.length > 0xffff_ffff
+          raise ArgumentError, "must be shorter than or equal to #{0xffff_ffff}, but got length #{joined_arg.length}"
+        end
+        [joined_arg.length, joined_arg].pack("Na*")
+      end
+
+      def self.decode io
+        length = io.read(4).unpack("N")[0]
+        io.read(length).unpack("a*")[0].split(',')
+      end
+    end
+  end
+end

data/lib/hrr_rb_ssh/message/001_ssh_msg_disconnect.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -33,11 +33,11 @@ module HrrRbSsh
       VALUE = 1
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'reason code'],
-        ['string',    'description'],
-        ['string',    'language tag'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'reason code'],
+        [DataType::String,    'description'],
+        [DataType::String,    'language tag'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/002_ssh_msg_ignore.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 2
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'data'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'data'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/003_ssh_msg_unimplemented.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 3
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['uint32',    'packet sequence number of rejected message'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Uint32,    'packet sequence number of rejected message'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/004_ssh_msg_debug.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,11 +15,11 @@ module HrrRbSsh
       VALUE = 4
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['boolean',   'always_display'],
-        ['string',    'message'],
-        ['string',    'language tag'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Boolean,   'always_display'],
+        [DataType::String,    'message'],
+        [DataType::String,    'language tag'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/005_ssh_msg_service_request.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 5
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'service name'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'service name'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/006_ssh_msg_service_accept.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 6
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'service name'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'service name'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/020_ssh_msg_kexinit.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,36 +15,36 @@ module HrrRbSsh
       VALUE = 20
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['byte',      'cookie (random byte)'],
-        ['name-list', 'kex_algorithms'],
-        ['name-list', 'server_host_key_algorithms'],
-        ['name-list', 'encryption_algorithms_client_to_server'],
-        ['name-list', 'encryption_algorithms_server_to_client'],
-        ['name-list', 'mac_algorithms_client_to_server'],
-        ['name-list', 'mac_algorithms_server_to_client'],
-        ['name-list', 'compression_algorithms_client_to_server'],
-        ['name-list', 'compression_algorithms_server_to_client'],
-        ['name-list', 'languages_client_to_server'],
-        ['name-list', 'languages_server_to_client'],
-        ['boolean',   'first_kex_packet_follows'],
-        ['uint32',    '0 (reserved for future extension)'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::Byte,      'cookie (random byte)'],
+        [DataType::NameList, 'kex_algorithms'],
+        [DataType::NameList, 'server_host_key_algorithms'],
+        [DataType::NameList, 'encryption_algorithms_client_to_server'],
+        [DataType::NameList, 'encryption_algorithms_server_to_client'],
+        [DataType::NameList, 'mac_algorithms_client_to_server'],
+        [DataType::NameList, 'mac_algorithms_server_to_client'],
+        [DataType::NameList, 'compression_algorithms_client_to_server'],
+        [DataType::NameList, 'compression_algorithms_server_to_client'],
+        [DataType::NameList, 'languages_client_to_server'],
+        [DataType::NameList, 'languages_server_to_client'],
+        [DataType::Boolean,   'first_kex_packet_follows'],
+        [DataType::Uint32,    '0 (reserved for future extension)'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/021_ssh_msg_newkeys.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,8 +15,8 @@ module HrrRbSsh
       VALUE = 21
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/030_ssh_msg_kexdh_init.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,9 +15,9 @@ module HrrRbSsh
       VALUE = 30
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['mpint',     'e'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::Mpint,     'e'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/031_ssh_msg_kexdh_reply.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,11 +15,11 @@ module HrrRbSsh
       VALUE = 31
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'server public host key and certificates (K_S)'],
-        ['mpint',     'f'],
-        ['string',    'signature of H'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'server public host key and certificates (K_S)'],
+        [DataType::Mpint,     'f'],
+        [DataType::String,    'signature of H'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/050_ssh_msg_userauth_request.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,32 +15,32 @@ module HrrRbSsh
       VALUE = 50
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'user name'],
-        ['string',    'service name'],
-        ['string',    'method name'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'user name'],
+        [DataType::String,    'service name'],
+        [DataType::String,    'method name'],
       ]
 
       PUBLICKEY_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'method name' : "publickey"],
-        ['boolean',   'with signature'],
-        ['string',    'public key algorithm name'],
-        ['string',    'public key blob'],
+        #[DataType, Field Name]
+        #[DataType::String,   'method name' : "publickey"],
+        [DataType::Boolean,   'with signature'],
+        [DataType::String,    'public key algorithm name'],
+        [DataType::String,    'public key blob'],
       ]
 
       PUBLICKEY_SIGNATURE_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'with signature' : "TRUE"],
-        ['string',    'signature'],
+        #[DataType, Field Name]
+        #[DataType::String,   'with signature' : "TRUE"],
+        [DataType::String,    'signature'],
       ]
 
       PASSWORD_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'method name' : "password"],
-        ['boolean',   'FALSE'],
-        ['string',    'plaintext password'],
+        #[DataType, Field Name]
+        #[DataType::String,   'method name' : "password"],
+        [DataType::Boolean,   'FALSE'],
+        [DataType::String,    'plaintext password'],
       ]
 
       CONDITIONAL_DEFINITION = {

data/lib/hrr_rb_ssh/message/051_ssh_msg_userauth_failure.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,10 +15,10 @@ module HrrRbSsh
       VALUE = 51
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['name-list', 'authentications that can continue'],
-        ['boolean',   'partial success'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::NameList, 'authentications that can continue'],
+        [DataType::Boolean,   'partial success'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/052_ssh_msg_userauth_success.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,8 +15,8 @@ module HrrRbSsh
       VALUE = 52
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/060_ssh_msg_userauth_pk_ok.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,10 +15,10 @@ module HrrRbSsh
       VALUE = 60
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'public key algorithm name from the request'],
-        ['string',    'public key blob from the request'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'public key algorithm name from the request'],
+        [DataType::String,    'public key blob from the request'],
       ]
     end
   end

data/lib/hrr_rb_ssh/message/080_ssh_msg_global_request.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/message/codable'
 
 module HrrRbSsh
@@ -15,24 +15,24 @@ module HrrRbSsh
       VALUE = 80
 
       DEFINITION = [
-        # [Data Type, Field Name]
-        ['byte',      'message number'],
-        ['string',    'request name'],
-        ['boolean',   'want reply'],
+        #[DataType, Field Name]
+        [DataType::Byte,      'message number'],
+        [DataType::String,    'request name'],
+        [DataType::Boolean,   'want reply'],
       ]
 
       TCPIP_FORWARD_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request name' : "tcpip-forward"],
-        ['string',    'address to bind'],
-        ['uint32',    'port number to bind'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request name' : "tcpip-forward"],
+        [DataType::String,    'address to bind'],
+        [DataType::Uint32,    'port number to bind'],
       ]
 
       CANCEL_TCPIP_FORWARD_DEFINITION = [
-        # [Data Type, Field Name]
-        # ['string',  'request name' : "cancel-tcpip-forward"],
-        ['string',    'address to bind'],
-        ['uint32',    'port number to bind'],
+        #[DataType, Field Name]
+        #[DataType::String,   'request name' : "cancel-tcpip-forward"],
+        [DataType::String,    'address to bind'],
+        [DataType::Uint32,    'port number to bind'],
       ]
 
       CONDITIONAL_DEFINITION = {