rollbar 2.27.1 → 3.1.2

data/lib/rollbar/configuration.rb

@@ -75,6 +75,7 @@ module Rollbar
     attr_accessor :files_processed_enabled
     attr_accessor :files_processed_duration # seconds
     attr_accessor :files_processed_size # bytes
+    attr_accessor :use_payload_access_token
 
     attr_reader :project_gem_paths
     attr_accessor :configured_options
@@ -85,8 +86,10 @@ module Rollbar
     DEFAULT_WEB_BASE = 'https://rollbar.com'.freeze
 
     def initialize
+      @access_token = nil
       @async_handler = nil
       @before_process = []
+      @branch = nil
       @capture_uncaught = nil
       @code_version = nil
       @custom_data_method = nil
@@ -110,6 +113,7 @@ module Rollbar
       @failover_handlers = []
       @framework = 'Plain'
       @ignored_person_ids = []
+      @host = nil
       @payload_options = {}
       @person_method = 'current_user'
       @person_id_method = 'id'
@@ -121,6 +125,7 @@ module Rollbar
       @open_timeout = 3
       @request_timeout = 3
       @net_retries = 3
+      @root = nil
       @js_enabled = false
       @js_options = {}
       @locals = {}
@@ -150,6 +155,7 @@ module Rollbar
       @log_payload = false
       @collect_user_ip = true
       @anonymize_user_ip = false
+      @user_ip_obfuscator_secret = nil
       @backtrace_cleaner = nil
       @hooks = {
         :on_error_response => nil, # params: response
@@ -157,10 +163,12 @@ module Rollbar
       }
 
       @write_to_file = false
+      @filepath = nil
       @files_with_pid_name_enabled = false
       @files_processed_enabled = false
       @files_processed_duration = 60
       @files_processed_size = 5 * 1000 * 1000
+      @use_payload_access_token = false
 
       @configured_options = ConfiguredOptions.new(self)
     end

data/lib/rollbar/item.rb

@@ -40,7 +40,7 @@ module Rollbar
     class << self
       def build_with(payload, options = {})
         new(options).tap do |item|
-          item.payload = payload
+          item.payload = item.add_access_token_to_payload(payload)
         end
       end
     end
@@ -64,9 +64,7 @@ module Rollbar
 
     def build
       data = build_data
-      self.payload = {
-        'data' => data
-      }
+      self.payload = add_access_token_to_payload({'data' => data})
 
       enforce_valid_utf8
       transform
@@ -166,6 +164,21 @@ module Rollbar
       configuration.ignored_person_ids.include?(person_id)
     end
 
+    def add_access_token_to_payload(payload)
+      # Some use cases remain where the token is needed in the payload. For example:
+      #
+      # When using async senders, if the access token is changed dynamically in
+      # the main process config, the sender process won't see that change.
+      #
+      # Until the delayed sender interface is changed to allow passing dynamic config options,
+      # this workaround allows the main process to set the token by adding it to the payload.
+      if (configuration && configuration.use_payload_access_token)
+        payload['access_token'] ||= configuration.access_token
+      end
+
+      payload
+    end
+
     private
 
     def build_environment

data/lib/rollbar/item/locals.rb

@@ -1,4 +1,3 @@
-require 'rollbar/notifier'
 require 'rollbar/scrubbers/params'
 require 'rollbar/util'
 

data/lib/rollbar/language_support.rb

@@ -10,10 +10,6 @@ module Rollbar
       mod.const_get(target, inherit)
     end
 
-    def ruby_19?
-      version?('1.9')
-    end
-
     def version?(version)
       numbers = version.split('.')
 
@@ -21,8 +17,6 @@ module Rollbar
     end
 
     def timeout_exceptions
-      return [] if ruby_19?
-
       [Net::ReadTimeout, Net::OpenTimeout]
     end
   end

data/lib/rollbar/lazy_store.rb

@@ -41,8 +41,6 @@ module Rollbar
       raw[key] = value
 
       loaded_data.delete(key)
-
-      value
     end
 
     def data
@@ -76,8 +74,8 @@ module Rollbar
       super
     end
 
-    def respond_to?(method_sym)
-      super || raw.respond_to?(method_sym)
+    def respond_to_missing?(method_sym, include_all)
+      raw.respond_to?(method_sym, include_all)
     end
   end
 end

data/lib/rollbar/middleware/js.rb

@@ -183,7 +183,6 @@ module Rollbar
         req.respond_to?(:content_security_policy) &&
           req.content_security_policy &&
           req.content_security_policy.directives['script-src'] &&
-          !req.content_security_policy.directives['script-src'].include?("'unsafe-inline'") &&
           req.content_security_policy_nonce
       end
 
@@ -224,16 +223,12 @@ module Rollbar
         end
 
         def csp_needs_nonce?(csp)
-          !opt_out?(csp) && !unsafe_inline?(csp)
+          !opt_out?(csp)
         end
 
         def opt_out?(_csp)
           raise NotImplementedError
         end
-
-        def unsafe_inline?(csp)
-          csp[:script_src].to_a.include?("'unsafe-inline'")
-        end
       end
 
       class SecureHeadersFalse < SecureHeadersResolver

data/lib/rollbar/notifier.rb

@@ -640,7 +640,11 @@ module Rollbar
       request = Net::HTTP::Post.new(uri.request_uri)
 
       request.body = pack_ruby260_bytes(body)
-      request.add_field('X-Rollbar-Access-Token', access_token)
+
+      # Ensure the payload token will be used if the option is set.
+      unless (configuration.use_payload_access_token)
+        request.add_field('X-Rollbar-Access-Token', access_token)
+      end
 
       handle_net_retries { http.request(request) }
     end
@@ -698,8 +702,6 @@ module Rollbar
     end
 
     def handle_net_retries
-      return yield if skip_retries?
-
       retries = configuration.net_retries - 1
 
       begin
@@ -713,10 +715,6 @@ module Rollbar
       end
     end
 
-    def skip_retries?
-      Rollbar::LanguageSupport.ruby_19?
-    end
-
     def handle_response(response)
       if response.code == '200'
         log_info '[Rollbar] Success'

data/lib/rollbar/plugins/thread.rb

@@ -1,13 +1,14 @@
 Rollbar.plugins.define('thread') do
-  execute do
-    Thread.class_eval do
-      def initialize_with_rollbar(*args, &block)
+  module Rollbar
+    module ThreadPlugin
+      def initialize(*args)
         self[:_rollbar_notifier] ||= Rollbar.notifier.scope
-        initialize_without_rollbar(*args, &block)
+        super
       end
-
-      alias_method :initialize_without_rollbar, :initialize
-      alias_method :initialize, :initialize_with_rollbar
     end
   end
+
+  execute do
+    Thread.send(:prepend, Rollbar::ThreadPlugin) # rubocop:disable Lint/SendWithMixinArgument
+  end
 end

data/lib/rollbar/scrubbers/url.rb

@@ -13,7 +13,7 @@ module Rollbar
       end
 
       def call(options = {})
-        url = options[:url]
+        url = ascii_encode(options[:url])
 
         filter(url,
                build_regex(options[:scrub_fields]),
@@ -29,6 +29,20 @@ module Rollbar
 
       private
 
+      def ascii_encode(url)
+        # In some cases non-ascii characters won't be properly encoded, so we do it here.
+        #
+        # The standard encoders (the CGI and URI methods) are not reliable when the query string
+        # is already embedded in the full URL, but the inconsistencies are limited to issues
+        # with characters in the ascii range. (For example, the '#' if it appears in an unexpected place.)
+        # For escaping non-ascii, they are all OK, so we'll take care to skip the ascii chars.
+
+        return url if url.ascii_only?
+
+        # Iterate each char and only escape non-ascii characters.
+        url.each_char.map { |c| c.ascii_only? ? c : CGI.escape(c) }.join
+      end
+
       def build_whitelist_regex(whitelist)
         fields = whitelist.find_all { |f| f.is_a?(String) || f.is_a?(Symbol) }
         return unless fields.any?

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.27.1'.freeze
+  VERSION = '3.1.2'.freeze
 end

data/rollbar.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.files        += ['spec/support/rollbar_api.rb'] # useful helper for app spec/tests.
   gem.name          = 'rollbar'
   gem.require_paths = ['lib']
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.0.0'
   gem.version = Rollbar::VERSION
 
   if gem.respond_to?(:metadata)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.27.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies: []
 description: Easy and powerful exception tracking for Ruby
 email:
@@ -20,10 +20,10 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".github/pull_request_template.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -47,6 +47,7 @@ files:
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
 - lib/generators/rollbar/templates/initializer.rb
 - lib/rails/rollbar_runner.rb
@@ -153,14 +154,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar

data/.travis.yml

@@ -1,284 +0,0 @@
-sudo: false
-dist: trusty
-services:
-  - redis-server
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.2
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.5
-  - 2.7.0
-  - rbx
-  # Travis's own rvm installer is failing on JRuby builds, TODO: reenable when fixed.
-  # - jruby-9.1.9.0
-
-  #
-  # # About legacy JRuby
-  #
-  # Legacy JRubies (jruby-18mode, jruby-19mode) have been disabled for some time by
-  # listing all possible targets in either the exclude or allow_failures sections.
-  # I have taken a look at getting them running, and have found that no valid
-  # combination of dependencies is possible for Rails 3.0 and higher. It appears
-  # Rails 2.2 is meant to work, though I haven't tried it.
-  #
-  # For Rails 3.0, it is possible to get a working bundle with all gem dependencies,
-  # but the JDBC adapter gem needs an earlier version of ActiveSupport, and it will
-  # fail at runtime.
-  #
-  # For Rails 3.1 and 3.2, Rack 1.3.x and higher require Ruby 2.x, while Rails 3.x will
-  # not accept any 1.2.x version of Rack. Even if this could be resolved, one would
-  # hit the above runtime issue amyway.
-  #
-  # # About current JRuby
-  #
-  # While current JRuby builds aim to be Ruby 2.5.x compatible, the JDBC adapter
-  # gem is constrained to only Rails 5.0, 5.1 and 5.2 at this time. (Old versions
-  # of the gem allow >= Rails 2.2, but in practice it will not work with Rails 3.0
-  # and higher because of the ActiveSupport issue described above.) For as long as
-  # the test suite relies on Rails and SqlLite, it is not possible to include
-  # earlier Rails for JRuby.
-
-jdk:
-  # These are the JDKs currently supported on Travis (Trusty - Ubuntu 14.04)
-  - openjdk7
-  - openjdk8
-  - oraclejdk8
-  - oraclejdk9
-gemfile:
-  - gemfiles/rails30.gemfile
-  - gemfiles/rails31.gemfile
-  - gemfiles/rails32.gemfile
-  - gemfiles/rails40.gemfile
-  - gemfiles/rails41.gemfile
-  - gemfiles/rails42.gemfile
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
-  - gemfiles/rails52.gemfile
-  - gemfiles/rails60.gemfile
-matrix:
-  include: []
-
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    # oraclejdk9 has a dependency issue that needs to be investigated
-    - jdk: oraclejdk9
-
-  exclude:
-    # Don't run tests for non-jruby environments with the JDK.
-    # NOTE: openjdk7 is missing from these exclusions so that Travis will run at least 1 build for the given rvm.
-    - rvm: 1.9.3
-      jdk: openjdk8
-    - rvm: 1.9.3
-      jdk: oraclejdk8
-    - rvm: 1.9.3
-      jdk: oraclejdk9
-    - rvm: 2.0.0
-      jdk: openjdk8
-    - rvm: 2.0.0
-      jdk: oraclejdk8
-    - rvm: 2.0.0
-      jdk: oraclejdk9
-    - rvm: 2.1.0
-      jdk: openjdk8
-    - rvm: 2.1.0
-      jdk: oraclejdk8
-    - rvm: 2.1.0
-      jdk: oraclejdk9
-    - rvm: 2.2.2
-      jdk: openjdk8
-    - rvm: 2.2.2
-      jdk: oraclejdk8
-    - rvm: 2.2.2
-      jdk: oraclejdk9
-    - rvm: 2.3.8
-      jdk: openjdk8
-    - rvm: 2.3.8
-      jdk: oraclejdk8
-    - rvm: 2.3.8
-      jdk: oraclejdk9
-    - rvm: 2.4.5
-      jdk: openjdk8
-    - rvm: 2.4.5
-      jdk: oraclejdk8
-    - rvm: 2.4.5
-      jdk: oraclejdk9
-    - rvm: 2.5.3
-      jdk: openjdk8
-    - rvm: 2.5.3
-      jdk: oraclejdk8
-    - rvm: 2.5.3
-      jdk: oraclejdk9
-    - rvm: 2.6.5
-      jdk: openjdk8
-    - rvm: 2.6.5
-      jdk: oraclejdk8
-    - rvm: 2.6.5
-      jdk: oraclejdk9
-    - rvm: 2.7.0
-      jdk: openjdk8
-    - rvm: 2.7.0
-      jdk: oraclejdk8
-    - rvm: 2.7.0
-      jdk: oraclejdk9
-
-    - rvm: ruby-head
-      jdk: openjdk8
-    - rvm: ruby-head
-      jdk: oraclejdk8
-    - rvm: ruby-head
-      jdk: oraclejdk9
-    - rvm: rbx
-      jdk: openjdk8
-    - rvm: rbx
-      jdk: oraclejdk8
-    - rvm: rbx
-      jdk: oraclejdk9
-
-    # Rails 6.x requires Ruby 2.5.0 or higher
-    - rvm: 2.2.2
-      gemfile: gemfiles/rails60.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails60.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails60.gemfile
-    # Rails 5.x requires Ruby 2.2.2 or higher
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails51.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails52.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails60.gemfile
-    # Rails 5.x requires Ruby 2.2.2 or higher
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails51.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails52.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails60.gemfile
-    # Rails 5.x requires Ruby 2.2.2 or higher
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails51.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails52.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails60.gemfile
-    # MRI 2.2.2 supports Rails 3.2.x and higher, except Rails 5.2.4 and higher*
-    # * ActionDispatch 5.2.4 uses Ruby 3.x safe navigation operator.
-    - rvm: 2.2.2
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.2.2
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.2.2
-      gemfile: gemfiles/rails52.gemfile
-    # MRI 2.3.x supports Rails 4.0.x and higher
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails41.gemfile
-    # MRI 2.4.x and higher (e.g. 2.5.x, 2.6.x, etc) supports Rails 4.2.8 and higher
-    # Rails lower than 4.2.8 is incompatible with Ruby 2.4 Integer class
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.5
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.6.5
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.6.5
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.6.5
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.6.5
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.6.5
-      gemfile: gemfiles/rails42.gemfile
-    # Rails 6.x tries to be compatible with Ruby 2.7, though
-    # it still throws a lot of warnings. No point testing earlier
-    # Rails with Ruby 2.7.
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails51.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails52.gemfile
-    # JRuby JDBC Adapter is only compatible with Rails >= 5.x
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails42.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails30.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails31.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails32.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails42.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails51.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails52.gemfile
-    - rvm: rbx
-      gemfile: gemfiles/rails60.gemfile