hrr_rb_ssh 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b00bf02ef65dbb826a876f2360b378da19601e2b1171a3b2ddcc1625d4b06f
-  data.tar.gz: 2f6c285b85efc9d41631314f894f87dc048f96ab3e3e392b5f6cf0e96fad0b72
+  metadata.gz: ec455249771885393139c2cbe162fa253e5416d2c9bf27478d20073027bf2f18
+  data.tar.gz: 6f73965ad0835b838ea26dfa496961d2c52052068957b963e8a02ef735e4f0c7
 SHA512:
-  metadata.gz: 587d108b0e0752969de0cf53b2acac0ad1cf76afe5587f18cc05f9170d25a5fc21f2be3163f00958cd8945b77ea416968acb39969b4bd3db7e8abe1dc26c9ce8
-  data.tar.gz: 4f02efd3b27eeeb37ad4b0c3636a88624efb0d9ae8f5aabefe433821a75162fc583458579306be1d5fdc69dbe552730f199448cec8a6777748c5d92cc531fcb4
+  metadata.gz: a94383816e8e2fb807a0db84190c07d2c11614169d2ccb4755673b838d273a1b2168beef44ebd7c8028401af618b08075ae4f811d1b02213457a69d0ffe75b5b
+  data.tar.gz: 659d58c1b86649825764f7db02eeb243ac6c07b458f4407b78f9fb0108b3d1aa58ab1edc0fe6c77ea6989bafcad48c2d56456c8f74c1107e5a4c1ffff3adb307

data/demo/client.rb

@@ -10,8 +10,15 @@ rescue LoadError
   require 'hrr_rb_ssh'
 end
 
+class MyLoggerFormatter < ::Logger::Formatter
+  def call severity, time, progname, msg
+    "%s, [%s#%d.%x] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), Process.pid, Thread.current.object_id, severity, progname, msg2str(msg)]
+  end
+end
+
 logger = Logger.new STDOUT
 logger.level = Logger::DEBUG
