CookbookSiteStreamingUploader uses ssl_verify_mode.

2 files changed, 12 insertions, 201 deletions

diff --git a/lib/chef/cookbook_site_streaming_uploader.rb b/lib/chef/cookbook_site_streaming_uploader.rb
index 92193fee33..c444c8251b 100644
--- a/lib/chef/cookbook_site_streaming_uploader.rb
+++ b/lib/chef/cookbook_site_streaming_uploader.rb
@@ -143,7 +143,7 @@ class Chef
         http = Net::HTTP.new(url.host, url.port)
         if url.scheme == "https"
           http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http.verify_mode = verify_mode
         end
         res = http.request(req)
         #res = http.start {|http_proc| http_proc.request(req) }
@@ -165,6 +165,17 @@ class Chef
         res
       end
 
+      private
+
+      def verify_mode
+        verify_mode = Chef::Config[:ssl_verify_mode]
+        if verify_mode == :verify_none
+          OpenSSL::SSL::VERIFY_NONE
+        elsif verify_mode == :verify_peer
+          OpenSSL::SSL::VERIFY_PEER
+        end
+      end
+
     end
 
     class StreamPart
diff --git a/spec/unit/cookbook_site_streaming_uploader.rb b/spec/unit/cookbook_site_streaming_uploader.rb
deleted file mode 100644
index 73a513494f..0000000000
--- a/spec/unit/cookbook_site_streaming_uploader.rb
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# Author:: Xabier de Zuazo (xabier@onddo.com)
-# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-
-require 'chef/cookbook_site_streaming_uploader'
-
-class FakeTempfile
-  def initialize(basename)
-    @basename = basename
-  end
-
-  def close
-  end
-
-  def path
-    "#{@basename}.ZZZ"
-  end
-
-end
-
-describe Chef::CookbookSiteStreamingUploader do
-
-  describe "create_build_dir" do
-
-    before(:each) do
-      @cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, 'cookbooks'))
-      @loader = Chef::CookbookLoader.new(@cookbook_repo)
-      @loader.load_cookbooks
-      File.stub(:unlink).and_return()
-    end
-
-    it "should create the cookbook tmp dir" do
-      cookbook = @loader[:openldap]
-      files_count = Dir.glob(File.join(@cookbook_repo, cookbook.name.to_s, '**', '*'), File::FNM_DOTMATCH).count { |file| File.file?(file) }
-
-      Tempfile.should_receive(:new).with("chef-#{cookbook.name}-build").and_return(FakeTempfile.new("chef-#{cookbook.name}-build"))
-      FileUtils.should_receive(:mkdir_p).exactly(files_count + 1).times
-      FileUtils.should_receive(:cp).exactly(files_count).times
-      Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
-    end
-
-  end # create_build_dir
-
-  describe "make_request" do
-
-    before(:each) do
-      @uri = "http://cookbooks.dummy.com/api/v1/cookbooks"
-      @secret_filename = File.join(CHEF_SPEC_DATA, 'ssl/private_key.pem')
-      @rsa_key = File.read(@secret_filename)
-      response = Net::HTTPResponse.new('1.0', '200', 'OK')
-      Net::HTTP.any_instance.stub(:request).and_return(response)
-    end
-
-    it "should send an http request" do
-      Net::HTTP.any_instance.should_receive(:request)
-      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
-    end
-
-    it "should read the private key file" do
-      File.should_receive(:read).with(@secret_filename).and_return(@rsa_key)
-      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
-    end
-
-    it "should add the authentication signed header" do
-      Mixlib::Authentication::SigningObject.any_instance.should_receive(:sign).and_return({})
-      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
-    end
-
-    it "should be able to send post requests" do
-      post = Net::HTTP::Post.new(@uri, {})
-
-      Net::HTTP::Post.should_receive(:new).once.and_return(post)
-      Net::HTTP::Put.should_not_receive(:new)
-      Net::HTTP::Get.should_not_receive(:new)
-      Chef::CookbookSiteStreamingUploader.make_request(:post, @uri, 'bill', @secret_filename)
-    end
-
-    it "should be able to send put requests" do
-      put = Net::HTTP::Put.new(@uri, {})
-
-      Net::HTTP::Post.should_not_receive(:new)
-      Net::HTTP::Put.should_receive(:new).once.and_return(put)
-      Net::HTTP::Get.should_not_receive(:new)
-      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename)
-    end
-
-    it "should be able to receive files to attach as argument" do
-      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename, {
-        :myfile => File.new(File.join(CHEF_SPEC_DATA, 'config.rb')), # a dummy file
-      })
-    end
-
-    it "should be able to receive strings to attach as argument" do
-      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename, {
-        :mystring => 'Lorem ipsum',
-      })
-    end
-
-    it "should be able to receive strings and files as argument at the same time" do
-      Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, 'bill', @secret_filename, {
-        :myfile1 => File.new(File.join(CHEF_SPEC_DATA, 'config.rb')),
-        :mystring1 => 'Lorem ipsum',
-        :myfile2 => File.new(File.join(CHEF_SPEC_DATA, 'config.rb')),
-        :mystring2 => 'Dummy text',
-      })
-    end
-
-  end # make_request
-
-  describe "StreamPart" do
-    before(:each) do
-      @file = File.new(File.join(CHEF_SPEC_DATA, 'config.rb'))
-      @stream_part = Chef::CookbookSiteStreamingUploader::StreamPart.new(@file, File.size(@file))
-    end
-
-    it "should create a StreamPart" do
-      @stream_part.should be_instance_of(Chef::CookbookSiteStreamingUploader::StreamPart)
-    end
-
-    it "should expose its size" do
-      @stream_part.size.should eql(File.size(@file))
-    end
-
-    it "should read with offset and how_much" do
-      content = @file.read(4)
-      @file.rewind
-      @stream_part.read(0, 4).should eql(content)
-    end
-
-  end # StreamPart
-
-  describe "StringPart" do
-    before(:each) do
-      @str = 'What a boring string'
-      @string_part = Chef::CookbookSiteStreamingUploader::StringPart.new(@str)
-    end
-
-    it "should create a StringPart" do
-      @string_part.should be_instance_of(Chef::CookbookSiteStreamingUploader::StringPart)
-    end
-
-    it "should expose its size" do
-      @string_part.size.should eql(@str.size)
-    end
-
-    it "should read with offset and how_much" do
-      @string_part.read(2, 4).should eql(@str[2, 4])
-    end
-
-  end # StringPart
-
-  describe "MultipartStream" do
-    before(:each) do
-      @string1 = "stream1"
-      @string2 = "stream2"
-      @stream1 = Chef::CookbookSiteStreamingUploader::StringPart.new(@string1)
-      @stream2 = Chef::CookbookSiteStreamingUploader::StringPart.new(@string2)
-      @parts = [ @stream1, @stream2 ]
-
-      @multipart_stream = Chef::CookbookSiteStreamingUploader::MultipartStream.new(@parts)
-    end
-
-    it "should create a MultipartStream" do
-      @multipart_stream.should be_instance_of(Chef::CookbookSiteStreamingUploader::MultipartStream)
-    end
-
-    it "should expose its size" do
-      @multipart_stream.size.should eql(@stream1.size + @stream2.size)
-    end
-
-    it "should read with how_much" do
-      @multipart_stream.read(10).should eql("#{@string1}#{@string2}"[0, 10])
-    end
-
-    it "should read receiving destination buffer as second argument (CHEF-4456: Ruby 2 compat)" do
-      dst_buf = ''
-      @multipart_stream.read(10, dst_buf)
-      dst_buf.should eql("#{@string1}#{@string2}"[0, 10])
-    end
-
-  end # MultipartStream
-
-end
-