right_scraper 3.0.3 → 3.0.4

data/lib/right_scraper/retrievers/git.rb

@@ -21,11 +21,12 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+require 'tmpdir'
+
 module RightScraper
   module Retrievers
     # Retriever for resources stored in a git repository.
     class Git < CheckoutBasedRetriever
-
       @@available = false
 
       # Determines if downloader is available.
@@ -58,7 +59,7 @@ module RightScraper
       def retrieve
         raise RetrieverError.new("git retriever is unavailable") unless available?
         RightScraper::Processes::SSHAgent.with do |agent|
-          unless @repository.first_credential.nil? || @repository.first_credential.blank?
+          unless @repository.first_credential.nil? || @repository.first_credential.empty?
             agent.add_key(@repository.first_credential)
           end
           super
@@ -111,7 +112,9 @@ module RightScraper
       def do_checkout
         super
         git = @logger.operation(:cloning, "to #{@repo_dir}") do
-          ::Git.clone(@repository.url, @repo_dir)
+          without_host_key_checking do
+            ::Git.clone(@repository.url, @repo_dir)
+          end
         end
         do_fetch(git)
         do_checkout_revision(git)
@@ -133,6 +136,11 @@ module RightScraper
         end if repo_tag
       end
 
+      # Ignore .git directories.
+      def ignorable_paths
+        ['.git']
+      end
+
       def tag?(git, name)
         git.tags.find {|t| t.name == name}
       end
@@ -159,9 +167,29 @@ module RightScraper
         git.branches.remote.find {|b| b.name == name}
       end
 
-      # Ignore .git directories.
-      def ignorable_paths
-        ['.git']
+      # Temporarily disable SSH host-key checking for SSH clients invoked by Git, for the duration of the
+      # block that is passed to this method.
+      #
+      # @yield after disabling strict host key checking, yields to caller
+      def without_host_key_checking
+        tmpdir = Dir.mktmpdir
+        ssh_cmd = File.join(tmpdir, 'ssh')
+
+        File.open(ssh_cmd, 'w') do |cmd|
+          cmd.puts "#!/bin/bash"
+          cmd.puts "exec ssh -o StrictHostKeyChecking=no ${@}"
+        end
+        FileUtils.chmod(0700, ssh_cmd)
+
+        old_env = ENV['GIT_SSH']
+        ENV['GIT_SSH'] = ssh_cmd
+
+        result = yield
+      ensure
+        FileUtils.rm_rf(tmpdir)
+        ENV['GIT_SSH'] = old_env
+
+        result
       end
     end
   end

data/right_scraper.gemspec

@@ -24,7 +24,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_scraper'
-  spec.version   = '3.0.3'
+  spec.version   = '3.0.4'
   spec.authors   = ['Graham Hughes', 'Raphael Simon']
   spec.email     = 'raphael@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_scraper'

data/spec/cookbook_s3_upload_spec.rb

@@ -56,8 +56,8 @@ describe RightScraper::Scanners::CookbookS3Upload do
   end
 
   before(:each) do
-    pending "Not run unless AMAZON_ACCESS_KEY_ID and AMAZON_SECRET_ACCESS_KEY set" unless
-            ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY']
+    pending "Not run unless AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY set" unless
+            ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY']
   end
 
   context "given a bucket that doesn't exist" do
@@ -73,8 +73,8 @@ describe RightScraper::Scanners::CookbookS3Upload do
       @repo = RightScraper::Repositories::Base.from_hash(:display_name => 'test repo',
                                                :repo_type    => :download,
                                                :url          => "file:///#{@download_file}")
-      @s3 = RightAws::S3.new(aws_access_key_id=ENV['AMAZON_ACCESS_KEY_ID'],
-                            aws_secret_access_key=ENV['AMAZON_SECRET_ACCESS_KEY'],
+      @s3 = RightAws::S3.new(aws_access_key_id=ENV['AWS_ACCESS_KEY_ID'],
+                            aws_secret_access_key=ENV['AWS_SECRET_ACCESS_KEY'],
                             :logger => RightScraper::Logger.new)
       FileUtils.rm_rf(RightScraper::Retrievers::Base.repo_dir(@repo_path, @repo))
     end
@@ -88,8 +88,8 @@ describe RightScraper::Scanners::CookbookS3Upload do
                                    :scanners => [RightScraper::Scanners::CookbookMetadata,
                                                  RightScraper::Scanners::CookbookManifest,
                                                  RightScraper::Scanners::CookbookS3Upload],
-                                   :s3_key => ENV['AMAZON_ACCESS_KEY_ID'],
-                                   :s3_secret => ENV['AMAZON_SECRET_ACCESS_KEY'],
+                                   :s3_key => ENV['AWS_ACCESS_KEY_ID'],
+                                   :s3_secret => ENV['AWS_SECRET_ACCESS_KEY'],
                                    :s3_bucket => bucket_name,
                                    :max_bytes => 1024**2,
                                    :max_seconds => 20)
