hrr_rb_ssh 0.1.2 → 0.1.3

data/lib/hrr_rb_ssh/transport/compression_algorithm/unfunctionable.rb

@@ -7,6 +7,10 @@ module HrrRbSsh
   class Transport
     class CompressionAlgorithm
       module Unfunctionable
+        def initialize direction=nil
+          @logger = HrrRbSsh::Logger.new(self.class.name)
+        end
+
         def deflate data
           data
         end

data/lib/hrr_rb_ssh/transport/compression_algorithm/zlib.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/compression_algorithm/compression_algorithm'
 require 'hrr_rb_ssh/transport/compression_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,11 +8,7 @@ module HrrRbSsh
     class CompressionAlgorithm
       class Zlib < CompressionAlgorithm
         NAME = 'zlib'
-
-        def initialize direction
-          super
-        end
-
+        PREFERENCE = 10
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/compression_algorithm.rb

@@ -1,24 +1,18 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/subclass_with_preference_listable'
+
 module HrrRbSsh
   class Transport
     class CompressionAlgorithm
-      def self.list
-        CompressionAlgorithm.list
-      end
-
-      def self.name_list
-        CompressionAlgorithm.name_list
-      end
-
-      def self.[] key
-        CompressionAlgorithm[key]
+      @subclass_list = Array.new
+      class << self
+        include SubclassWithPreferenceListable
       end
     end
   end
 end
 
-require 'hrr_rb_ssh/transport/compression_algorithm/compression_algorithm'
 require 'hrr_rb_ssh/transport/compression_algorithm/none'
 require 'hrr_rb_ssh/transport/compression_algorithm/zlib'

data/lib/hrr_rb_ssh/transport/encryption_algorithm/aes128_cbc.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Aes128Cbc < EncryptionAlgorithm
         NAME        = 'aes128-cbc'
+        PREFERENCE  = 160
         CIPHER_NAME = "AES-128-CBC"
         BLOCK_SIZE  = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/aes128_ctr.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Aes128Ctr < EncryptionAlgorithm
         NAME        = 'aes128-ctr'
+        PREFERENCE  = 190
         CIPHER_NAME = "AES-128-CTR"
         BLOCK_SIZE  = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/aes192_cbc.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Aes192Cbc < EncryptionAlgorithm
         NAME        = 'aes192-cbc'
+        PREFERENCE  = 120
         CIPHER_NAME = "AES-192-CBC"
         BLOCK_SIZE  = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/aes192_ctr.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Aes192Ctr < EncryptionAlgorithm
         NAME        = 'aes192-ctr'
+        PREFERENCE  = 180
         CIPHER_NAME = "AES-192-CTR"
         BLOCK_SIZE  = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/aes256_cbc.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Aes256Cbc < EncryptionAlgorithm
         NAME        = 'aes256-cbc'
+        PREFERENCE  = 110
         CIPHER_NAME = "AES-256-CBC"
         BLOCK_SIZE  = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/aes256_ctr.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Aes256Ctr < EncryptionAlgorithm
         NAME        = 'aes256-ctr'
+        PREFERENCE  = 170
         CIPHER_NAME = "AES-256-CTR"
         BLOCK_SIZE  = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/arcfour.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Arcfour < EncryptionAlgorithm
         NAME        = 'arcfour'
+        PREFERENCE  = 100
         CIPHER_NAME = "RC4"
         BLOCK_SIZE  = 8
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/blowfish_cbc.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class BlowfishCbc < EncryptionAlgorithm
         NAME        = 'blowfish-cbc'
+        PREFERENCE  = 140
         CIPHER_NAME = "BF-CBC"
         BLOCK_SIZE  = 8
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/cast128_cbc.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class Cast128Cbc < EncryptionAlgorithm
         NAME        = 'cast128-cbc'
+        PREFERENCE  = 130
         CIPHER_NAME = "CAST5-CBC"
         BLOCK_SIZE  = 8
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/functionable.rb

@@ -14,8 +14,7 @@ module HrrRbSsh
         end
 
         def initialize direction, iv, key
-          super
-
+          @logger = HrrRbSsh::Logger.new(self.class.name)
           @cipher = OpenSSL::Cipher.new(self.class::CIPHER_NAME)
           case direction
           when HrrRbSsh::Transport::Direction::OUTGOING

data/lib/hrr_rb_ssh/transport/encryption_algorithm/none.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/transport/encryption_algorithm/unfunctionable'
 
 module HrrRbSsh
@@ -9,12 +8,8 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class None < EncryptionAlgorithm
         NAME        = 'none'
+        PREFERENCE  = 0
         BLOCK_SIZE  = 0
-
-        def initialize direction=nil, iv=nil, key=nil
-          super
-        end
-
         include Unfunctionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/three_des_cbc.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/functionable'
 
 module HrrRbSsh
@@ -9,9 +8,9 @@ module HrrRbSsh
     class EncryptionAlgorithm
       class ThreeDesCbc < EncryptionAlgorithm
         NAME        = '3des-cbc'
+        PREFERENCE  = 150
         CIPHER_NAME = "DES-EDE3-CBC"
         BLOCK_SIZE  = 8
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/encryption_algorithm/unfunctionable.rb

@@ -1,6 +1,8 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/logger'
+
 module HrrRbSsh
   class Transport
     class EncryptionAlgorithm
@@ -10,6 +12,10 @@ module HrrRbSsh
           klass.const_set(:KEY_LENGTH, 0)
         end
 
+        def initialize direction=nil, iv=nil, key=nil
+          @logger = HrrRbSsh::Logger.new(self.class.name)
+        end
+
         def block_size
           self.class::BLOCK_SIZE
         end

data/lib/hrr_rb_ssh/transport/encryption_algorithm.rb

@@ -1,25 +1,19 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/subclass_with_preference_listable'
+
 module HrrRbSsh
   class Transport
     class EncryptionAlgorithm
-      def self.list
-        EncryptionAlgorithm.list
-      end
-
-      def self.name_list
-        EncryptionAlgorithm.name_list
-      end
-
-      def self.[] key
-        EncryptionAlgorithm[key]
+      @subclass_list = Array.new
+      class << self
+        include SubclassWithPreferenceListable
       end
     end
   end
 end
 
-require 'hrr_rb_ssh/transport/encryption_algorithm/encryption_algorithm'
 require 'hrr_rb_ssh/transport/encryption_algorithm/none'
 require 'hrr_rb_ssh/transport/encryption_algorithm/three_des_cbc'
 require 'hrr_rb_ssh/transport/encryption_algorithm/blowfish_cbc'

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman.rb

@@ -2,26 +2,26 @@
 # vim: et ts=2 sw=2
 
 require 'openssl'
-require 'hrr_rb_ssh/transport/data_type'
+require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
 
 module HrrRbSsh
   class Transport
     class KexAlgorithm
       module DiffieHellman
         H0_DEFINITION = [
-          ['string', 'V_C'],
-          ['string', 'V_S'],
-          ['string', 'I_C'],
-          ['string', 'I_S'],
-          ['string', 'K_S'],
-          ['mpint',  'e'],
-          ['mpint',  'f'],
-          ['mpint',  'k'],
+          [DataType::String, 'V_C'],
+          [DataType::String, 'V_S'],
+          [DataType::String, 'I_C'],
+          [DataType::String, 'I_S'],
+          [DataType::String, 'K_S'],
+          [DataType::Mpint,  'e'],
+          [DataType::Mpint,  'f'],
+          [DataType::Mpint,  'k'],
         ]
 
         def initialize
-          super
-
+          @logger = HrrRbSsh::Logger.new(self.class.name)
           @dh = OpenSSL::PKey::DH.new
           if @dh.respond_to?(:set_pqg)
             @dh.set_pqg OpenSSL::BN.new(self.class::P, 16), nil, OpenSSL::BN.new(self.class::G)
@@ -35,7 +35,7 @@ module HrrRbSsh
         def encode definition, payload
           definition.map{ |data_type, field_name|
             field_value = if payload[field_name].instance_of? ::Proc then payload[field_name].call else payload[field_name] end
-            HrrRbSsh::Transport::DataType[data_type].encode(field_value)
+            data_type.encode(field_value)
           }.join
         end
 
@@ -81,8 +81,8 @@ module HrrRbSsh
         end
 
         def build_key(_k, h, _x, session_id, key_length)
-          k = HrrRbSsh::Transport::DataType::Mpint.encode _k
-          x = HrrRbSsh::Transport::DataType::Byte.encode _x
+          k = DataType::Mpint.encode _k
+          x = DataType::Byte.encode _x
 
           key = OpenSSL::Digest.digest(self.class::DIGEST, k + h + x + session_id)
 

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman_group14_sha1.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/kex_algorithm/kex_algorithm'
 require 'hrr_rb_ssh/transport/kex_algorithm/diffie_hellman'
 
 module HrrRbSsh
@@ -9,7 +8,8 @@ module HrrRbSsh
     class KexAlgorithm
       class DiffieHellmanGroup14Sha1 < KexAlgorithm
         NAME = 'diffie-hellman-group14-sha1'
-
+        PREFERENCE = 20
+        DIGEST = 'sha1'
         P = \
           "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" \
           "C4C6628B" "80DC1CD1" "29024E08" "8A67CC74" \
@@ -28,9 +28,6 @@ module HrrRbSsh
           "3995497C" "EA956AE5" "15D22618" "98FA0510" \
           "15728E5A" "8AACAA68" "FFFFFFFF" "FFFFFFFF"
         G = 2
-
-        DIGEST = 'sha1'
-
         include DiffieHellman
       end
     end

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman_group1_sha1.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/kex_algorithm/kex_algorithm'
 require 'hrr_rb_ssh/transport/kex_algorithm/diffie_hellman'
 
 module HrrRbSsh
@@ -9,7 +8,8 @@ module HrrRbSsh
     class KexAlgorithm
       class DiffieHellmanGroup1Sha1 < KexAlgorithm
         NAME = 'diffie-hellman-group1-sha1'
-
+        PREFERENCE = 10
+        DIGEST = 'sha1'
         P = \
           "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" \
           "C4C6628B" "80DC1CD1" "29024E08" "8A67CC74" \
@@ -20,9 +20,6 @@ module HrrRbSsh
           "EE386BFB" "5A899FA5" "AE9F2411" "7C4B1FE6" \
           "49286651" "ECE65381" "FFFFFFFF" "FFFFFFFF"
         G = 2
-
-        DIGEST = 'sha1'
-
         include DiffieHellman
       end
     end

data/lib/hrr_rb_ssh/transport/kex_algorithm.rb

@@ -1,19 +1,14 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/subclass_with_preference_listable'
+
 module HrrRbSsh
   class Transport
     class KexAlgorithm
-      def self.list
-        KexAlgorithm.list
-      end
-
-      def self.name_list
-        KexAlgorithm.name_list
-      end
-
-      def self.[] key
-        KexAlgorithm[key]
+      @subclass_list = Array.new
+      class << self
+        include SubclassWithPreferenceListable
       end
     end
   end

data/lib/hrr_rb_ssh/transport/mac_algorithm/functionable.rb

@@ -8,8 +8,7 @@ module HrrRbSsh
     class MacAlgorithm
       module Functionable
         def initialize key
-          super
-
+          @logger = HrrRbSsh::Logger.new(self.class.name)
           @key = key
         end
 
@@ -22,7 +21,7 @@ module HrrRbSsh
         end
 
         def compute sequence_number, unencrypted_packet
-          data = HrrRbSsh::Transport::DataType::Uint32.encode(sequence_number) + unencrypted_packet
+          data = HrrRbSsh::DataType::Uint32.encode(sequence_number) + unencrypted_packet
           digest = OpenSSL::HMAC.digest self.class::DIGEST, @key, data
           digest[0, digest_length]
         end

data/lib/hrr_rb_ssh/transport/mac_algorithm/hmac_md5.rb

@@ -1,19 +1,17 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/mac_algorithm/mac_algorithm'
 require 'hrr_rb_ssh/transport/mac_algorithm/functionable'
 
 module HrrRbSsh
   class Transport
     class MacAlgorithm
       class HmacMd5 < MacAlgorithm
-        NAME   = 'hmac-md5'
-        DIGEST = 'md5'
-
+        NAME       = 'hmac-md5'
+        PREFERENCE = 30
+        DIGEST     = 'md5'
         DIGEST_LENGTH = 16
         KEY_LENGTH    = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/mac_algorithm/hmac_md5_96.rb

@@ -1,19 +1,17 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/mac_algorithm/mac_algorithm'
 require 'hrr_rb_ssh/transport/mac_algorithm/functionable'
 
 module HrrRbSsh
   class Transport
     class MacAlgorithm
       class HmacMd5_96 < MacAlgorithm
-        NAME   = 'hmac-md5-96'
-        DIGEST = 'md5'
-
+        NAME       = 'hmac-md5-96'
+        PREFERENCE = 10
+        DIGEST     = 'md5'
         DIGEST_LENGTH = 12
         KEY_LENGTH    = 16
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/mac_algorithm/hmac_sha1.rb

@@ -1,19 +1,17 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/mac_algorithm/mac_algorithm'
 require 'hrr_rb_ssh/transport/mac_algorithm/functionable'
 
 module HrrRbSsh
   class Transport
     class MacAlgorithm
       class HmacSha1 < MacAlgorithm
-        NAME   = 'hmac-sha1'
-        DIGEST = 'sha1'
-
+        NAME       = 'hmac-sha1'
+        PREFERENCE = 40
+        DIGEST     = 'sha1'
         DIGEST_LENGTH = 20
         KEY_LENGTH    = 20
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/mac_algorithm/hmac_sha1_96.rb

@@ -1,19 +1,17 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/mac_algorithm/mac_algorithm'
 require 'hrr_rb_ssh/transport/mac_algorithm/functionable'
 
 module HrrRbSsh
   class Transport
     class MacAlgorithm
       class HmacSha1_96 < MacAlgorithm
-        NAME   = 'hmac-sha1-96'
-        DIGEST = 'sha1'
-
+        NAME       = 'hmac-sha1-96'
+        PREFERENCE = 30
+        DIGEST     = 'sha1'
         DIGEST_LENGTH = 12
         KEY_LENGTH    = 20
-
         include Functionable
       end
     end

data/lib/hrr_rb_ssh/transport/mac_algorithm/none.rb

@@ -1,22 +1,16 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/mac_algorithm/mac_algorithm'
 require 'hrr_rb_ssh/transport/mac_algorithm/unfunctionable'
 
 module HrrRbSsh
   class Transport
     class MacAlgorithm
       class None < MacAlgorithm
-        NAME   = 'none'
-
+        NAME       = 'none'
+        PREFERENCE = 0
         DIGEST_LENGTH = 0
         KEY_LENGTH    = 0
-
-        def initialize key=nil
-          super
-        end
-
         include Unfunctionable
       end
     end

data/lib/hrr_rb_ssh/transport/mac_algorithm/unfunctionable.rb

@@ -7,6 +7,10 @@ module HrrRbSsh
   class Transport
     class MacAlgorithm
       module Unfunctionable
+        def initialize key=nil
+          @logger = HrrRbSsh::Logger.new(self.class.name)
+        end
+
         def digest_length
           self.class::DIGEST_LENGTH
         end

data/lib/hrr_rb_ssh/transport/mac_algorithm.rb

@@ -1,25 +1,19 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/subclass_with_preference_listable'
+
 module HrrRbSsh
   class Transport
     class MacAlgorithm
-      def self.list
-        MacAlgorithm.list
-      end
-
-      def self.name_list
-        MacAlgorithm.name_list
-      end
-
-      def self.[] key
-        MacAlgorithm[key]
+      @subclass_list = Array.new
+      class << self
+        include SubclassWithPreferenceListable
       end
     end
   end
 end
 
-require 'hrr_rb_ssh/transport/mac_algorithm/mac_algorithm'
 require 'hrr_rb_ssh/transport/mac_algorithm/none'
 require 'hrr_rb_ssh/transport/mac_algorithm/hmac_sha1'
 require 'hrr_rb_ssh/transport/mac_algorithm/hmac_sha1_96'