net-ssh-backports 6.3.4.backports → 6.3.6.backports

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4b789946bcf65642f7c7bfcfca48f1a01900826fc934d30a3e5626f67d484d6
-  data.tar.gz: 8f7282bb62e397fe3bc348a04936c8384481fba3fbd3378983402fee654aa14e
+  metadata.gz: 11f75b7708864ad48d35c19370dce6e2865aa0be10cc2ad8c46f88c8bd2e677e
+  data.tar.gz: 75b03f76290c2267085309e76cc3c30ae7892f447a564dafbe17771b958693c7
 SHA512:
-  metadata.gz: 8eee9be83f4313adb451351c7b353f163c635d837e2f327ca400647317a3d3d5b2a1f76ddb123718c8fba029e1f5a196ee93dfd7aef23ba8e11ed8e159d5e4b9
-  data.tar.gz: 67af2e5b3f775c55686ca7ed8aa353a1df2a01b1ce29c1ae5dc87a046a9d45d8f977a5d884333607d30b0da09228fc629c8c1d2d677e008085aeea9dfa37e074
+  metadata.gz: bb7591b3a6db6c47ee242cba5b13d2b9a3285c88b0199c6eb487c50e026957e1c212d810a36b5aefa72a49901e73b0721f21a17f03908496d6274673a9131c34
+  data.tar.gz: 4b562a83eda3bf0894f292f72362210397715a7a368bfeca63e7696dc0b1b5430948629e4a8da77b1e132195b03d2515a29bf90ff67454cc71b668fc02255f91

data/.gitignore

@@ -11,3 +11,4 @@ test/integration/playbook.retry
 .byebug_history
 
 tryout
+/.vscode/settings.json

data/lib/net/ssh/authentication/key_manager.rb

@@ -249,35 +249,37 @@ module Net
         # Load prepared identities. Private key decryption errors ignored if ignore_decryption_errors
         def load_identities(identities, ask_passphrase, ignore_decryption_errors)
           identities.map do |identity|
-            case identity[:load_from]
-            when :pubkey_file
-              key = KeyFactory.load_public_key(identity[:pubkey_file])
-              { public_key: key, from: :file, file: identity[:privkey_file] }
-            when :privkey_file
-              private_key = KeyFactory.load_private_key(
-                identity[:privkey_file], options[:passphrase], ask_passphrase, options[:password_prompt]
-              )
-              key = private_key.send(:public_key)
-              { public_key: key, from: :file, file: identity[:privkey_file], key: private_key }
-            when :data
-              private_key = KeyFactory.load_data_private_key(
-                identity[:data], options[:passphrase], ask_passphrase, "<key in memory>", options[:password_prompt]
-              )
-              key = private_key.send(:public_key)
-              { public_key: key, from: :key_data, data: identity[:data], key: private_key }
-            else
-              identity
-            end
-          rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError, OpenSSL::PKey::ECError, OpenSSL::PKey::PKeyError, ArgumentError => e
-            if ignore_decryption_errors
-              identity
-            else
+            begin
+              case identity[:load_from]
+              when :pubkey_file
+                key = KeyFactory.load_public_key(identity[:pubkey_file])
+                { public_key: key, from: :file, file: identity[:privkey_file] }
+              when :privkey_file
+                private_key = KeyFactory.load_private_key(
+                  identity[:privkey_file], options[:passphrase], ask_passphrase, options[:password_prompt]
+                )
+                key = private_key.send(:public_key)
+                { public_key: key, from: :file, file: identity[:privkey_file], key: private_key }
+              when :data
+                private_key = KeyFactory.load_data_private_key(
+                  identity[:data], options[:passphrase], ask_passphrase, "<key in memory>", options[:password_prompt]
+                )
+                key = private_key.send(:public_key)
+                { public_key: key, from: :key_data, data: identity[:data], key: private_key }
+              else
+                identity
+              end
+            rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError, OpenSSL::PKey::ECError, OpenSSL::PKey::PKeyError, ArgumentError => e
+              if ignore_decryption_errors
+                identity
+              else
+                process_identity_loading_error(identity, e)
+                nil
+              end
+            rescue Exception => e
               process_identity_loading_error(identity, e)
               nil
             end
-          rescue Exception => e
-            process_identity_loading_error(identity, e)
-            nil
           end.compact
         end
 

data/lib/net/ssh/authentication/session.rb

@@ -55,26 +55,26 @@ module Net
         # service request. Returns true if an authentication method succeeds in
         # authenticating the user, and false otherwise.
         def authenticate(next_service, username, password=nil)
-          begin
-            debug { "beginning authentication of `#{username}'" }
+          debug { "beginning authentication of `#{username}'" }
 
-            transport.send_message(transport.service_request("ssh-userauth"))
-            expect_message(SERVICE_ACCEPT)
+          transport.send_message(transport.service_request("ssh-userauth"))
+          expect_message(SERVICE_ACCEPT)
 
-            key_manager = KeyManager.new(logger, options)
-            keys.each { |key| key_manager.add(key) } unless keys.empty?
-            keycerts.each { |keycert| key_manager.add_keycert(keycert) } unless keycerts.empty?
-            key_data.each { |key2| key_manager.add_key_data(key2) } unless key_data.empty?
-            default_keys.each { |key| key_manager.add(key) } unless options.key?(:keys) || options.key?(:key_data)
+          key_manager = KeyManager.new(logger, options)
+          keys.each { |key| key_manager.add(key) } unless keys.empty?
+          keycerts.each { |keycert| key_manager.add_keycert(keycert) } unless keycerts.empty?
+          key_data.each { |key2| key_manager.add_key_data(key2) } unless key_data.empty?
+          default_keys.each { |key| key_manager.add(key) } unless options.key?(:keys) || options.key?(:key_data)
 
-            attempted = []
-
-            @auth_methods.each do |name|
+          attempted = []
+          @auth_methods.each do |name|
+            begin
               next unless @allowed_auth_methods.include?(name)
 
               attempted << name
 
               debug { "trying #{name}" }
+
               begin
                 auth_class = Methods.const_get(name.split(/\W+/).map { |p| p.capitalize }.join)
                 method = auth_class.new(self, key_manager: key_manager, password_prompt: options[:password_prompt])
@@ -84,8 +84,7 @@ module Net
               end
 
               return true if method.authenticate(next_service, username, password)
-            rescue Net::SSH::Authentication::DisallowedMethod => e
-              raise e
+            rescue Net::SSH::Authentication::DisallowedMethod
             end
           end
 

data/lib/net/ssh/version.rb

@@ -52,7 +52,7 @@ module Net
       MINOR = 3
 
       # The tiny component of this version of the Net::SSH library
-      TINY  = 4
+      TINY  = 6
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-backports
 version: !ruby/object:Gem::Version
-  version: 6.3.4.backports
+  version: 6.3.6.backports
 platform: ruby
 authors:
 - Jamis Buck
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf