airbrake 3.0.7 → 3.0.8

data/CHANGELOG

@@ -1,3 +1,9 @@
+Version 3.0.8 - Sun Dec 11 22:14:18 +0100 2011
+===============================================================================
+
+David Palm (15):
+      Use OpenSSL::X509::DEFAULT_CERT_FILE to connect only if configured to by setting use_system_ssl_cert_chain to true
+
 Version 3.0.7 - Sun Dec 11 21:04:08 +0100 2011
 ===============================================================================
 
@@ -618,3 +624,4 @@ Nick Quaranto (3):
 
 
 
+

data/lib/airbrake/sender.rb

@@ -106,10 +106,10 @@ module Airbrake
 
       if secure?
         http.use_ssl     = true
-        
-        if File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE)
-          http.ca_file     = OpenSSL::X509::DEFAULT_CERT_FILE      
-        elsif !use_system_ssl_cert_chain?
+
+        if use_system_ssl_cert_chain? && File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE)
+          http.ca_file     = OpenSSL::X509::DEFAULT_CERT_FILE
+        else
           http.ca_file     = Sender.local_cert_path # ca-bundle.crt built from source, see resources/README.md
         end
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/lib/airbrake/version.rb

@@ -1,3 +1,3 @@
 module Airbrake
-  VERSION = '3.0.7'
+  VERSION = '3.0.8'
 end

data/test/sender_test.rb

@@ -174,8 +174,9 @@ class SenderTest < Test::Unit::TestCase
       assert_equal(Airbrake::Sender.local_cert_path, real_http.ca_file)
     end
     
-    should "use the system CAs if asked to" do
-      config = Airbrake::Configuration.new(:use_system_ssl_cert_chain => true)
+    should "use the default DEFAULT_CERT_FILE if asked to" do
+      config = Airbrake::Configuration.new
+      config.use_system_ssl_cert_chain = true
       sender = Airbrake::Sender.new(config)
 
       assert(sender.use_system_ssl_cert_chain?)
@@ -183,23 +184,27 @@ class SenderTest < Test::Unit::TestCase
       http    = sender.send(:setup_http_connection)
       assert_not_equal http.ca_file, Airbrake::Sender.local_cert_path
     end
+    
+    should "verify the connection when the use_ssl option is set (VERIFY_PEER)" do
+      sender  = build_sender(:secure => true)
+      http    = sender.send(:setup_http_connection)
+      assert_equal(OpenSSL::SSL::VERIFY_PEER, http.verify_mode)
+    end
+    
+    should "use the default cert (OpenSSL::X509::DEFAULT_CERT_FILE) only if explicitly told to" do
+      sender  = build_sender(:secure => true)
+      http    = sender.send(:setup_http_connection)
+      
+      assert_equal(Airbrake::Sender.local_cert_path, http.ca_file)
 
-    should "verify the SSL peer when the use_ssl option is set to true and the default cert exists" do
-      url = "https://airbrake.io#{Airbrake::Sender::NOTICES_URI}"
-      uri = URI.parse(url)
-
-      real_http = Net::HTTP.new(uri.host, uri.port)
-      real_http.stubs(:post => nil)
-      proxy = stub(:new => real_http)
-      Net::HTTP.stubs(:Proxy => proxy)
       File.stubs(:exist?).with(OpenSSL::X509::DEFAULT_CERT_FILE).returns(true)
-
-      send_exception(:secure => true)
-      assert(real_http.use_ssl?)
-      assert_equal(OpenSSL::SSL::VERIFY_PEER,        real_http.verify_mode)
-      assert_equal(OpenSSL::X509::DEFAULT_CERT_FILE, real_http.ca_file)
+      sender  = build_sender(:secure => true, :use_system_ssl_cert_chain => true)
+      http    = sender.send(:setup_http_connection)
+      
+      assert_not_equal(Airbrake::Sender.local_cert_path, http.ca_file)
+      assert_equal(OpenSSL::X509::DEFAULT_CERT_FILE, http.ca_file)
     end
-    
+
     should "connect to the right port for ssl" do
       stub_http
       send_exception(:secure => true)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: airbrake
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 3
   - 0
-  - 7
-  version: 3.0.7
+  - 8
+  version: 3.0.8
 platform: ruby
 authors: 
 - thoughtbot, inc