hrr_rb_ssh 0.1.9 → 0.2.0

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

@@ -25,7 +25,7 @@ module HrrRbSsh
                   :encoded_terminal_modes
 
                 def initialize proc_chain, username, io, variables, message
-                  @logger = HrrRbSsh::Logger.new self.class.name
+                  @logger = Logger.new self.class.name
 
                   @proc_chain = proc_chain
                   @username   = username

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

@@ -14,7 +14,7 @@ module HrrRbSsh
               NAME = 'pty-req'
 
               def self.run proc_chain, username, io, variables, message, options
-                logger = HrrRbSsh::Logger.new self.class.name
+                logger = Logger.new self.class.name
 
                 context = Context.new proc_chain, username, io, variables, message
                 handler = options.fetch('connection_channel_request_pty_req', RequestHandler.new {})

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

@@ -19,7 +19,7 @@ module HrrRbSsh
                   :vars
 
                 def initialize proc_chain, username, io, variables, message
-                  @logger = HrrRbSsh::Logger.new self.class.name
+                  @logger = Logger.new self.class.name
 
                   @proc_chain = proc_chain
                   @username   = username

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

@@ -14,7 +14,7 @@ module HrrRbSsh
               NAME = 'shell'
 
               def self.run proc_chain, username, io, variables, message, options
-                logger = HrrRbSsh::Logger.new self.class.name
+                logger = Logger.new self.class.name
 
                 context = Context.new proc_chain, username, io, variables, message
                 handler = options.fetch('connection_channel_request_shell', RequestHandler.new {})

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

@@ -20,7 +20,7 @@ module HrrRbSsh
                   :subsystem_name
 
                 def initialize proc_chain, username, io, variables, message
-                  @logger = HrrRbSsh::Logger.new self.class.name
+                  @logger = Logger.new self.class.name
 
                   @proc_chain = proc_chain
                   @username   = username

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

@@ -14,7 +14,7 @@ module HrrRbSsh
               NAME = 'subsystem'
 
               def self.run proc_chain, username, io, variables, message, options
-                logger = HrrRbSsh::Logger.new self.class.name
+                logger = Logger.new self.class.name
 
                 context = Context.new proc_chain, username, io, variables, message
                 handler = options.fetch('connection_channel_request_subsystem', RequestHandler.new {})

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

@@ -23,7 +23,7 @@ module HrrRbSsh
                   :terminal_height_pixels
 
                 def initialize proc_chain, username, io, variables, message
-                  @logger = HrrRbSsh::Logger.new self.class.name
+                  @logger = Logger.new self.class.name
 
                   @proc_chain = proc_chain
                   @username   = username

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

@@ -14,7 +14,7 @@ module HrrRbSsh
               NAME = 'window-change'
 
               def self.run proc_chain, username, io, variables, message, options
-                logger = HrrRbSsh::Logger.new self.class.name
+                logger = Logger.new self.class.name
 
                 context = Context.new proc_chain, username, io, variables, message
                 handler = options.fetch('connection_channel_request_window_change', RequestHandler.new {})

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

@@ -11,7 +11,7 @@ module HrrRbSsh
           NAME = 'session'
 
           def initialize connection, channel, message, socket=nil
-            @logger = HrrRbSsh::Logger.new self.class.name
+            @logger = Logger.new self.class.name
             @connection = connection
             @channel = channel
             @variables = {}

data/lib/hrr_rb_ssh/connection/channel.rb

@@ -22,7 +22,7 @@ module HrrRbSsh
         :receive_message_queue
 
       def initialize connection, message, socket=nil
-        @logger = HrrRbSsh::Logger.new self.class.name
+        @logger = Logger.new self.class.name
 
         @connection = connection
 
@@ -103,7 +103,7 @@ module HrrRbSsh
             end
           end
           send_channel_close
-        rescue HrrRbSsh::ClosedConnectionError => e
+        rescue Error::ClosedConnection => e
           Thread.pass
         rescue => e
           @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
@@ -127,7 +127,7 @@ module HrrRbSsh
                 break
               end
               case message[:'message number']
-              when HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST::VALUE
+              when Message::SSH_MSG_CHANNEL_REQUEST::VALUE
                 @logger.info { "received channel request: #{message[:'request type']}" }
                 begin
                   @channel_type_instance.request message
@@ -141,11 +141,11 @@ module HrrRbSsh
                     send_channel_success
                   end
                 end
-              when HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA::VALUE
+              when Message::SSH_MSG_CHANNEL_DATA::VALUE
                 @logger.info { "received channel data" }
                 local_channel = message[:'recipient channel']
                 @receive_data_queue.enq message[:'data']
-              when HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE
+              when Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE
                 @logger.debug { "received channel window adjust" }
                 @remote_window_size = [@remote_window_size + message[:'bytes to add'], 0xffff_ffff].min
               else
@@ -261,80 +261,80 @@ module HrrRbSsh
 
       def send_channel_success
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_SUCCESS::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_SUCCESS::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_SUCCESS.encode message
+        payload = Message::SSH_MSG_CHANNEL_SUCCESS.encode message
         @connection.send payload
       end
 
       def send_channel_failure
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_FAILURE::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_FAILURE::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_FAILURE.encode message
+        payload = Message::SSH_MSG_CHANNEL_FAILURE.encode message
         @connection.send payload
       end
 
       def send_channel_window_adjust
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE,
           :'recipient channel' => @remote_channel,
           :'bytes to add'      => INITIAL_WINDOW_SIZE,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_WINDOW_ADJUST.encode message
+        payload = Message::SSH_MSG_CHANNEL_WINDOW_ADJUST.encode message
         @connection.send payload
       end
 
       def send_channel_data data
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_DATA::VALUE,
           :'recipient channel' => @remote_channel,
           :'data'              => data,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_DATA.encode message
+        payload = Message::SSH_MSG_CHANNEL_DATA.encode message
         @connection.send payload
       end
 
-      def send_channel_extended_data data, code=HrrRbSsh::Message::SSH_MSG_CHANNEL_EXTENDED_DATA::DataTypeCode::SSH_EXTENDED_DATA_STDERR
+      def send_channel_extended_data data, code=Message::SSH_MSG_CHANNEL_EXTENDED_DATA::DataTypeCode::SSH_EXTENDED_DATA_STDERR
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_EXTENDED_DATA::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_EXTENDED_DATA::VALUE,
           :'recipient channel' => @remote_channel,
           :'data type code'    => code,
           :'data'              => data,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_EXTENDED_DATA.encode message
+        payload = Message::SSH_MSG_CHANNEL_EXTENDED_DATA.encode message
         @connection.send payload
       end
 
       def send_channel_request_exit_status exitstatus
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_REQUEST::VALUE,
           :'recipient channel' => @remote_channel,
           :'request type'      => "exit-status",
           :'want reply'        => false,
           :'exit status'       => exitstatus,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_REQUEST.encode message
+        payload = Message::SSH_MSG_CHANNEL_REQUEST.encode message
         @connection.send payload
       end
 
       def send_channel_eof
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_EOF::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_EOF::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_EOF.encode message
+        payload = Message::SSH_MSG_CHANNEL_EOF.encode message
         @connection.send payload
       end
 
       def send_channel_close
         message = {
-          :'message number'    => HrrRbSsh::Message::SSH_MSG_CHANNEL_CLOSE::VALUE,
+          :'message number'    => Message::SSH_MSG_CHANNEL_CLOSE::VALUE,
           :'recipient channel' => @remote_channel,
         }
-        payload = HrrRbSsh::Message::SSH_MSG_CHANNEL_CLOSE.encode message
+        payload = Message::SSH_MSG_CHANNEL_CLOSE.encode message
         @connection.send payload
       end
     end

data/lib/hrr_rb_ssh/connection/global_request_handler.rb

@@ -11,7 +11,7 @@ module HrrRbSsh
         :accepted
 
       def initialize connection
-        @logger = HrrRbSsh::Logger.new self.class.name
+        @logger = Logger.new self.class.name
         @connection = connection
         @tcpip_forward_servers = Hash.new
         @tcpip_forward_threads = Hash.new

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

@@ -9,7 +9,7 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceEnvRequestHandler < RequestHandler
         def initialize
-          @logger = HrrRbSsh::Logger.new self.class.name
+          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             context.vars[:env] ||= Hash.new
             context.vars[:env][context.variable_name] = context.variable_value

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

@@ -10,7 +10,7 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceExecRequestHandler < RequestHandler
         def initialize
-          @logger = HrrRbSsh::Logger.new self.class.name
+          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             ptm = context.vars[:ptm]
             pts = context.vars[:pts]
@@ -39,10 +39,8 @@ module HrrRbSsh
               pid = fork do
                 Process.setsid
                 Dir.chdir passwd.dir
-                Process.gid  = passwd.gid
-                Process.egid = passwd.gid
-                Process.uid  = passwd.uid
-                Process.euid = passwd.uid
+                Process::GID.change_privilege passwd.gid
+                Process::UID.change_privilege passwd.uid
                 if ptm
                   STDIN.reopen  pts, 'r'
                   STDOUT.reopen pts, 'w'
@@ -58,45 +56,6 @@ module HrrRbSsh
               else
                 pts.close
 
-                ptm_read_thread = Thread.start {
-                  loop do
-                    begin
-                      context.io[1].write ptm.readpartial(10240)
-                    rescue EOFError => e
-                      context.logger.info { "ptm is EOF in ptm_read_thread" }
-                      break
-                    rescue IOError => e
-                      context.logger.warn { "IO Error in ptm_read_thread" }
-                      break
-                    rescue Errno::EIO => e
-                      context.logger.info { "EIO Error in ptm_read_thread" }
-                      break
-                    rescue => e
-                      context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                      break
-                    end
-                  end
-                }
-                ptm_write_thread = Thread.start {
-                  loop do
-                    begin
-                      ptm.write context.io[0].readpartial(10240)
-                    rescue EOFError => e
-                      context.logger.info { "IO is EOF in ptm_write_thread" }
-                      break
-                    rescue IOError => e
-                      context.logger.warn { "IO Error in ptm_write_thread" }
-                      break
-                    rescue Errno::EIO => e
-                      context.logger.info { "EIO Error in ptm_read_thread" }
-                      break
-                    rescue => e
-                      context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                      break
-                    end
-                  end
-                }
-
                 begin
                   pid, status = Process.waitpid2 pid
                   context.logger.info { "program exited with status #{status.inspect}" }
@@ -116,18 +75,6 @@ module HrrRbSsh
                     end
                     context.logger.info { "program exited with status #{status.inspect}" }
                   end
-                  begin
-                    ptm_read_thread.join
-                  rescue => e
-                    context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                  end
-                  begin
-                    ptm_write_thread.exit
-                    ptm_write_thread.join
-                  rescue => e
-                    context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                  end
-                  context.logger.info { "proc chain finished" }
                 end
               end
             }

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

@@ -13,7 +13,7 @@ module HrrRbSsh
     class RequestHandler
       class ReferencePtyReqRequestHandler < RequestHandler
         def initialize
-          @logger = HrrRbSsh::Logger.new self.class.name
+          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             begin
               ptm, pts = PTY.open
@@ -27,27 +27,64 @@ module HrrRbSsh
               context.vars[:env]['TERM'] = context.term_environment_variable_value
               context.chain_proc { |chain|
                 begin
+                  ptm_read_thread = Thread.start {
+                    loop do
+                      begin
+                        context.io[1].write ptm.readpartial(10240)
+                      rescue EOFError => e
+                        context.logger.info { "ptm is EOF in ptm_read_thread" }
+                        break
+                      rescue IOError => e
+                        context.logger.warn { "IO Error in ptm_read_thread" }
+                        break
+                      rescue Errno::EIO => e
+                        context.logger.info { "EIO Error in ptm_read_thread" }
+                        break
+                      rescue => e
+                        context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+                        break
+                      end
+                    end
+                  }
+                  ptm_write_thread = Thread.start {
+                    loop do
+                      begin
+                        ptm.write context.io[0].readpartial(10240)
+                      rescue EOFError => e
+                        context.logger.info { "IO is EOF in ptm_write_thread" }
+                        break
+                      rescue IOError => e
+                        context.logger.warn { "IO Error in ptm_write_thread" }
+                        break
+                      rescue Errno::EIO => e
+                        context.logger.info { "EIO Error in ptm_read_thread" }
+                        break
+                      rescue => e
+                        context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+                        break
+                      end
+                    end
+                  }
                   chain.call_next
                 ensure
+                  context.vars[:ptm].close rescue nil
+                  context.vars[:pts].close rescue nil
                   begin
-                    context.vars[:ptm].close
-                  rescue
+                    ptm_read_thread.join
+                  rescue => e
+                    context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
                   end
                   begin
-                    context.vars[:pts].close
-                  rescue
+                    ptm_write_thread.exit
+                    ptm_write_thread.join
+                  rescue => e
+                    context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
                   end
                 end
               }
             rescue => e
-              begin
-                ptm.close
-              rescue
-              end
-              begin
-                pts.close
-              rescue
-              end
+              ptm.close rescue nil
+              pts.close rescue nil
               context.chain_proc{ |chain|
                 exitstatus = 1
               }

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

@@ -11,7 +11,7 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceShellRequestHandler < RequestHandler
         def initialize
-          @logger = HrrRbSsh::Logger.new self.class.name
+          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             ptm = context.vars[:ptm]
             pts = context.vars[:pts]
@@ -36,10 +36,8 @@ module HrrRbSsh
                 ptm.close
                 Process.setsid
                 Dir.chdir passwd.dir
-                Process.gid  = passwd.gid
-                Process.egid = passwd.gid
-                Process.uid  = passwd.uid
-                Process.euid = passwd.uid
+                Process::GID.change_privilege passwd.gid
+                Process::UID.change_privilege passwd.uid
                 STDIN.reopen  pts, 'r'
                 STDOUT.reopen pts, 'w'
                 STDERR.reopen pts, 'w'
@@ -49,45 +47,6 @@ module HrrRbSsh
 
               pts.close
 
-              ptm_read_thread = Thread.start {
-                loop do
-                  begin
-                    context.io[1].write ptm.readpartial(10240)
-                  rescue EOFError => e
-                    context.logger.info { "ptm is EOF in ptm_read_thread" }
-                    break
-                  rescue IOError => e
-                    context.logger.warn { "IO Error in ptm_read_thread" }
-                    break
-                  rescue Errno::EIO => e
-                    context.logger.info { "EIO Error in ptm_read_thread" }
-                    break
-                  rescue => e
-                    context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                    break
-                  end
-                end
-              }
-              ptm_write_thread = Thread.start {
-                loop do
-                  begin
-                    ptm.write context.io[0].readpartial(10240)
-                  rescue EOFError => e
-                    context.logger.info { "IO is EOF in ptm_write_thread" }
-                    break
-                  rescue IOError => e
-                    context.logger.warn { "IO Error in ptm_write_thread" }
-                    break
-                  rescue Errno::EIO => e
-                    context.logger.info { "EIO Error in ptm_read_thread" }
-                    break
-                  rescue => e
-                    context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                    break
-                  end
-                end
-              }
-
               begin
                 pid, status = Process.waitpid2 pid
                 context.logger.info { "shell exited with status #{status.inspect}" }
@@ -107,18 +66,6 @@ module HrrRbSsh
                   end
                   context.logger.info { "shell exited with status #{status.inspect}" }
                 end
-                begin
-                  ptm_read_thread.join
-                rescue => e
-                  context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                end
-                begin
-                  ptm_write_thread.exit
-                  ptm_write_thread.join
-                rescue => e
-                  context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                end
-                context.logger.info { "proc chain finished" }
               end
             }
           }

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

@@ -10,7 +10,7 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceWindowChangeRequestHandler < RequestHandler
         def initialize
-          @logger = HrrRbSsh::Logger.new self.class.name
+          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             context.vars[:ptm].winsize = [context.terminal_height_rows, context.terminal_width_columns, context.terminal_width_pixels, context.terminal_height_pixels]
           }

data/lib/hrr_rb_ssh/connection/request_handler.rb

@@ -7,7 +7,7 @@ module HrrRbSsh
   class Connection
     class RequestHandler
       def initialize &block
-        @logger = HrrRbSsh::Logger.new self.class.name
+        @logger = Logger.new self.class.name
         @proc = block
       end
       def run context