+logger.formatter = MyLoggerFormatter.new
 
 target = ['localhost', 10022]
 options = {

data/demo/echo_server.rb

@@ -41,8 +41,15 @@ def start_service io, logger=nil
   server.start io
 end
 
+class MyLoggerFormatter < ::Logger::Formatter
+  def call severity, time, progname, msg
+    "%s, [%s#%d.%x] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), Process.pid, Thread.current.object_id, severity, progname, msg2str(msg)]
+  end
+end
+
 logger = Logger.new STDOUT
 logger.level = Logger::INFO
+logger.formatter = MyLoggerFormatter.new
 
 server = TCPServer.new 10022
 loop do

data/demo/more_flexible_auth.rb

@@ -69,8 +69,16 @@ def start_service io, logger=nil
 end
 
 
+class MyLoggerFormatter < ::Logger::Formatter
+  def call severity, time, progname, msg
+    "%s, [%s#%d.%x] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), Process.pid, Thread.current.object_id, severity, progname, msg2str(msg)]
+  end
+end
+
+
 logger = Logger.new STDOUT
 logger.level = Logger::INFO
+logger.formatter = MyLoggerFormatter.new
 
 server = TCPServer.new 10022
 loop do

data/demo/multi_step_auth.rb

@@ -63,8 +63,16 @@ def start_service io, logger=nil
 end
 
 
+class MyLoggerFormatter < ::Logger::Formatter
+  def call severity, time, progname, msg
+    "%s, [%s#%d.%x] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), Process.pid, Thread.current.object_id, severity, progname, msg2str(msg)]
+  end
+end
+
+
 logger = Logger.new STDOUT
 logger.level = Logger::INFO
+logger.formatter = MyLoggerFormatter.new
 
 server = TCPServer.new 10022
 loop do

data/demo/server.rb

@@ -92,8 +92,16 @@ OfeosJOO9twerD7pPhmXREkygblPsEXaVA==
 end
 
 
+class MyLoggerFormatter < ::Logger::Formatter
+  def call severity, time, progname, msg
+    "%s, [%s#%d.%x] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), Process.pid, Thread.current.object_id, severity, progname, msg2str(msg)]
+  end
+end
+
+
 logger = Logger.new STDOUT
 logger.level = Logger::INFO
+logger.formatter = MyLoggerFormatter.new
 
 server = TCPServer.new 10022
 loop do

data/demo/subsystem_echo_server.rb

@@ -49,8 +49,15 @@ def start_service io, logger=nil
   server.start io
 end
 
+class MyLoggerFormatter < ::Logger::Formatter
+  def call severity, time, progname, msg
+    "%s, [%s#%d.%x] %5s -- %s: %s\n" % [severity[0..0], format_datetime(time), Process.pid, Thread.current.object_id, severity, progname, msg2str(msg)]
+  end
+end
+
 logger = Logger.new STDOUT
 logger.level = Logger::INFO
+logger.formatter = MyLoggerFormatter.new
 
 server = TCPServer.new 10022
 while true

data/lib/hrr_rb_ssh/authentication.rb

@@ -33,6 +33,7 @@ module HrrRbSsh
       begin
         @transport.send payload
       rescue Error::ClosedTransport
+        close
         raise Error::ClosedAuthentication
       end
     end
@@ -42,19 +43,28 @@ module HrrRbSsh
       begin
         @transport.receive
       rescue Error::ClosedTransport
+        close
         raise Error::ClosedAuthentication
       end
     end
 
     def start
-      @transport.start
-      authenticate
+      log_info { "start authentication" }
+      begin
+        @transport.start
+        authenticate
+      rescue Error::ClosedTransport
+        close
+        raise Error::ClosedAuthentication
+      end
     end
 
     def close
       return if @closed
+      log_info { "close authentication" }
       @closed = true
       @transport.close
+      log_info { "authentication closed" }
     end
 
     def closed?
@@ -121,8 +131,8 @@ module HrrRbSsh
             send_userauth_failure authentication_methods, false
           end
         else
-          @closed = true
-          raise
+          close
+          raise Error::ClosedAuthentication
         end
       end
     end

data/lib/hrr_rb_ssh/connection.rb

@@ -49,7 +49,12 @@ module HrrRbSsh
 
     def start foreground: true
       log_info { "start connection" }
-      @authentication.start
+      begin
+        @authentication.start
+      rescue Error::ClosedAuthentication
+        close
+        raise Error::ClosedConnection
+      end
       @closed = false
       @connection_loop_thread = connection_loop_thread
       if foreground
@@ -62,7 +67,8 @@ module HrrRbSsh
     end
 
     def close
-      log_info { "closing connection" }
+      return if @closed
+      log_info { "close connection" }
       @closed = true
       @authentication.close
       @channels.values.each do |channel|
@@ -74,7 +80,7 @@ module HrrRbSsh
       end
       @channels.clear
       @global_request_handler.close
-      @connection_loop_thread.join unless @connection_loop_thread == Thread.current
+      @connection_loop_thread.join if @connection_loop_thread && @connection_loop_thread != Thread.current
       log_info { "connection closed" }
     end
 

data/lib/hrr_rb_ssh/error/closed_authentication.rb

@@ -3,7 +3,7 @@
 
 module HrrRbSsh
   class Error
-    class ClosedAuthentication < Error
+    class ClosedAuthentication < StandardError
     end
   end
 end

data/lib/hrr_rb_ssh/error/closed_connection.rb

@@ -3,7 +3,7 @@
 
 module HrrRbSsh
   class Error
-    class ClosedConnection < Error
+    class ClosedConnection < StandardError
     end
   end
 end

data/lib/hrr_rb_ssh/error/closed_transport.rb

@@ -3,7 +3,7 @@
 
 module HrrRbSsh
   class Error
-    class ClosedTransport < Error
+    class ClosedTransport < StandardError
     end
   end
 end

data/lib/hrr_rb_ssh/server.rb

@@ -25,7 +25,11 @@ module HrrRbSsh
       transport      = Transport.new      io, Mode::SERVER, @options, logger: logger
       authentication = Authentication.new transport, Mode::SERVER, @options, logger: logger
       connection     = Connection.new     authentication, Mode::SERVER, @options, logger: logger
-      connection.start
+      begin
+        connection.start
+      rescue Error::ClosedConnection
+      end
+      log_info { "server service finished" }
     end
   end
 end

data/lib/hrr_rb_ssh/transport.rb

@@ -174,11 +174,16 @@ module HrrRbSsh
         end
 
         @closed = false
+      rescue Error::ClosedTransport
+        close
+        raise Error::ClosedTransport
       rescue EOFError => e
         close
+        raise Error::ClosedTransport
       rescue => e
         log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
         close
+        raise Error::ClosedTransport
       else
         log_info { "transport started" }
       end
@@ -204,12 +209,15 @@ module HrrRbSsh
       @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
-      log_info { "transport disconnected" }
     end
 
     def exchange_version

data/lib/hrr_rb_ssh/version.rb

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

metadata

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