sshkit 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942b003ed89d1b23971fcc2a90f9df45ad13894f
-  data.tar.gz: c3b93ab5ba8c4e3768229cd6fabc0121aaaf9a5e
+  metadata.gz: 55991102eb1f68ef187977bcafd1e2daa71885bc
+  data.tar.gz: 655886ef5681e121c8003ec8248b7f4606a327c6
 SHA512:
-  metadata.gz: 230cd5e66474858207fccfe497d9e194e0e5fb3455350eb8c189766cd5e276b16309b3193ebfd33c69951fe4ca61258cace638dc55e3aae2f5610f1a57b1d0b2
-  data.tar.gz: e4376a240351954bf3d26d4f9c22e435dd6079d4516fd92805d640f25ad71af1830b2a4f6ada9c2c2cb0e2c038be9e85b076442d002a8e492933a303a7e21ef3
+  metadata.gz: 51a9ab26eb4ac3359b6fe7a06a3ef93d35fc6ddef838256a7b9f699edc940decf2ed4b5a5fac85ff83c7a0e75cc62cc980be4e8341523b29c4726840012596bf
+  data.tar.gz: 7f7a17a8917f57034299298a8445ab20194db4404780653f251dc009b71347c3ea755ec10a4f569acc989d73590dcea510a935f9d040e7e72a5e259542016d65

data/CHANGELOG.md

@@ -8,6 +8,11 @@ appear at the top.
   * Add your entries below here, remember to credit yourself however you want
     to be credited!
 
+## [1.11.3][] (2016-09-16)
+
+  * Fix known_hosts caching to match on the entire hostlist
+    [PR #364](https://github.com/capistrano/sshkit/pull/364) @byroot
+
 ## [1.11.2][] (2016-07-29)
 
 ### Bug fixes
@@ -644,7 +649,8 @@ version `0.0.5`.
 
 First release.
 
-[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.11.2...HEAD
+[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.11.3...HEAD
+[1.11.3]: https://github.com/capistrano/sshkit/compare/v1.11.2...v1.11.3
 [1.11.2]: https://github.com/capistrano/sshkit/compare/v1.11.1...v1.11.2
 [1.11.1]: https://github.com/capistrano/sshkit/compare/v1.11.0...v1.11.1
 [1.11.0]: https://github.com/capistrano/sshkit/compare/v1.10.0...v1.11.0

data/lib/sshkit/backends/netssh/known_hosts.rb

@@ -18,10 +18,12 @@ module SSHKit
           parse_file unless keys && hashes
           keys, hashes = hosts_keys, hosts_hashes
 
-          hostlist.split(',').each do |host|
-            key_list = keys[host]
-            return key_list if key_list
+          host_names = hostlist.split(',')
 
+          keys_found = host_names.map { |h| keys[h] || [] }.compact.inject(:&)
+          return keys_found unless keys_found.empty?
+
+          host_names.each do |host|
             hashes.each do |(hmac, salt), hash_keys|
               if OpenSSL::HMAC.digest(sha1, salt, host) == hmac
                 return hash_keys

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.11.2".freeze
+  VERSION = "1.11.3".freeze
 end

data/test/known_hosts/github_ip

@@ -0,0 +1 @@
+github.com,192.30.252.123 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==

data/test/unit/backends/test_netssh.rb

@@ -56,23 +56,28 @@ module SSHKit
 
       if Net::SSH::Version::CURRENT >= Net::SSH::Version[3, 1, 0]
         def test_known_hosts_for_when_all_hosts_are_recognized
-          perform_known_hosts_test("github")
+          perform_known_hosts_test('github', 'github.com')
         end
 
         def test_known_hosts_for_when_an_host_hash_is_recognized
-          perform_known_hosts_test("github_hash")
+          perform_known_hosts_test('github_hash', 'github.com')
+        end
+
+        def test_known_hosts_for_with_multiple_hosts
+          perform_known_hosts_test('github', '192.30.252.123,github.com', 0)
+          perform_known_hosts_test('github_ip', '192.30.252.123,github.com', 1)
         end
       end
 
       private
 
-      def perform_known_hosts_test(hostfile)
+      def perform_known_hosts_test(hostfile, hostlist, keys_count = 1)
         source = File.join(File.dirname(__FILE__), '../../known_hosts', hostfile)
         kh = Netssh::KnownHosts.new
-        keys = kh.search_for('github.com', user_known_hosts_file: source, global_known_hosts_file: Tempfile.new('sshkit-test').path)
+        keys = kh.search_for(hostlist, user_known_hosts_file: source, global_known_hosts_file: Tempfile.new('sshkit-test').path)
 
         assert_instance_of ::Net::SSH::HostKeys, keys
-        assert_equal(1, keys.count)
+        assert_equal(keys_count, keys.count)
         keys.each do |key|
           assert_equal("ssh-rsa", key.ssh_type)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -178,6 +178,7 @@ files:
 - test/helper.rb
 - test/known_hosts/github
 - test/known_hosts/github_hash
+- test/known_hosts/github_ip
 - test/support/vagrant_wrapper.rb
 - test/unit/backends/test_abstract.rb
 - test/unit/backends/test_connection_pool.rb
@@ -230,6 +231,7 @@ test_files:
 - test/helper.rb
 - test/known_hosts/github
 - test/known_hosts/github_hash
+- test/known_hosts/github_ip
 - test/support/vagrant_wrapper.rb
 - test/unit/backends/test_abstract.rb
 - test/unit/backends/test_connection_pool.rb