@@ -112,13 +112,13 @@ describe RightScraper::Scanners::CookbookS3Upload do
                                    :scanners => [RightScraper::Scanners::CookbookMetadata,
                                                  RightScraper::Scanners::CookbookManifest,
                                                  RightScraper::Scanners::CookbookS3Upload],
-                                   :s3_key => ENV['AMAZON_ACCESS_KEY_ID'],
-                                   :s3_secret => ENV['AMAZON_SECRET_ACCESS_KEY'],
+                                   :s3_key => ENV['AWS_ACCESS_KEY_ID'],
+                                   :s3_secret => ENV['AWS_SECRET_ACCESS_KEY'],
                                    :s3_bucket => bucket_name,
                                    :max_bytes => 1024**2,
                                    :max_seconds => 20)
-      s3 = RightAws::S3.new(aws_access_key_id=ENV['AMAZON_ACCESS_KEY_ID'],
-                            aws_secret_access_key=ENV['AMAZON_SECRET_ACCESS_KEY'],
+      s3 = RightAws::S3.new(aws_access_key_id=ENV['AWS_ACCESS_KEY_ID'],
+                            aws_secret_access_key=ENV['AWS_SECRET_ACCESS_KEY'],
                             :logger => RightScraper::Logger.new)
       @bucket = s3.bucket(bucket_name, create=true)
       FileUtils.rm_rf(RightScraper::Retrievers::Base.repo_dir(@repo_path, @repo))

data/spec/git/demokey

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

data/spec/git/demokey.pub

@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxJsM8sZ6++Nky/ogLEYhKtKivB37sPB9M6Un0z6PkIRgUsGdntMJqP1U6820jH+n1/lOH/MnlUsvzoo8DnOdbe9kGOHBmtWmNcjqacZUn9DbpbjvlI7RUUmZ5OBKn8Pjt2qbSXnnci9Q5j5Rgh6DR8A70S04FIUP8AGpCIO23BhA928CiM18zN5mBvzET7L2DYiNhJJFsFWMbN13CdukTjNVNLETEusNVUU09G1NxX4esKky7tHh1c9APFvu98KjYOHkv1o7dB7T4dO3KaKCNWINCHeeoE+QmAkhAZwI72ijRkPxH+QMisMsHucPFvgOVVObxHWu9hRlNWIOodANHQ== grahamhughes@Graham-Hughess-Computer.local
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC18gNzaOwgJkHhUgPPNtCNp0H08ywzH1AquwSca19ZOedGnRWa673t4sXW0BeBn1wd8v0EulHRNwIyn0xJLsEStMOpo4A0qN+B2sM9gjBcY8nMOyUqy5s32pXncGfEwiRuiAxqz45VJqvL3CD8X5WxG300u/DNUbLZN0IT1aPn52Bo6gcGleZklxF1cccrbMelWfXE7KYKjD3/TfLdJeOlP9PJM8ijFHCsyWcKt5AH8bFkQ/xETPfqPzUIwvLDU7HpVDLZZ6JBi2rxhAAG+NhE3GMmY5i+vMB+g7CCfY200SFxzyjIcag05MGGko8Rv9bHnE3AYj9cxCULyDJyZm/T nobody@localhost.localdomain

data/spec/git/password_key

@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,6B0CA080DABAAD1E
+DEK-Info: AES-128-CBC,6DF3FE56B08906976427C247F02F8EF1
 
-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
+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
 -----END RSA PRIVATE KEY-----

data/spec/git/password_key.pub

@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAw56wRLwoHYzEHSZtf4e/34Jc2v1mhTZuIjNzCbhKyFS6JzsGl5Hzq0gsV1spVw+l0HW725z0wZST+AeNdcgBmm5CBl4153jTT8eZ7uqVC1PCzp16TwpYeBdxvVJGhgXFJCy0qmlPkBB6/tq/KWDIUJVE3V2U5QEyC88v2tZSqxtzRkHms2+ZG/eUydWFsNRSCNqUZ/L6H9Iqi3xZl1xmYt/JeCtgNe7eh721LMfWfD9xg2ekTmBBEeCOCIL1+0i9duK9Rsn5H3pOvekEdCHhge3OelYTP9z/trJievJ96ViJUjLppV6OO7Oog0UzaMgi2HMNy9WGgtJ5TTuBLM5KmQ== grahamhughes@kyuzo.local
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQChbg3Sbijezv1ycd8itx5pWjmsa6g0yhL6Q9OW2F7OFx+qILcsU7rgIQh7THhYMD8OpAdw8A3lyw0jFIfp0acmKMUorrO3oFK2cLauvVXCBaz6GpDq4wiAvJHdQlW7mSFOx86Niem7/LiuR48fMJ1RgNMDUIlpk19ZMCxhEd53ZJfzFWrrFKhtxhJnCbRMm1RtkVkGWNvJFRHm7JKpZJBne4CYBBYjTiG97CGb1D8mYuGxneMlt/ImYt+D3W+wa9j17+UdamFKJl+3lZC3k3WJXyfLHFYFkkW2NeJNqYefAXgULIyMdybcOvI++/hXxJmh5p6cML4yA08IFqYHQY/f nobody@localhost.localdomain

data/spec/git/retriever_spec.rb

@@ -508,7 +508,7 @@ describe RightScraper::Retrievers::Git do
       @repo = RightScraper::Repositories::Base.from_hash(
         :display_name     => 'test repo',
         :repo_type        => :git,
-        :url              => 'git@github.com:rightscale-test-account/cookbooks.git',
+        :url              => 'git@github.com:xeger/cookbooks_test_fixture.git',
         :first_credential => credential)
         @helper.setup_cookbooks
     end
@@ -525,5 +525,29 @@ describe RightScraper::Retrievers::Git do
       pending "Don't annoy GitHub unless ANNOY_GITHUB is set" unless ENV['ANNOY_GITHUB']
       @scraper.next_resource.should_not be_nil
     end
+
+    context :without_host_key_checking do
+      before(:each) do
+        @retriever = RightScraper::Retrievers::Git.new(@repo, :basedir=>@helper.scraper_path)
+      end
+
+
+      it 'should override the git-SSH command' do
+        ENV['GIT_SSH'] = nil
+        @retriever.without_host_key_checking do
+          ENV['GIT_SSH'].should =~ /ssh/
+          # Run the git-ssh command, make sure it invokes the SSH client
+          `#{ENV['GIT_SSH']} -V 2>&1`.should =~ /OpenSSH_[0-9]+\.[0-9]+/
+        end
+      end
+
+      it 'should clean up after itself' do
+        ENV['GIT_SSH'] = 'banana'
+        @retriever.without_host_key_checking do
+          ENV['GIT_SSH'].should =~ /ssh/
+        end
+        ENV['GIT_SSH'].should == 'banana'
+      end
+    end
   end
 end

data/spec/git/ssh_spec.rb

@@ -136,9 +136,9 @@ describe RightScraper::Processes::SSHAgent do
       File.chmod(0600, demofile)
       demofile = File.join(File.dirname(__FILE__), 'demokey')
       agent.add_keyfile(demofile)
-      `ssh-add -l`.should == "2048 3d:6a:4f:8b:ec:35:da:e9:7e:cc:e8:2d:03:2f:6f:23 #{demofile} (RSA)\n"
+      `ssh-add -l`.should == "2048 c7:66:87:fc:17:b5:2f:32:f2:c1:ed:40:a6:8d:17:44 #{demofile} (RSA)\n"
       `ssh-add -L`.should == <<FULLOUTPUT
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxJsM8sZ6++Nky/ogLEYhKtKivB37sPB9M6Un0z6PkIRgUsGdntMJqP1U6820jH+n1/lOH/MnlUsvzoo8DnOdbe9kGOHBmtWmNcjqacZUn9DbpbjvlI7RUUmZ5OBKn8Pjt2qbSXnnci9Q5j5Rgh6DR8A70S04FIUP8AGpCIO23BhA928CiM18zN5mBvzET7L2DYiNhJJFsFWMbN13CdukTjNVNLETEusNVUU09G1NxX4esKky7tHh1c9APFvu98KjYOHkv1o7dB7T4dO3KaKCNWINCHeeoE+QmAkhAZwI72ijRkPxH+QMisMsHucPFvgOVVObxHWu9hRlNWIOodANHQ== #{demofile}
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC18gNzaOwgJkHhUgPPNtCNp0H08ywzH1AquwSca19ZOedGnRWa673t4sXW0BeBn1wd8v0EulHRNwIyn0xJLsEStMOpo4A0qN+B2sM9gjBcY8nMOyUqy5s32pXncGfEwiRuiAxqz45VJqvL3CD8X5WxG300u/DNUbLZN0IT1aPn52Bo6gcGleZklxF1cccrbMelWfXE7KYKjD3/TfLdJeOlP9PJM8ijFHCsyWcKt5AH8bFkQ/xETPfqPzUIwvLDU7HpVDLZZ6JBi2rxhAAG+NhE3GMmY5i+vMB+g7CCfY200SFxzyjIcag05MGGko8Rv9bHnE3AYj9cxCULyDJyZm/T #{demofile}
 FULLOUTPUT
     end
   end
@@ -163,8 +163,9 @@ FULLOUTPUT
       demofile = File.join(File.dirname(__FILE__), 'demokey')
       demodata = File.open(demofile).read
       agent.add_key(demodata)
-      `ssh-add -l`.should =~ /^2048 3d:6a:4f:8b:ec:35:da:e9:7e:cc:e8:2d:03:2f:6f:23 .*? \(RSA\)\n$/
-      `ssh-add -L`.should =~ %r{^ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxJsM8sZ6\+\+Nky/ogLEYhKtKivB37sPB9M6Un0z6PkIRgUsGdntMJqP1U6820jH\+n1/lOH/MnlUsvzoo8DnOdbe9kGOHBmtWmNcjqacZUn9DbpbjvlI7RUUmZ5OBKn8Pjt2qbSXnnci9Q5j5Rgh6DR8A70S04FIUP8AGpCIO23BhA928CiM18zN5mBvzET7L2DYiNhJJFsFWMbN13CdukTjNVNLETEusNVUU09G1NxX4esKky7tHh1c9APFvu98KjYOHkv1o7dB7T4dO3KaKCNWINCHeeoE\+QmAkhAZwI72ijRkPxH\+QMisMsHucPFvgOVVObxHWu9hRlNWIOodANHQ== .*\n$}
+      `ssh-add -l`.should =~ /^2048 c7:66:87:fc:17:b5:2f:32:f2:c1:ed:40:a6:8d:17:44 .*? \(RSA\)\n$/
+      expected_pubkey = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC18gNzaOwgJkHhUgPPNtCNp0H08ywzH1AquwSca19ZOedGnRWa673t4sXW0BeBn1wd8v0EulHRNwIyn0xJLsEStMOpo4A0qN+B2sM9gjBcY8nMOyUqy5s32pXncGfEwiRuiAxqz45VJqvL3CD8X5WxG300u/DNUbLZN0IT1aPn52Bo6gcGleZklxF1cccrbMelWfXE7KYKjD3/TfLdJeOlP9PJM8ijFHCsyWcKt5AH8bFkQ/xETPfqPzUIwvLDU7HpVDLZZ6JBi2rxhAAG+NhE3GMmY5i+vMB+g7CCfY200SFxzyjIcag05MGGko8Rv9bHnE3AYj9cxCULyDJyZm/T'
+      `ssh-add -L`.should =~ %r{^#{Regexp.escape(expected_pubkey)} .*\n$}
     end
   end
 end

data/spec/scraper_helper.rb

@@ -39,7 +39,9 @@ module RightScraper
           end
 
           after(:each) do
-            FileUtils.remove_entry_secure(@basedir)
+            if @basedir && File.directory?(@basedir)
+              FileUtils.remove_entry_secure(@basedir)
+            end
             @scraper = nil
           end
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_scraper
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - Graham Hughes
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-21 00:00:00 -07:00
+date: 2012-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency