hrr_rb_ssh 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec455249771885393139c2cbe162fa253e5416d2c9bf27478d20073027bf2f18
-  data.tar.gz: 6f73965ad0835b838ea26dfa496961d2c52052068957b963e8a02ef735e4f0c7
+  metadata.gz: 781a7427bc3d26dcddba2be4a74f685d26ecc867fe6a1d937cd19e3b56cd9477
+  data.tar.gz: c1ea1ee12f012d1cf66a23518049a9ce127a1ded1536c735330b6f7e3ad22d7d
 SHA512:
-  metadata.gz: a94383816e8e2fb807a0db84190c07d2c11614169d2ccb4755673b838d273a1b2168beef44ebd7c8028401af618b08075ae4f811d1b02213457a69d0ffe75b5b
-  data.tar.gz: 659d58c1b86649825764f7db02eeb243ac6c07b458f4407b78f9fb0108b3d1aa58ab1edc0fe6c77ea6989bafcad48c2d56456c8f74c1107e5a4c1ffff3adb307
+  metadata.gz: c0c79b9c3d00f49b4e8090ec6cf9aa5e58619d62f4bd46a0d2864c3c29d908a92470f4eda4e9ba1b057f765b98214ddcaa5b44e9cd4de1ecd44639afd89d29bd
+  data.tar.gz: e9c84a3ad17d39972c6950f4da1b92bca351511d5bc220b342ac7d61f7d70631f60c68ecd5ac5d964d76825b5a67027227bb45ac3f2703788c7d7a548359c730

data/.gitignore

@@ -21,7 +21,4 @@ Gemfile.lock
 .ruby-gemset
 
 # additional
-.DS_Store
-*~
-*.swp
 /yang/

data/README.md

@@ -584,7 +584,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/hirura
 
 ## Code of Conduct
 
-Everyone interacting in the HrrRbSsh project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hirura/hrr_rb_ssh/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the HrrRbSsh project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hirura/hrr_rb_ssh/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 

data/lib/hrr_rb_ssh/authentication.rb

@@ -112,7 +112,7 @@ module HrrRbSsh
           when PARTIAL_SUCCESS
             log_info { "partially verified" }
             authentication_methods.delete method_name
-            log_debug { "authentication methods that can continue: #{authentication_methods}" }
+            log_info { "authentication methods that can continue: #{authentication_methods}" }
             if authentication_methods.empty?
               log_info { "verified" }
               send_userauth_success
@@ -159,7 +159,7 @@ module HrrRbSsh
             log_info { "partially verified" }
           end
           authentication_methods_that_can_continue = message[:'authentications that can continue']
-          log_debug { "authentication methods that can continue: #{authentication_methods_that_can_continue}" }
+          log_info { "authentication methods that can continue: #{authentication_methods_that_can_continue}" }
           next_method_name = authentication_methods.find{ |local_m| authentication_methods_that_can_continue.find{ |remote_m| local_m == remote_m } }
           if next_method_name
             authentication_methods.delete next_method_name

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

@@ -23,7 +23,6 @@ module HrrRbSsh
 
         def authenticate userauth_request_message
           log_info { "authenticate" }
-          log_debug { "userauth request: " + userauth_request_message.inspect }
           username = userauth_request_message[:'user name']
           submethods = userauth_request_message[:'submethods']
           context = Context.new(@transport, username, submethods, @variables, @authentication_methods, logger: logger)

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

@@ -22,7 +22,6 @@ module HrrRbSsh
 
         def authenticate userauth_request_message
           log_info { "authenticate" }
-          log_debug { "userauth request: " + userauth_request_message.inspect }
           context = Context.new(userauth_request_message[:'user name'], @variables, @authentication_methods, logger: logger)
           @authenticator.authenticate context
         end

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

@@ -23,7 +23,6 @@ module HrrRbSsh
 
         def authenticate userauth_request_message
           log_info { "authenticate" }
-          log_debug { "userauth request: " + userauth_request_message.inspect }
           username = userauth_request_message[:'user name']
           password = userauth_request_message[:'plaintext password']
           context = Context.new(username, password, @variables, @authentication_methods, logger: logger)

data/lib/hrr_rb_ssh/client.rb

@@ -75,14 +75,14 @@ module HrrRbSsh
     end
 
     def close
-      log_debug { "closing client" }
+      log_info { "closing client" }
       @closed = true
       @connection.close
-      log_debug { "client closed" }
+      log_info { "client closed" }
     end
 
     def exec! command, pty: false, env: {}
-      log_debug { "start exec!: #{command}" }
+      log_info { "start exec!: #{command}" }
       out_buf = StringIO.new
       err_buf = StringIO.new
       begin
@@ -141,7 +141,7 @@ module HrrRbSsh
     end
 
     def exec command, pty: false, env: {}
-      log_debug { "start exec: #{command}" }
+      log_info { "start exec: #{command}" }
       begin
         log_info { "Opning channel" }
         channel = @connection.request_channel_open "session"
@@ -174,7 +174,7 @@ module HrrRbSsh
     end
 
     def shell env: {}
-      log_debug { "start shell" }
+      log_info { "start shell" }
       begin
         log_info { "Opning channel" }
         channel = @connection.request_channel_open "session"
@@ -205,7 +205,7 @@ module HrrRbSsh
     end
 
     def subsystem name
-      log_debug { "start subsystem" }
+      log_info { "start subsystem" }
       begin
         log_info { "Opning channel" }
         channel = @connection.request_channel_open "session"

data/lib/hrr_rb_ssh/connection.rb

@@ -224,35 +224,35 @@ module HrrRbSsh
       log_info { 'received ' + Message::SSH_MSG_CHANNEL_REQUEST::ID }
       message = Message::SSH_MSG_CHANNEL_REQUEST.new(logger: logger).decode payload
       local_channel = message[:'recipient channel']
-      @channels[local_channel].receive_message_queue.enq message
+      @channels[local_channel].receive_message_queue.enq message if @channels.has_key? local_channel
     end
 
     def channel_window_adjust payload
       log_info { 'received ' + Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::ID }
       message = Message::SSH_MSG_CHANNEL_WINDOW_ADJUST.new(logger: logger).decode payload
       local_channel = message[:'recipient channel']
-      @channels[local_channel].receive_message_queue.enq message
+      @channels[local_channel].receive_message_queue.enq message if @channels.has_key? local_channel
     end
 
     def channel_data payload
       log_info { 'received ' + Message::SSH_MSG_CHANNEL_DATA::ID }
       message = Message::SSH_MSG_CHANNEL_DATA.new(logger: logger).decode payload
       local_channel = message[:'recipient channel']
-      @channels[local_channel].receive_message_queue.enq message
+      @channels[local_channel].receive_message_queue.enq message if @channels.has_key? local_channel
     end
 
     def channel_extended_data payload
       log_info { 'received ' + Message::SSH_MSG_CHANNEL_EXTENDED_DATA::ID }
       message = Message::SSH_MSG_CHANNEL_EXTENDED_DATA.new(logger: logger).decode payload
       local_channel = message[:'recipient channel']
-      @channels[local_channel].receive_message_queue.enq message
+      @channels[local_channel].receive_message_queue.enq message if @channels.has_key? local_channel
     end
 
     def channel_eof payload
       log_info { 'received ' + Message::SSH_MSG_CHANNEL_EOF::ID }
       message = Message::SSH_MSG_CHANNEL_EOF.new(logger: logger).decode payload
       local_channel = message[:'recipient channel']
-      @channels[local_channel].receive_message_queue.enq message
+      @channels[local_channel].receive_message_queue.enq message if @channels.has_key? local_channel
     end
 
     def channel_close payload

data/lib/hrr_rb_ssh/connection/channel.rb

@@ -85,13 +85,13 @@ module HrrRbSsh
           @channel_type_instance.start
         end
         @closed = false
-        log_debug { "in start: #{@waiting_thread}" }
+        log_debug { "in start: #{@waiting_thread.inspect}" }
         @waiting_thread.wakeup if @waiting_thread
       end
 
       def wait_until_started
         @waiting_thread = Thread.current
-        log_debug { "in wait_until_started: #{@waiting_thread}" }
+        log_debug { "in wait_until_started: #{@waiting_thread.inspect}" }
         Thread.stop
       end
 
@@ -203,7 +203,7 @@ module HrrRbSsh
                   local_channel = message[:'recipient channel']
                   @receive_extended_data_queue.enq message[:'data']
                 when Message::SSH_MSG_CHANNEL_WINDOW_ADJUST::VALUE
-                  log_debug { "received channel window adjust" }
+                  log_info { "received channel window adjust" }
                   @remote_window_size = [@remote_window_size + message[:'bytes to add'], 0xffff_ffff].min
                 else
                   log_warn { "received unsupported message: #{message.inspect}" }

data/lib/hrr_rb_ssh/transport.rb

@@ -59,7 +59,6 @@ module HrrRbSsh
       @options = options
 
       @closed = nil
-      @disconnected = nil
 
       @in_kex = false
 
@@ -88,11 +87,12 @@ module HrrRbSsh
     end
 
     def send payload
+      raise Error::ClosedTransport if @closed
       @sender_monitor.synchronize do
         begin
           @sender.send self, payload
-        rescue Errno::EPIPE => e
-          log_warn { "IO is Broken PIPE" }
+        rescue IOError, SystemCallError => e
+          log_info { "#{e.message} (#{e.class})" }
           close
           raise Error::ClosedTransport
         rescue => e
@@ -110,25 +110,24 @@ module HrrRbSsh
           payload = @receiver.receive self
           case payload[0,1].unpack("C")[0]
           when Message::SSH_MSG_DISCONNECT::VALUE
+            log_info { "received disconnect message" }
             message = Message::SSH_MSG_DISCONNECT.new(logger: logger).decode payload
-            log_debug { "received disconnect message: #{message.inspect}" }
-            @disconnected = true
             close
             raise Error::ClosedTransport
           when Message::SSH_MSG_IGNORE::VALUE
+            log_info { "received ignore message" }
             message = Message::SSH_MSG_IGNORE.new(logger: logger).decode payload
-            log_debug { "received ignore message: #{message.inspect}" }
             receive
           when Message::SSH_MSG_UNIMPLEMENTED::VALUE
+            log_info { "received unimplemented message" }
             message = Message::SSH_MSG_UNIMPLEMENTED.new(logger: logger).decode payload
-            log_debug { "received unimplemented message: #{message.inspect}" }
             receive
           when Message::SSH_MSG_DEBUG::VALUE
+            log_info { "received debug message" }
             message = Message::SSH_MSG_DEBUG.new(logger: logger).decode payload
-            log_debug { "received debug message: #{message.inspect}" }
             receive
           when Message::SSH_MSG_KEXINIT::VALUE
-            log_debug { "received kexinit message" }
+            log_info { "received kexinit message" }
             if @in_kex
               payload
             else
@@ -139,16 +138,9 @@ module HrrRbSsh
             payload
           end
         rescue Error::ClosedTransport
-          raise Error::ClosedTransport
-        rescue EOFError => e
-          close
-          raise Error::ClosedTransport
-        rescue IOError => e
-          log_warn { "IO is closed" }
-          close
-          raise Error::ClosedTransport
-        rescue Errno::ECONNRESET => e
-          log_warn { "IO is RESET" }
+          raise
+        rescue EOFError, IOError, SystemCallError => e
+          log_info { "#{e.message} (#{e.class})" }
           close
           raise Error::ClosedTransport
         rescue => e
@@ -161,23 +153,20 @@ module HrrRbSsh
 
     def start
       log_info { "start transport" }
-
       begin
         exchange_version
         exchange_key
-
         case @mode
         when Mode::SERVER
           verify_service_request
         when Mode::CLIENT
           send_service_request
         end
-
         @closed = false
       rescue Error::ClosedTransport
-        close
-        raise Error::ClosedTransport
-      rescue EOFError => e
+        raise
+      rescue EOFError, IOError, SystemCallError => e
+        log_info { "#{e.message} (#{e.class})" }
         close
         raise Error::ClosedTransport
       rescue => e
@@ -190,13 +179,20 @@ module HrrRbSsh
     end
 
     def close
-      return if @closed
-      log_info { "close transport" }
-      @closed = true
-      disconnect
-      @incoming_compression_algorithm.close
-      @outgoing_compression_algorithm.close
-      log_info { "transport closed" }
+      @sender_monitor.synchronize do
+        return if @closed
+        log_info { "close transport" }
+        begin
+          disconnect
+          @incoming_compression_algorithm.close
+          @outgoing_compression_algorithm.close
+        rescue => e
+          log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+        ensure
+          @closed = true
+          log_info { "transport closed" }
+        end
+      end
     end
 
     def closed?
@@ -204,20 +200,9 @@ module HrrRbSsh
     end
 
     def disconnect
-      return if @disconnected
       log_info { "disconnect transport" }
-      @disconnected = true
-      begin
-        send_disconnect
-      rescue Error::ClosedTransport
-        log_warn { "Transport is closed" }
-      rescue IOError
-        log_warn { "IO is closed" }
-      rescue => e
-        log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-      ensure
-        log_info { "transport disconnected" }
-      end
+      send_disconnect
+      log_info { "transport disconnected" }
     end
 
     def exchange_version
@@ -356,7 +341,15 @@ module HrrRbSsh
         :'language tag'   => ""
       }
       payload = Message::SSH_MSG_DISCONNECT.new(logger: logger).encode message
-      send payload
+      @sender_monitor.synchronize do
+        begin
+          @sender.send self, payload
+        rescue IOError, SystemCallError => e
+          log_info { "#{e.message} (#{e.class})" }
+        rescue => e
+          log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+        end
+      end
     end
 
     def send_kexinit
@@ -425,8 +418,6 @@ module HrrRbSsh
     def receive_service_request
       payload = @receiver.receive self
       message = Message::SSH_MSG_SERVICE_REQUEST.new(logger: logger).decode payload
-
-      message
     end
 
     def send_service_accept service_name

data/lib/hrr_rb_ssh/transport/receiver.rb

@@ -35,7 +35,7 @@ module HrrRbSsh
         block_size = [transport.incoming_encryption_algorithm.block_size, minimum_block_size].max
         encrypted_packet.push transport.io.read(block_size)
         if (encrypted_packet.last == nil) || (encrypted_packet.last.length != block_size)
-          log_warn { "IO is EOF" }
+          log_info { "IO is EOF" }
           raise EOFError
         end
         unencrypted_packet.push transport.incoming_encryption_algorithm.decrypt(encrypted_packet.last)
@@ -44,7 +44,7 @@ module HrrRbSsh
         following_packet_length = packet_length_field_length + packet_length - block_size
         encrypted_packet.push transport.io.read(following_packet_length)
         if (encrypted_packet.last == nil) || (encrypted_packet.last.length != following_packet_length)
-          log_warn { "IO is EOF" }
+          log_info { "IO is EOF" }
           raise EOFError
         end
         unencrypted_packet.push transport.incoming_encryption_algorithm.decrypt(encrypted_packet.last)
@@ -56,7 +56,7 @@ module HrrRbSsh
         mac_length = transport.incoming_mac_algorithm.digest_length
         mac = transport.io.read mac_length
         if (mac == nil) || (mac.length != mac_length)
-          log_warn { "IO is EOF" }
+          log_info { "IO is EOF" }
           raise EOFError
         end
         mac

data/lib/hrr_rb_ssh/version.rb

@@ -2,5 +2,5 @@
 # vim: et ts=2 sw=2
 
 module HrrRbSsh
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_ssh
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake