hrr_rb_ssh 0.3.0.pre1 → 0.4.2

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman_group_exchange/h0.rb

@@ -8,10 +8,8 @@ module HrrRbSsh
   class Transport
     class KexAlgorithm
       module DiffieHellmanGroupExchange
-        module H0
-          class << self
-            include Codable
-          end
+        class H0
+          include Codable
           DEFINITION = [
             [DataType::String, :'V_C'],
             [DataType::String, :'V_S'],

data/lib/hrr_rb_ssh/transport/kex_algorithm/elliptic_curve_diffie_hellman.rb

@@ -2,7 +2,7 @@
 # vim: et ts=2 sw=2
 
 require 'openssl'
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 require 'hrr_rb_ssh/data_type'
 require 'hrr_rb_ssh/transport/kex_algorithm/iv_computable'
 
@@ -10,80 +10,86 @@ module HrrRbSsh
   class Transport
     class KexAlgorithm
       module EllipticCurveDiffieHellman
+        include Loggable
         include IvComputable
 
-        def initialize
-          @logger = Logger.new(self.class.name)
+        def initialize logger: nil
+          self.logger = logger
           @dh = OpenSSL::PKey::EC.new(self.class::CURVE_NAME)
           @dh.generate_key
+          @public_key = @dh.public_key.to_bn.to_i
         end
 
-        def start transport, mode
-          case mode
+        def start transport
+          case transport.mode
           when Mode::SERVER
-            receive_kexecdh_init transport.receive
+            @k_s = transport.server_host_key_algorithm.server_public_host_key
+            @q_s = @public_key
+            message = receive_kexecdh_init transport.receive
+            @q_c = message[:'Q_C']
+            @shared_secret = OpenSSL::BN.new(@dh.dh_compute_key(OpenSSL::PKey::EC::Point.new(OpenSSL::PKey::EC.new(self.class::CURVE_NAME).group, OpenSSL::BN.new(@q_c))), 2).to_i
             send_kexecdh_reply transport
-          else
-            raise "unsupported mode"
+          when Mode::CLIENT
+            @q_c = @public_key
+            send_kexecdh_init transport
+            message = receive_kexecdh_reply transport.receive
+            @k_s = message[:'K_S']
+            @q_s = message[:'Q_S']
+            @shared_secret = OpenSSL::BN.new(@dh.dh_compute_key(OpenSSL::PKey::EC::Point.new(OpenSSL::PKey::EC.new(self.class::CURVE_NAME).group, OpenSSL::BN.new(@q_s))), 2).to_i
           end
         end
 
-        def set_q_c q_c
-          @q_c = q_c
-        end
-
         def shared_secret
-          k = OpenSSL::BN.new(@dh.dh_compute_key(OpenSSL::PKey::EC::Point.new(OpenSSL::PKey::EC.new(self.class::CURVE_NAME).group, OpenSSL::BN.new(@q_c))), 2).to_i
-        end
-
-        def public_key
-          f = @dh.public_key.to_bn.to_i
+          @shared_secret
         end
 
         def hash transport
-          q_c = @q_c
-          q_s = public_key
-          k   = shared_secret
-
           h0_payload = {
             :'V_C' => transport.v_c,
             :'V_S' => transport.v_s,
             :'I_C' => transport.i_c,
             :'I_S' => transport.i_s,
-            :'K_S' => transport.server_host_key_algorithm.server_public_host_key,
-            :'Q_C' => q_c,
-            :'Q_S' => q_s,
-            :'K'   => k,
+            :'K_S' => @k_s,
+            :'Q_C' => @q_c,
+            :'Q_S' => @q_s,
+            :'K'   => @shared_secret,
           }
-          h0 = H0.encode h0_payload
-
-          h = OpenSSL::Digest.digest self.class::DIGEST, h0
-
-          h
+          h0 = H0.new(logger: logger).encode h0_payload
+          h  = OpenSSL::Digest.digest self.class::DIGEST, h0
         end
 
         def sign transport
           h = hash transport
           s = transport.server_host_key_algorithm.sign h
-
-          s
         end
 
         def receive_kexecdh_init payload
-          message = Message::SSH_MSG_KEXECDH_INIT.decode payload
-          set_q_c message[:'Q_C']
+          Message::SSH_MSG_KEXECDH_INIT.new(logger: logger).decode payload
         end
 
         def send_kexecdh_reply transport
           message = {
             :'message number' => Message::SSH_MSG_KEXECDH_REPLY::VALUE,
-            :'K_S'            => transport.server_host_key_algorithm.server_public_host_key,
-            :'Q_S'            => public_key,
+            :'K_S'            => @k_s,
+            :'Q_S'            => @q_s,
             :'signature of H' => sign(transport),
           }
-          payload = Message::SSH_MSG_KEXECDH_REPLY.encode message
+          payload = Message::SSH_MSG_KEXECDH_REPLY.new(logger: logger).encode message
           transport.send payload
         end
+
+        def send_kexecdh_init transport
+          message = {
+            :'message number' => Message::SSH_MSG_KEXECDH_INIT::VALUE,
+            :'Q_C'            => @q_c,
+          }
+          payload = Message::SSH_MSG_KEXECDH_INIT.new(logger: logger).encode message
+          transport.send payload
+        end
+
+        def receive_kexecdh_reply payload
+          Message::SSH_MSG_KEXECDH_REPLY.new(logger: logger).decode payload
+        end
       end
     end
   end

data/lib/hrr_rb_ssh/transport/kex_algorithm/elliptic_curve_diffie_hellman/h0.rb

@@ -8,10 +8,8 @@ module HrrRbSsh
   class Transport
     class KexAlgorithm
       module EllipticCurveDiffieHellman
-        module H0
-          class << self
-            include Codable
-          end
+        class H0
+          include Codable
           DEFINITION = [
             [DataType::String, :'V_C'],
             [DataType::String, :'V_S'],

data/lib/hrr_rb_ssh/transport/mac_algorithm/functionable.rb

@@ -1,14 +1,16 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Transport
     class MacAlgorithm
       module Functionable
-        def initialize key
-          @logger = Logger.new(self.class.name)
+        include Loggable
+
+        def initialize key, logger: nil
+          self.logger = logger
           @key = key
         end
 

data/lib/hrr_rb_ssh/transport/mac_algorithm/unfunctionable.rb

@@ -1,14 +1,16 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Transport
     class MacAlgorithm
       module Unfunctionable
-        def initialize key=nil
-          @logger = Logger.new(self.class.name)
+        include Loggable
+
+        def initialize key=nil, logger: nil
+          self.logger = logger
         end
 
         def digest_length

data/lib/hrr_rb_ssh/transport/receiver.rb

@@ -1,14 +1,15 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
-#require 'hrr_rb_ssh/transport/packet'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Transport
     class Receiver
-      def initialize
-        @logger = Logger.new self.class.name
+      include Loggable
+
+      def initialize logger: nil
+        self.logger = logger
       end
 
       def depacketize transport, packet
@@ -34,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)
-          @logger.warn { "IO is EOF" }
+          log_info { "IO is EOF" }
           raise EOFError
         end
         unencrypted_packet.push transport.incoming_encryption_algorithm.decrypt(encrypted_packet.last)
@@ -43,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)
-          @logger.warn { "IO is EOF" }
+          log_info { "IO is EOF" }
           raise EOFError
         end
         unencrypted_packet.push transport.incoming_encryption_algorithm.decrypt(encrypted_packet.last)
@@ -55,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)
-          @logger.warn { "IO is EOF" }
+          log_info { "IO is EOF" }
           raise EOFError
         end
         mac

data/lib/hrr_rb_ssh/transport/sender.rb

@@ -1,13 +1,15 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Transport
     class Sender
-      def initialize
-        @logger = Logger.new self.class.name
+      include Loggable
+
+      def initialize logger: nil
+        self.logger = logger
       end
 
       def packetize transport, payload

data/lib/hrr_rb_ssh/transport/sequence_number.rb

@@ -1,8 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
-
 module HrrRbSsh
   class Transport
     class SequenceNumber
@@ -10,8 +8,6 @@ module HrrRbSsh
 
       def initialize
         @sequence_number = 0
-
-        @logger = Logger.new self.class.name
       end
 
       def increment

data/lib/hrr_rb_ssh/transport/server_host_key_algorithm.rb

@@ -19,4 +19,3 @@ require 'hrr_rb_ssh/transport/server_host_key_algorithm/ssh_rsa'
 require 'hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp256'
 require 'hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp384'
 require 'hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp521'
-require 'hrr_rb_ssh/transport/server_host_key_algorithm/ssh_ed25519'

data/lib/hrr_rb_ssh/transport/server_host_key_algorithm/functionable.rb

@@ -1,14 +1,16 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Transport
     class ServerHostKeyAlgorithm
       module Functionable
-        def initialize secret_key=nil
-          @logger = Logger.new(self.class.name)
+        include Loggable
+
+        def initialize secret_key=nil, logger: nil
+          self.logger = logger
           @publickey = Algorithm::Publickey[self.class::NAME].new (secret_key || self.class::SECRET_KEY)
         end
 

data/lib/hrr_rb_ssh/version.rb

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

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_ssh
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre1
+  version: 0.4.2
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ed25519
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +39,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
-description: Pure Ruby SSH 2.0 server implementation
+        version: '0.16'
+description: Pure Ruby SSH 2.0 server and client implementation
 email:
 - hirura@gmail.com
 executables: []
@@ -95,7 +67,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- demo/client.rb
 - demo/echo_server.rb
+- demo/more_flexible_auth.rb
+- demo/multi_step_auth.rb
 - demo/server.rb
 - demo/subsystem_echo_server.rb
 - hrr_rb_ssh.gemspec
@@ -112,17 +87,12 @@ files:
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_dss.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_dss/public_key_blob.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_dss/signature.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key_content.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/pkey.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/public_key_blob.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/signature.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_rsa.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_rsa/public_key_blob.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_rsa/signature.rb
 - lib/hrr_rb_ssh/authentication.rb
 - lib/hrr_rb_ssh/authentication/authenticator.rb
+- lib/hrr_rb_ssh/authentication/constant.rb
 - lib/hrr_rb_ssh/authentication/method.rb
 - lib/hrr_rb_ssh/authentication/method/keyboard_interactive.rb
 - lib/hrr_rb_ssh/authentication/method/keyboard_interactive/context.rb
@@ -140,16 +110,15 @@ files:
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/functionable.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/signature_blob.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_dss.rb
-- lib/hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_ed25519.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_rsa.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/context.rb
+- lib/hrr_rb_ssh/client.rb
 - lib/hrr_rb_ssh/codable.rb
 - lib/hrr_rb_ssh/compat.rb
 - lib/hrr_rb_ssh/compat/openssh.rb
 - lib/hrr_rb_ssh/compat/openssh/authorized_keys.rb
 - lib/hrr_rb_ssh/compat/openssh/public_key.rb
 - lib/hrr_rb_ssh/compat/ruby.rb
-- lib/hrr_rb_ssh/compat/ruby/array.rb
 - lib/hrr_rb_ssh/compat/ruby/openssl.rb
 - lib/hrr_rb_ssh/compat/ruby/openssl/bn.rb
 - lib/hrr_rb_ssh/compat/ruby/queue.rb
@@ -193,7 +162,7 @@ files:
 - lib/hrr_rb_ssh/error/closed_authentication.rb
 - lib/hrr_rb_ssh/error/closed_connection.rb
 - lib/hrr_rb_ssh/error/closed_transport.rb
-- lib/hrr_rb_ssh/logger.rb
+- lib/hrr_rb_ssh/loggable.rb
 - lib/hrr_rb_ssh/message.rb
 - lib/hrr_rb_ssh/message/001_ssh_msg_disconnect.rb
 - lib/hrr_rb_ssh/message/002_ssh_msg_ignore.rb
@@ -298,7 +267,6 @@ files:
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp521.rb
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/functionable.rb
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/ssh_dss.rb
-- lib/hrr_rb_ssh/transport/server_host_key_algorithm/ssh_ed25519.rb
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/ssh_rsa.rb
 - lib/hrr_rb_ssh/version.rb
 homepage: https://github.com/hirura/hrr_rb_ssh
@@ -316,13 +284,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Pure Ruby SSH 2.0 server implementation
+summary: Pure Ruby SSH 2.0 server and client implementation
 test_files: []