@@ -1,3 +1,8 @@ +=== *unreleased* + +* Teach Net::SSH about a handful of default key names [Jamis Buck] + + === 2.0.0 / 1 May 2008 * Allow the :verbose argument to accept symbols (:debug, etc.) as well as Logger level constants (Logger::DEBUG, etc.) [Jamis Buck] CHANGELOG.rdoc @@ -53,7 +53,7 @@ module Net; module SSH; module Authentication message = expect_message(SERVICE_ACCEPT) key_manager = KeyManager.new(logger, options) - Array(options[:keys]).each { |key| key_manager.add(key) } + keys.each { |key| key_manager.add(key) } attempted = [] @@ -112,5 +112,16 @@ module Net; module SSH; module Authentication end message end + + private + + # Returns an array of paths to the key files that should be used when + # attempting any key-based authentication mechanism. + def keys + Array( + options[:keys] || + %w(~/.ssh/id_dsa ~/.ssh/id_rsa ~/.ssh2/id_dsa ~/.ssh2/id_rsa) + ) + end end end; end; end \ No newline at end of file lib/net/ssh/authentication/session.rb dd1574a04e7c1088a06dae2d1676f4f5ff1aeaef Jamis Buck jamis@37signals.com http://github.com/jamis/net-ssh/commit/ba7066885639c4e3ded3df4e05aae6fa2a9d1d6f ba7066885639c4e3ded3df4e05aae6fa2a9d1d6f 2008-05-02T20:02:52-07:00 2008-05-02T20:02:52-07:00 teach the key manager about a handful of default key names 328aafb01d62158a0dcd59ea281aec153d5c537a Jamis Buck jamis@37signals.com