net-ssh-backports 6.3.2.backports → 6.3.4.backports

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb9d55f1be03b1b881347b8424dc2f45e77c422f99b06b8ea5d6c7477d6d8b03
-  data.tar.gz: 31cb81a8678713f1da35d0f5e2b1d2e6daebe3ab3fe7673386e7df2818445acb
+  metadata.gz: c4b789946bcf65642f7c7bfcfca48f1a01900826fc934d30a3e5626f67d484d6
+  data.tar.gz: 8f7282bb62e397fe3bc348a04936c8384481fba3fbd3378983402fee654aa14e
 SHA512:
-  metadata.gz: d01eebd2115b708d8443e3649a99001927da8ee09ea420f656a7651e13710839e9eedab611341882944f54e385ac76ff4276c0cc95f5629ef9e4b67eb5e6e223
-  data.tar.gz: 7bb158473b80be67a689c81f7645acf15965b71ef7dbfc666a15e7b99195a1f4b44869c136b3d37283897d2841f54f01d28b77b2b6bbd152cb497af5f08bcbe4
+  metadata.gz: 8eee9be83f4313adb451351c7b353f163c635d837e2f327ca400647317a3d3d5b2a1f76ddb123718c8fba029e1f5a196ee93dfd7aef23ba8e11ed8e159d5e4b9
+  data.tar.gz: 67af2e5b3f775c55686ca7ed8aa353a1df2a01b1ce29c1ae5dc87a046a9d45d8f977a5d884333607d30b0da09228fc629c8c1d2d677e008085aeea9dfa37e074

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

@@ -55,35 +55,38 @@ 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)
-          debug { "beginning authentication of `#{username}'" }
+          begin
+            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 = []
+            attempted = []
 
-          @auth_methods.each do |name|
-            next unless @allowed_auth_methods.include?(name)
+            @auth_methods.each do |name|
+              next unless @allowed_auth_methods.include?(name)
 
-            attempted << 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])
-            rescue NameError
-              debug {"Mechanism #{name} was requested, but isn't a known type.  Ignoring it."}
-              next
-            end
+              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])
+              rescue NameError
+                debug {"Mechanism #{name} was requested, but isn't a known type.  Ignoring it."}
+                next
+              end
 
-            return true if method.authenticate(next_service, username, password)
-          rescue Net::SSH::Authentication::DisallowedMethod
+              return true if method.authenticate(next_service, username, password)
+            rescue Net::SSH::Authentication::DisallowedMethod => e
+              raise e
+            end
           end
 
           error { "all authorization methods failed (tried #{attempted.join(', ')})" }

data/lib/net/ssh/known_hosts.rb

@@ -143,12 +143,14 @@ module Net
         # add an entry for the given host and key to the first file it is able
         # to.
         def add(host, key, options={})
-          hostfiles(options, :user).each do |file|
-            KnownHosts.new(file).add(host, key)
-            return
-          rescue SystemCallError
-            # try the next hostfile
-          end
+          begin
+            hostfiles(options, :user).each do |file|
+              KnownHosts.new(file).add(host, key)
+              return
+            end
+            rescue SystemCallError
+              # try the next hostfile
+            end
         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  = 2
+      TINY  = 4
 
       # 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.2.backports
+  version: 6.3.4.backports
 platform: ruby
 authors:
 - Jamis Buck