hrr_rb_ssh 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca801bcbdd5c4d01bbdfdd2827f114771d5e8e2f5b709a66313c1d36a5154fb
-  data.tar.gz: 630ce9b5a4983a2f7aa72239504821c43f26c6527857bb0709c1daa60b431c4f
+  metadata.gz: 5d27094a810417b60ee82692a67b937152a9840bd3612fd333d3ff78b8babdc8
+  data.tar.gz: 81a4410d0e71dd441d67c4e591b2007b024c0f447bf37d9ce6cca012e4e1205f
 SHA512:
-  metadata.gz: d6db961156a157f29a616dfa75320c394baf86ad78e85fa7b9ec7676ea76d23f10ce1b71b6ecfbb3d181f913b6af86dd713e660f4fb9fa69e98b5b5465ec902f
-  data.tar.gz: 1efb26c747d9360359aa04c8d12a88ff83b95ab53d4d8d04262f368459c1b016f0e8f653f88042e5aeebdb0f436d430da5f5a3431b4f47c1c79b6be6033dc32a
+  metadata.gz: 40f52780040a121411281d571b486e3d0f4cc4a8f90d15c5ed996ad52dbcfa39fc42fcaa868a9effb0f3b2fabde4a1cc9140c873532607fcbcfa2e03d8e51bf9
+  data.tar.gz: 219acc3467eeb26a34534e29c1a85c9fb8945874ec4019549cbf7ba14235839f959f15c109117c973d7a1b8b0fd4ff6709c08dff2d156fb7c15f86005a12f34e

data/demo/server.rb

@@ -73,99 +73,6 @@ auth_password = HrrRbSsh::Authentication::Authenticator.new { |context|
   }
 }
 
-conn_pty = HrrRbSsh::Connection::RequestHandler.new { |context|
-  ptm, pts = PTY.open
-  context.vars[:ptm] = ptm
-  context.vars[:pts] = pts
-  context.chain_proc { |chain|
-    begin
-      chain.call_next
-    ensure
-      context.vars[:ptm].close
-      context.vars[:pts].close
-    end
-  }
-}
-conn_env = HrrRbSsh::Connection::RequestHandler.new { |context|
-  context.vars[:env] ||= Hash.new
-  context.vars[:env][context.variable_name] = context.variable_value
-}
-conn_shell = HrrRbSsh::Connection::RequestHandler.new { |context|
-  ptm = context.vars[:ptm]
-  pts = context.vars[:pts]
-
-  context.chain_proc { |chain|
-    pid = fork do
-      ptm.close
-      Process.setsid
-      STDIN.reopen  pts, 'r'
-      STDOUT.reopen pts, 'w'
-      STDERR.reopen pts, 'w'
-      pts.close
-      context.vars[:env] ||= Hash.new
-      exec context.vars[:env], 'login', '-f', context.username
-    end
-
-    pts.close
-
-    threads = []
-    threads.push Thread.start {
-      loop do
-        begin
-          context.io.write ptm.readpartial(1024)
-        rescue EOFError => e
-          context.logger.info("ptm is EOF")
-          break
-        rescue IOError => e
-          context.logger.warn("IO is closed")
-          break
-        rescue => e
-          context.logger.error(e.full_message)
-          break
-        end
-      end
-    }
-    threads.push Thread.start {
-      loop do
-        begin
-          ptm.write context.io.readpartial(1024)
-        rescue EOFError => e
-          context.logger.info("IO is EOF")
-          break
-        rescue IOError => e
-          context.logger.warn("IO is closed")
-          break
-        rescue => e
-          context.logger.error(e.full_message)
-          break
-        end
-      end
-    }
-
-    pid, status = Process.waitpid2 pid
-    threads.each do |t|
-      begin
-        t.exit
-        t.join
-      rescue => e
-        context.logger.error(e.full_message)
-      end
-    end
-    status.exitstatus
-  }
-}
-conn_exec = HrrRbSsh::Connection::RequestHandler.new { |context|
-  context.chain_proc { |chain|
-    pid = fork do
-      Process.setsid
-      context.vars[:env] ||= Hash.new
-      exec context.vars[:env], context.command, in: context.io, out: context.io, err: context.io
-    end
-    pid, status = Process.waitpid2 pid
-    status.exitstatus
-  }
-}
-
 
 options = {}
 
@@ -179,10 +86,11 @@ options['authentication_none_authenticator']      = auth_none
 options['authentication_publickey_authenticator'] = auth_publickey
 options['authentication_password_authenticator']  = auth_password
 
-options['connection_channel_request_pty_req'] = conn_pty
-options['connection_channel_request_env']     = conn_env
-options['connection_channel_request_shell']   = conn_shell
-options['connection_channel_request_exec']    = conn_exec
+options['connection_channel_request_pty_req']       = HrrRbSsh::Connection::RequestHandler::ReferencePtyReqRequestHandler.new
+options['connection_channel_request_env']           = HrrRbSsh::Connection::RequestHandler::ReferenceEnvRequestHandler.new
+options['connection_channel_request_shell']         = HrrRbSsh::Connection::RequestHandler::ReferenceShellRequestHandler.new
+options['connection_channel_request_exec']          = HrrRbSsh::Connection::RequestHandler::ReferenceExecRequestHandler.new
+options['connection_channel_request_window_change'] = HrrRbSsh::Connection::RequestHandler::ReferenceWindowChangeRequestHandler.new
 
 
 server = TCPServer.new 10022

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

@@ -0,0 +1,30 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/codable'
+
+module HrrRbSsh
+  class Authentication
+    class Method
+      class Publickey
+        class Algorithm
+          class SshDss
+            module PublicKeyBlob
+              class << self
+                include Codable
+              end
+              DEFINITION = [
+                [DataType::String, 'public key algorithm name'],
+                [DataType::Mpint,  'p'],
+                [DataType::Mpint,  'q'],
+                [DataType::Mpint,  'g'],
+                [DataType::Mpint,  'y'],
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/codable'
+
+module HrrRbSsh
+  class Authentication
+    class Method
+      class Publickey
+        class Algorithm
+          class SshDss
+            module Signature
+              class << self
+                include Codable
+              end
+              DEFINITION = [
+                [DataType::String, 'public key algorithm name'],
+                [DataType::String, 'signature blob'],
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/codable'
+
+module HrrRbSsh
+  class Authentication
+    class Method
+      class Publickey
+        class Algorithm
+          class SshDss
+            module SignatureBlob
+              class << self
+                include Codable
+              end
+              DEFINITION = [
+                [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'],
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,6 @@
 
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/data_type'
-require 'hrr_rb_ssh/authentication/method/publickey/algorithm/codable'
 
 module HrrRbSsh
   class Authentication
@@ -15,32 +14,6 @@ module HrrRbSsh
             PREFERENCE = 10
             DIGEST = 'sha1'
 
-            PUBLIC_KEY_BLOB_DEFINITION = [
-              [DataType::String, 'public key algorithm name'],
-              [DataType::Mpint,  'p'],
-              [DataType::Mpint,  'q'],
-              [DataType::Mpint,  'g'],
-              [DataType::Mpint,  'y'],
-            ]
-
-            SIGNATURE_DEFINITION = [
-              [DataType::String, 'public key algorithm name'],
-              [DataType::String, 'signature blob'],
-            ]
-
-            SIGNATURE_BLOB_DEFINITION = [
-              [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
@@ -61,15 +34,15 @@ module HrrRbSsh
                 'q'                         => public_key.q.to_i,
                 'y'                         => public_key.pub_key.to_i,
               }
-              public_key_blob == encode(PUBLIC_KEY_BLOB_DEFINITION, public_key_message)
+              public_key_blob == PublicKeyBlob.encode(public_key_message)
             end
 
             def verify_signature session_id, message
-              signature_message   = decode SIGNATURE_DEFINITION, message['signature']
+              signature_message   = Signature.decode message['signature']
               signature_algorithm = signature_message['public key algorithm name']
               signature_blob      = signature_message['signature blob']
 
-              public_key = decode PUBLIC_KEY_BLOB_DEFINITION, message['public key blob']
+              public_key = PublicKeyBlob.decode message['public key blob']
               algorithm = OpenSSL::PKey::DSA.new
               if algorithm.respond_to?(:set_pqg)
                 algorithm.set_pqg public_key['p'], public_key['q'], public_key['g']
@@ -94,7 +67,7 @@ module HrrRbSsh
                 'public key algorithm name' => message['public key algorithm name'],
                 'public key blob'           => message['public key blob'],
               }
-              data_blob = encode SIGNATURE_BLOB_DEFINITION, data_message
+              data_blob = SignatureBlob.encode data_message
 
               hash = OpenSSL::Digest.digest(DIGEST, data_blob)
               sign_r = signature_blob[ 0, 20]
@@ -114,3 +87,7 @@ module HrrRbSsh
     end
   end
 end
+
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_dss/public_key_blob'
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_dss/signature_blob'
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_dss/signature'

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

@@ -0,0 +1,28 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/codable'
+
+module HrrRbSsh
+  class Authentication
+    class Method
+      class Publickey
+        class Algorithm
+          class SshRsa
+            module PublicKeyBlob
+              class << self
+                include Codable
+              end
+              DEFINITION = [
+                [DataType::String, 'public key algorithm name'],
+                [DataType::Mpint,  'e'],
+                [DataType::Mpint,  'n'],
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/codable'
+
+module HrrRbSsh
+  class Authentication
+    class Method
+      class Publickey
+        class Algorithm
+          class SshRsa
+            module Signature
+              class << self
+                include Codable
+              end
+              DEFINITION = [
+                [DataType::String, 'public key algorithm name'],
+                [DataType::String, 'signature blob'],
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/data_type'
+require 'hrr_rb_ssh/codable'
+
+module HrrRbSsh
+  class Authentication
+    class Method
+      class Publickey
+        class Algorithm
+          class SshRsa
+            module SignatureBlob
+              class << self
+                include Codable
+              end
+              DEFINITION = [
+                [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'],
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,6 @@
 
 require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/data_type'
-require 'hrr_rb_ssh/authentication/method/publickey/algorithm/codable'
 
 module HrrRbSsh
   class Authentication
@@ -15,30 +14,6 @@ module HrrRbSsh
             PREFERENCE = 20
             DIGEST = 'sha1'
 
-            PUBLIC_KEY_BLOB_DEFINITION = [
-              [DataType::String, 'public key algorithm name'],
-              [DataType::Mpint,  'e'],
-              [DataType::Mpint,  'n'],
-            ]
-
-            SIGNATURE_DEFINITION = [
-              [DataType::String, 'public key algorithm name'],
-              [DataType::String, 'signature blob'],
-            ]
-
-            SIGNATURE_BLOB_DEFINITION = [
-              [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
@@ -57,15 +32,15 @@ module HrrRbSsh
                 'e'                         => public_key.e.to_i,
                 'n'                         => public_key.n.to_i,
               }
-              public_key_blob == encode(PUBLIC_KEY_BLOB_DEFINITION, public_key_message)
+              public_key_blob == PublicKeyBlob.encode(public_key_message)
             end
 
             def verify_signature session_id, message
-              signature_message   = decode SIGNATURE_DEFINITION, message['signature']
+              signature_message   = Signature.decode message['signature']
               signature_algorithm = signature_message['public key algorithm name']
               signature_blob      = signature_message['signature blob']
 
-              public_key = decode PUBLIC_KEY_BLOB_DEFINITION, message['public key blob']
+              public_key = PublicKeyBlob.decode message['public key blob']
               algorithm = OpenSSL::PKey::RSA.new
               if algorithm.respond_to?(:set_key)
                 algorithm.set_key public_key['n'], public_key['e'], nil
@@ -84,7 +59,7 @@ module HrrRbSsh
                 'public key algorithm name' => message['public key algorithm name'],
                 'public key blob'           => message['public key blob'],
               }
-              data_blob = encode SIGNATURE_BLOB_DEFINITION, data_message
+              data_blob = SignatureBlob.encode data_message
 
               (signature_algorithm == message['public key algorithm name']) && algorithm.verify(DIGEST, signature_blob, data_blob)
             end
@@ -94,3 +69,7 @@ module HrrRbSsh
     end
   end
 end
+
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_rsa/public_key_blob'
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_rsa/signature_blob'
+require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_rsa/signature'

data/lib/hrr_rb_ssh/codable.rb

@@ -0,0 +1,64 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/logger'
+
+module HrrRbSsh
+  module Codable
+    def logger
+      @logger ||= HrrRbSsh::Logger.new self.name
+    end
+
+    def common_definition
+      self::DEFINITION
+    end
+
+    def conditional_definition message
+      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 rescue {}).fetch(field_name, {})[field_value] || [])
+      }
+    end
+
+    def encode message, complementary_message={}
+      logger.debug('encoding message: ' + message.inspect)
+      definition = common_definition + conditional_definition(message.merge complementary_message)
+      definition.map{ |data_type, field_name|
+        field_value = if message[field_name].instance_of? ::Proc then message[field_name].call else message[field_name] end
+        data_type.encode( field_value )
+      }.join
+    end
+
+    def decode payload, complementary_message={}
+      def decode_recursively payload_io, message=nil
+        if message.class == Array and message.size == 0
+          []
+        else
+          definition = case message
+                       when nil
+                         common_definition
+                       when Array
+                         conditional_definition(message)
+                       end
+          decoded_message = definition.map{ |data_type, field_name|
+            [
+              field_name,
+              data_type.decode( payload_io )
+            ]
+          }
+
+          decoded_message + decode_recursively(payload_io, decoded_message)
+        end
+      end
+
+      payload_io = StringIO.new payload
+      decoded_message = decode_recursively(payload_io).to_h
+      if complementary_message.any?
+        decoded_message.merge! decode_recursively(payload_io, complementary_message.to_a).to_h
+      end
+      logger.debug('decoded message: ' + decoded_message.inspect)
+      decoded_message
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/logger'
+
+module HrrRbSsh
+  class Connection
+    class Channel
+      class ChannelType
+        class Session
+          class RequestType
+            class WindowChange
+              class Context
+                attr_reader \
+                  :logger,
+                  :username,
+                  :io,
+                  :variables,
+                  :vars,
+                  :terminal_width_columns,
+                  :terminal_height_rows,
+                  :terminal_width_pixels,
+                  :terminal_height_pixels
+
+                def initialize proc_chain, username, io, variables, message
+                  @logger = HrrRbSsh::Logger.new self.class.name
+
+                  @proc_chain = proc_chain
+                  @username   = username
+                  @io         = io
+                  @variables  = variables
+                  @vars       = variables
+
+                  @terminal_width_columns = message['terminal width, columns']
+                  @terminal_height_rows   = message['terminal height, rows']
+                  @terminal_width_pixels  = message['terminal width, pixels']
+                  @terminal_height_pixels = message['terminal height, pixels']
+                end
+
+                def chain_proc &block
+                  @proc = block || @proc
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/connection/request_handler'
+
+module HrrRbSsh
+  class Connection
+    class Channel
+      class ChannelType
+        class Session
+          class RequestType
+            class WindowChange < RequestType
+              NAME = 'window-change'
+
+              def self.run proc_chain, username, io, variables, message, options
+                logger = HrrRbSsh::Logger.new self.class.name
+
+                context = Context.new proc_chain, username, io, variables, message
+                handler = options.fetch('connection_channel_request_window_change', RequestHandler.new {})
+                handler.run context
+
+                proc_chain.connect context.chain_proc
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/window_change/context'

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

@@ -36,3 +36,4 @@ require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/env'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/shell'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/exec'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/subsystem'
+require 'hrr_rb_ssh/connection/channel/channel_type/session/request_type/window_change'

data/lib/hrr_rb_ssh/connection/request_handler/reference_env_request_handler.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/connection/request_handler'
+
+module HrrRbSsh
+  class Connection
+    class RequestHandler
+      class ReferenceEnvRequestHandler < RequestHandler
+        def initialize
+          @logger = HrrRbSsh::Logger.new self.class.name
+          @proc = Proc.new { |context|
+            context.vars[:env] ||= Hash.new
+            context.vars[:env][context.variable_name] = context.variable_value
+          }
+        end
+      end
+    end
+  end
+end

data/lib/hrr_rb_ssh/connection/request_handler/reference_exec_request_handler.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/connection/request_handler'
+
+module HrrRbSsh
+  class Connection
+    class RequestHandler
+      class ReferenceExecRequestHandler < RequestHandler
+        def initialize
+          @logger = HrrRbSsh::Logger.new self.class.name
+          @proc = Proc.new { |context|
+            context.chain_proc { |chain|
+              pid = fork do
+                Process.setsid
+                context.vars[:env] ||= Hash.new
+                exec context.vars[:env], context.command, in: context.io, out: context.io, err: context.io
+              end
+              pid, status = Process.waitpid2 pid
+              status.exitstatus
+            }
+          }
+        end
+      end
+    end
+  end
+end