airbrake 3.0.6 → 3.0.7

data/CHANGELOG

@@ -1,3 +1,9 @@
+Version 3.0.7 - Sun Dec 11 21:04:08 +0100 2011
+===============================================================================
+
+David Palm (1):
+      Adds a :use_system_ssl_cert_chain configuration option to allow use of the system default SSL chain (as opposed to the CAs bundled with Airbrake) - defaults to false
+
 Version 3.0.6 - Mon Dec 05 16:41:39 +0100 2011
 ===============================================================================
 
@@ -611,3 +617,4 @@ Nick Quaranto (3):
 
 
 
+

data/Rakefile

@@ -155,7 +155,9 @@ def run_rails_cucumbr_task(version, additional_cucumber_args)
     raise "No Rails version specified - make sure ENV['RAILS_VERSION'] is set, e.g. with `rake cucumber:rails:all`"
   end
   ENV['RAILS_VERSION'] = version
-  system("cucumber --format #{ENV['CUCUMBER_FORMAT'] || 'progress'} #{additional_cucumber_args} features/rails.feature features/rails_with_js_notifier.feature")
+  cmd   = "cucumber --format #{ENV['CUCUMBER_FORMAT'] || 'progress'} #{additional_cucumber_args} features/rails.feature features/rails_with_js_notifier.feature" 
+  puts "Running command: #{cmd}"
+  system(cmd)
 end
 
 def define_rails_cucumber_tasks(additional_cucumber_args = '')

data/lib/airbrake/configuration.rb

@@ -7,8 +7,8 @@ module Airbrake
         :http_open_timeout, :http_read_timeout, :ignore, :ignore_by_filters,
         :ignore_user_agent, :notifier_name, :notifier_url, :notifier_version,
         :params_filters, :project_root, :port, :protocol, :proxy_host,
-        :proxy_pass, :proxy_port, :proxy_user, :secure, :framework,
-        :user_information, :rescue_rake_exceptions].freeze
+        :proxy_pass, :proxy_port, :proxy_user, :secure, :use_system_ssl_cert_chain, 
+        :framework, :user_information, :rescue_rake_exceptions].freeze
 
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -22,6 +22,9 @@ module Airbrake
 
     # +true+ for https connections, +false+ for http connections.
     attr_accessor :secure
+    
+    # +true+ to use whatever CAs OpenSSL has installed on your system. +false+ to use the ca-bundle.crt file included in Airbrake itself (reccomended and default)
+    attr_accessor :use_system_ssl_cert_chain
 
     # The HTTP open timeout in seconds (defaults to 2).
     attr_accessor :http_open_timeout
@@ -123,6 +126,7 @@ module Airbrake
 
     def initialize
       @secure                   = false
+      @use_system_ssl_cert_chain= false
       @host                     = 'airbrake.io'
       @http_open_timeout        = 2
       @http_read_timeout        = 5

data/lib/airbrake/sender.rb

@@ -13,8 +13,18 @@ module Airbrake
                    Errno::ECONNREFUSED].freeze
 
     def initialize(options = {})
-      [:proxy_host, :proxy_port, :proxy_user, :proxy_pass, :protocol,
-        :host, :port, :secure, :http_open_timeout, :http_read_timeout].each do |option|
+      [ :proxy_host,
+        :proxy_port, 
+        :proxy_user, 
+        :proxy_pass, 
+        :protocol,
+        :host, 
+        :port, 
+        :secure, 
+        :use_system_ssl_cert_chain, 
+        :http_open_timeout, 
+        :http_read_timeout
+      ].each do |option|
         instance_variable_set("@#{option}", options[option])
       end
     end
@@ -55,10 +65,22 @@ module Airbrake
       File.expand_path(File.join("..", "..", "..", "resources", "ca-bundle.crt"), __FILE__)
     end
 
-    private
-
-    attr_reader :proxy_host, :proxy_port, :proxy_user, :proxy_pass, :protocol,
-      :host, :port, :secure, :http_open_timeout, :http_read_timeout
+    attr_reader :proxy_host,
+                :proxy_port,
+                :proxy_user,
+                :proxy_pass,
+                :protocol,
+                :host,
+                :port,
+                :secure,
+                :use_system_ssl_cert_chain,
+                :http_open_timeout,
+                :http_read_timeout
+
+    alias_method :secure?, :secure
+    alias_method :use_system_ssl_cert_chain?, :use_system_ssl_cert_chain
+    
+  private
 
     def url
       URI.parse("#{protocol}://#{host}:#{port}").merge(NOTICES_URI)
@@ -82,13 +104,13 @@ module Airbrake
       http.read_timeout = http_read_timeout
       http.open_timeout = http_open_timeout
 
-      if secure
+      if secure?
         http.use_ssl     = true
+        
         if File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE)
-          http.ca_file     = OpenSSL::X509::DEFAULT_CERT_FILE 
-        else
-          # ca-bundle.crt built from source, see resources/README.md
-          http.ca_file     = Sender.local_cert_path
+          http.ca_file     = OpenSSL::X509::DEFAULT_CERT_FILE      
+        elsif !use_system_ssl_cert_chain?
+          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
       else

data/lib/airbrake/version.rb

@@ -1,3 +1,3 @@
 module Airbrake
-  VERSION = "3.0.6".freeze
+  VERSION = '3.0.7'
 end

data/test/sender_test.rb

@@ -9,7 +9,7 @@ class SenderTest < Test::Unit::TestCase
   def build_sender(opts = {})
     config = Airbrake::Configuration.new
     opts.each {|opt, value| config.send(:"#{opt}=", value) }
-    Airbrake::Sender.new(config)
+    sender = Airbrake::Sender.new(config)
   end
 
   def send_exception(args = {})
@@ -173,6 +173,16 @@ class SenderTest < Test::Unit::TestCase
       assert_equal(OpenSSL::SSL::VERIFY_PEER,        real_http.verify_mode)
       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)
+      sender = Airbrake::Sender.new(config)
+
+      assert(sender.use_system_ssl_cert_chain?)
+
+      http    = sender.send(:setup_http_connection)
+      assert_not_equal http.ca_file, Airbrake::Sender.local_cert_path
+    end
 
     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}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: airbrake
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 0
-  - 6
-  version: 3.0.6
+  - 7
+  version: 3.0.7
 platform: ruby
 authors: 
 - thoughtbot, inc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 Z
+date: 2011-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder