hrr_rb_ssh 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a15e10f1895dfd1a8e0159fc18355de0128cc033bbe5f5ee49e483e2de7bc1e3
-  data.tar.gz: 6e1cb80d55521f431dff77735cb843c37fdc440640ffd9ae958119fdd9eb96d3
+  metadata.gz: 5ca801bcbdd5c4d01bbdfdd2827f114771d5e8e2f5b709a66313c1d36a5154fb
+  data.tar.gz: 630ce9b5a4983a2f7aa72239504821c43f26c6527857bb0709c1daa60b431c4f
 SHA512:
-  metadata.gz: b63d6c8658d97b862f81e9beed336d04768894fffe1339c86cd2f8f9c22310f5f1d1be1f7abc381a0a0a5bbb18fd9a343959355aa77d849c321041de954d3749
-  data.tar.gz: db9de741c096e3024231760c25e3d0ed04fee0a7d3083f1ad71b1deecbe389c401576f37c31714052408bca4c6431861e40f7ccafc04be8b4277c096147ef32f
+  metadata.gz: d6db961156a157f29a616dfa75320c394baf86ad78e85fa7b9ec7676ea76d23f10ce1b71b6ecfbb3d181f913b6af86dd713e660f4fb9fa69e98b5b5465ec902f
+  data.tar.gz: 1efb26c747d9360359aa04c8d12a88ff83b95ab53d4d8d04262f368459c1b016f0e8f653f88042e5aeebdb0f436d430da5f5a3431b4f47c1c79b6be6033dc32a

data/demo/server.rb

@@ -18,6 +18,12 @@ logger.level = Logger::INFO
 HrrRbSsh::Logger.initialize 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(ssh-rsa ssh-dss)
+tran_preferred_kex_algorithms             = %w(diffie-hellman-group14-sha1 diffie-hellman-group1-sha1)
+tran_preferred_mac_algorithms             = %w(hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96)
+tran_preferred_compression_algorithms     = %w(none zlib)
+
 auth_none = HrrRbSsh::Authentication::Authenticator.new { |context|
   false
 }
@@ -163,6 +169,12 @@ conn_exec = HrrRbSsh::Connection::RequestHandler.new { |context|
 
 options = {}
 
+options['transport_preferred_encryption_algorithms']      = tran_preferred_encryption_algorithms
+options['transport_preferred_server_host_key_algorithms'] = tran_preferred_server_host_key_algorithms
+options['transport_preferred_kex_algorithms']             = tran_preferred_kex_algorithms
+options['transport_preferred_mac_algorithms']             = tran_preferred_mac_algorithms
+options['transport_preferred_compression_algorithms']     = tran_preferred_compression_algorithms
+
 options['authentication_none_authenticator']      = auth_none
 options['authentication_publickey_authenticator'] = auth_publickey
 options['authentication_password_authenticator']  = auth_password
@@ -176,7 +188,7 @@ options['connection_channel_request_exec']    = conn_exec
 server = TCPServer.new 10022
 while true
   t = Thread.new(server.accept) do |io|
-    tran = HrrRbSsh::Transport.new      io, HrrRbSsh::Transport::Mode::SERVER
+    tran = HrrRbSsh::Transport.new      io, HrrRbSsh::Transport::Mode::SERVER, options
     auth = HrrRbSsh::Authentication.new tran, options
     conn = HrrRbSsh::Connection.new     auth, options
     conn.start

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

@@ -5,7 +5,7 @@ require 'hrr_rb_ssh/logger'
 
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class None
         class Context
           attr_reader :username

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

@@ -1,17 +1,17 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/authentication/method/method'
+require 'hrr_rb_ssh/logger'
 
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class None < Method
         NAME = 'none'
+        PREFERENCE = 0
 
         def initialize options
-          super
-
+          @logger = HrrRbSsh::Logger.new(self.class.name)
           @authenticator = options.fetch( 'authentication_none_authenticator', Authenticator.new { false } )
         end
 

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

@@ -5,7 +5,7 @@ require 'hrr_rb_ssh/logger'
 
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Password
         class Context
           attr_reader :username, :password

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

@@ -1,17 +1,17 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/authentication/method/method'
+require 'hrr_rb_ssh/logger'
 
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Password < Method
         NAME = 'password'
+        PREFERENCE = 10
 
         def initialize options
-          super
-
+          @logger = HrrRbSsh::Logger.new(self.class.name)
           @authenticator = options.fetch( 'authentication_password_authenticator', Authenticator.new { false } )
         end
 

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

@@ -1,18 +1,18 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/transport/data_type'
+require 'hrr_rb_ssh/data_type'
 
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Publickey
-        module Algorithm
+        class Algorithm
           module Codable
             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
 
@@ -21,7 +21,7 @@ module HrrRbSsh
               definition.map{ |data_type, field_name|
                 [
                   field_name,
-                  HrrRbSsh::Transport::DataType[data_type].decode(payload_io)
+                  data_type.decode(payload_io)
                 ]
               }.to_h
             end

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

@@ -1,39 +1,50 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/codable'
+
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Publickey
-        module Algorithm
+        class Algorithm
           class SshDss < Algorithm
-            NAME   = 'ssh-dss'
+            NAME = 'ssh-dss'
+            PREFERENCE = 10
             DIGEST = 'sha1'
 
             PUBLIC_KEY_BLOB_DEFINITION = [
-              ['string', 'public key algorithm name'],
-              ['mpint',  'p'],
-              ['mpint',  'q'],
-              ['mpint',  'g'],
-              ['mpint',  'y'],
+              [DataType::String, 'public key algorithm name'],
+              [DataType::Mpint,  'p'],
+              [DataType::Mpint,  'q'],
+              [DataType::Mpint,  'g'],
+              [DataType::Mpint,  'y'],
             ]
 
             SIGNATURE_DEFINITION = [
-              ['string', 'public key algorithm name'],
-              ['string', 'signature blob'],
+              [DataType::String, 'public key algorithm name'],
+              [DataType::String, 'signature blob'],
             ]
 
             SIGNATURE_BLOB_DEFINITION = [
-              ['string',  'session identifier'],
-              ['byte',    'message number'],
-              ['string',  'user name'],
-              ['string',  'service name'],
-              ['string',  'method name'],
-              ['boolean', 'with signature'],
-              ['string',  'public key algorithm name'],
-              ['string',  'public key blob'],
+              [DataType::String,  'session identifier'],
+              [DataType::Byte,    'message number'],
+              [DataType::String,  'user name'],
+              [DataType::String,  'service name'],
+              [DataType::String,  'method name'],
+              [DataType::Boolean, 'with signature'],
+              [DataType::String,  'public key algorithm name'],
+              [DataType::String,  'public key blob'],
             ]
 
+            include Codable
+
+            def initialize
+              @logger = HrrRbSsh::Logger.new(self.class.name)
+            end
+
             def verify_public_key public_key_algorithm_name, public_key, public_key_blob
               public_key = case public_key
                            when String

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

@@ -1,37 +1,48 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/codable'
+
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Publickey
-        module Algorithm
+        class Algorithm
           class SshRsa < Algorithm
-            NAME   = 'ssh-rsa'
+            NAME = 'ssh-rsa'
+            PREFERENCE = 20
             DIGEST = 'sha1'
 
             PUBLIC_KEY_BLOB_DEFINITION = [
-              ['string', 'public key algorithm name'],
-              ['mpint',  'e'],
-              ['mpint',  'n'],
+              [DataType::String, 'public key algorithm name'],
+              [DataType::Mpint,  'e'],
+              [DataType::Mpint,  'n'],
             ]
 
             SIGNATURE_DEFINITION = [
-              ['string', 'public key algorithm name'],
-              ['string', 'signature blob'],
+              [DataType::String, 'public key algorithm name'],
+              [DataType::String, 'signature blob'],
             ]
 
             SIGNATURE_BLOB_DEFINITION = [
-              ['string',  'session identifier'],
-              ['byte',    'message number'],
-              ['string',  'user name'],
-              ['string',  'service name'],
-              ['string',  'method name'],
-              ['boolean', 'with signature'],
-              ['string',  'public key algorithm name'],
-              ['string',  'public key blob'],
+              [DataType::String,  'session identifier'],
+              [DataType::Byte,    'message number'],
+              [DataType::String,  'user name'],
+              [DataType::String,  'service name'],
+              [DataType::String,  'method name'],
+              [DataType::Boolean, 'with signature'],
+              [DataType::String,  'public key algorithm name'],
+              [DataType::String,  'public key blob'],
             ]
 
+            include Codable
+
+            def initialize
+              @logger = HrrRbSsh::Logger.new(self.class.name)
+            end
+
             def verify_public_key public_key_algorithm_name, public_key, public_key_blob
               public_key = case public_key
                            when String

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

@@ -1,21 +1,16 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/subclass_with_preference_listable'
+
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Publickey
-        module Algorithm
-          def self.list
-            Algorithm.list
-          end
-
-          def self.name_list
-            Algorithm.name_list
-          end
-
-          def self.[] key
-            Algorithm[key]
+        class Algorithm
+          @subclass_list = Array.new
+          class << self
+            include SubclassWithPreferenceListable
           end
         end
       end
@@ -23,6 +18,5 @@ module HrrRbSsh
   end
 end
 
-require 'hrr_rb_ssh/authentication/method/publickey/algorithm/algorithm'
 require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_dss'
 require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_rsa'

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

@@ -5,7 +5,7 @@ require 'hrr_rb_ssh/logger'
 
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Publickey
         class Context
           attr_reader \

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

@@ -1,24 +1,24 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/authentication/method/method'
+require 'hrr_rb_ssh/logger'
 
 module HrrRbSsh
   class Authentication
-    module Method
+    class Method
       class Publickey < Method
         NAME = 'publickey'
+        PREFERENCE = 20
 
         def initialize options
-          super
-
+          @logger = HrrRbSsh::Logger.new(self.class.name)
           @session_id = options['session id']
           @authenticator = options.fetch( 'authentication_publickey_authenticator', Authenticator.new { false } )
         end
 
         def authenticate userauth_request_message
           public_key_algorithm_name = userauth_request_message['public key algorithm name']
-          unless Algorithm.name_list.include?(public_key_algorithm_name)
+          unless Algorithm.list_preferred.include?(public_key_algorithm_name)
             @logger.info("unsupported public key algorithm: #{public_key_algorithm_name}")
             return false
           end

data/lib/hrr_rb_ssh/authentication/method.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 Authentication
-    module Method
-      def self.list
-        Method.list
-      end
-
-      def self.name_list
-        Method.name_list
-      end
-
-      def self.[] key
-        Method[key]
+    class Method
+      @subclass_list = Array.new
+      class << self
+        include SubclassWithPreferenceListable
       end
     end
   end
 end
 
-require 'hrr_rb_ssh/authentication/method/method'
 require 'hrr_rb_ssh/authentication/method/none'
 require 'hrr_rb_ssh/authentication/method/password'
 require 'hrr_rb_ssh/authentication/method/publickey'

data/lib/hrr_rb_ssh/authentication.rb

@@ -95,7 +95,7 @@ module HrrRbSsh
     def send_userauth_failure
       message = {
         'message number'                    => HrrRbSsh::Message::SSH_MSG_USERAUTH_FAILURE::VALUE,
-        'authentications that can continue' => Method.name_list,
+        'authentications that can continue' => Method.list_preferred,
         'partial success'                   => false,
       }
       payload = HrrRbSsh::Message::SSH_MSG_USERAUTH_FAILURE.encode message

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/env/context.rb

@@ -6,9 +6,9 @@ require 'hrr_rb_ssh/logger'
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Env
               class Context
                 attr_reader \

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/env.rb

@@ -3,14 +3,13 @@
 
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
-require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/request_type'
 
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Env < RequestType
               NAME = 'env'
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/exec/context.rb

@@ -6,9 +6,9 @@ require 'hrr_rb_ssh/logger'
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Exec
               class Context
                 attr_reader \

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/exec.rb

@@ -3,14 +3,13 @@
 
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
-require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/request_type'
 
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Exec < RequestType
               NAME = 'exec'
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/pty_req/context.rb

@@ -6,9 +6,9 @@ require 'hrr_rb_ssh/logger'
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class PtyReq
               class Context
                 attr_reader \

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/pty_req.rb

@@ -3,14 +3,13 @@
 
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
-require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/request_type'
 
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class PtyReq < RequestType
               NAME = 'pty-req'
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/shell/context.rb

@@ -6,9 +6,9 @@ require 'hrr_rb_ssh/logger'
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Shell
               class Context
                 attr_reader \

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/shell.rb

@@ -3,14 +3,13 @@
 
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
-require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/request_type'
 
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Shell < RequestType
               NAME = 'shell'
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/subsystem/context.rb

@@ -6,9 +6,9 @@ require 'hrr_rb_ssh/logger'
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Subsystem
               class Context
                 attr_reader \

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/subsystem.rb

@@ -3,14 +3,13 @@
 
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
-require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/request_type'
 
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
+          class RequestType
             class Subsystem < RequestType
               NAME = 'subsystem'
 

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

@@ -4,19 +4,25 @@
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session
-          module RequestType
-            def self.list
-              RequestType.list
-            end
+          class RequestType
+            @subclass_list = Array.new
+            class << self
+              def inherited klass
+                @subclass_list.push klass if @subclass_list
+              end
 
-            def self.name_list
-              RequestType.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
-              RequestType[key]
+              private :__subclass_list__
             end
           end
         end
@@ -25,7 +31,6 @@ module HrrRbSsh
   end
 end
 
-require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/request_type'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/pty_req'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/env'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/shell'

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

@@ -1,26 +1,12 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/connection/channel/channel_type/channel_type'
-
 module HrrRbSsh
   class Connection
     class Channel
-      module ChannelType
+      class ChannelType
         class Session < ChannelType
           NAME = 'session'
-
-          def self.list
-            RequestType.list
-          end
-
-          def self.name_list
-            RequestType.name_list
-          end
-
-          def self.[] key
-            RequestType[key]
-          end
         end
       end
     end