rollbar 2.16.2 → 2.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef98d47074226584e6ee894d82f5a3d0c73664c9
-  data.tar.gz: c01e80f38136f5397bb1c585fa8d31c803dee8cd
+  metadata.gz: b5cd5a741817deee8eeed5a026529a556fe4c1a1
+  data.tar.gz: 5aa9b0225c05b77c2d8d97c273293806658a4d6c
 SHA512:
-  metadata.gz: 25a0bcec30eef59e718bad1d5857612c8938df5be9afec3b7c20251f93d11abd50f265ef1284f249202eec9d308a01ae867c737e83c86451e7bd0af717a34b71
-  data.tar.gz: a0958ba5221c0184067b90e5aff2aa160c97d607084984a405f63542701cca7a548dc72aec5e713b613e532d3a17d28acfc65cac08cac05d85a5a655391caa03
+  metadata.gz: ce8a7f469fb9d0526e6f7829c3488442984aff359a8672ad86cfc120f1ef356ad7367ce496128cb77de50160bb4e55acb6f33a95ca280e41608eb34b2d3adc68
+  data.tar.gz: d2038279771ebbf00af8674e3e8c2fc14960adac93364c5b76ce81b2ad9688d59e588a5ea1e470a40e90c9b7533749fb2f5400dfec8754f30b38ae09f40bbc09

data/Gemfile

@@ -42,5 +42,6 @@ gem 'redis'
 gem 'resque'
 gem 'shoryuken'
 gem 'sinatra'
+gem 'byebug'
 
 gemspec

data/lib/rollbar/notifier.rb

@@ -530,14 +530,15 @@ module Rollbar
     end
 
     def proxy_from_config
-      proxy = configuration.proxy
-      return nil unless proxy
-
-      px = URI.parse(proxy[:host])
-      px.port = proxy[:port]
-      px.user = proxy[:user]
-      px.password = proxy[:password]
-      px
+      proxy_settings = configuration.proxy
+      return nil unless proxy_settings
+
+      proxy = null_proxy
+      proxy.host = URI.parse(proxy_settings[:host]).host
+      proxy.port = proxy_settings[:port]
+      proxy.user = proxy_settings[:user]
+      proxy.password = proxy_settings[:password]
+      proxy
     end
 
     def proxy_from_env(uri)

data/lib/rollbar/request_data_extractor.rb

@@ -105,6 +105,14 @@ module Rollbar
           { name => Rollbar::Scrubbers.scrub_value(env[header]) }
         elsif name == 'X-Forwarded-For' && !Rollbar.configuration.collect_user_ip
           {}
+        elsif name == 'X-Forwarded-For' && Rollbar.configuration.collect_user_ip && Rollbar.configuration.anonymize_user_ip
+          ips = env[header].sub(" ", "").split(',')
+          ips = ips.map { |ip| Rollbar::Util::IPAnonymizer.anonymize_ip(ip) }
+          { name => ips.join(', ') }
+        elsif name == 'X-Real-Ip' && !Rollbar.configuration.collect_user_ip
+          {}
+        elsif name == 'X-Real-Ip' && Rollbar.configuration.collect_user_ip && Rollbar.configuration.anonymize_user_ip
+          { name => Rollbar::Util::IPAnonymizer.anonymize_ip(env[header]) }
         else
           { name => env[header] }
         end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.16.2'
+  VERSION = '2.16.3'
 end

data/spec/rollbar/request_data_extractor_spec.rb

@@ -118,11 +118,12 @@ describe Rollbar::RequestDataExtractor do
       end
     end
 
-    context 'with multiple addresses in X-Forwarded-For' do
+    context 'with multiple IP addresses in headers and in user ip' do
       let(:env) do
         Rack::MockRequest.env_for('/',
                                   'HTTP_HOST' => 'localhost:81',
-                                  'HTTP_X_FORWARDED_FOR' => header_value,
+                                  'HTTP_X_FORWARDED_FOR' => x_forwarded_for,
+                                  'HTTP_X_REAL_IP' => x_real_ip,
                                   'REMOTE_ADDR' => '3.3.3.3',
                                   'CONTENT_TYPE' => 'application/json',
                                   'CONTENT_LENGTH' => 20)
@@ -131,7 +132,8 @@ describe Rollbar::RequestDataExtractor do
       end
 
       context 'with public client IP' do
-        let(:header_value) { '2.2.2.2, 3.3.3.3' }
+        let(:x_forwarded_for) { '2.2.2.2, 3.3.3.3' }
+        let(:x_real_ip) { '2.2.2.2' }
 
         it 'extracts the correct user IP' do
           result = subject.extract_request_data_from_rack(env)
@@ -139,6 +141,18 @@ describe Rollbar::RequestDataExtractor do
           expect(result[:user_ip]).to be_eql('2.2.2.2')
         end
         
+        it 'extracts the correct X-Forwarded-For' do
+          result = subject.extract_request_data_from_rack(env)
+
+          expect(result[:headers]['X-Forwarded-For']).to be_eql('2.2.2.2, 3.3.3.3')
+        end
+        
+        it 'extracts the correct X-Real-Ip' do
+          result = subject.extract_request_data_from_rack(env)
+
+          expect(result[:headers]['X-Real-Ip']).to be_eql('2.2.2.2')
+        end
+        
         context 'with collect_user_ip configuration option disabled' do
           before do
             Rollbar.configuration.collect_user_ip = false
@@ -155,6 +169,12 @@ describe Rollbar::RequestDataExtractor do
 
             expect(result[:headers]['X-Forwarded-For']).to be_nil
           end
+        
+          it 'does not extract user\'s IP on X-Real-Ip header' do
+            result = subject.extract_request_data_from_rack(env)
+  
+            expect(result[:headers]['X-Real-Ip']).to be_nil
+          end
         end
         
         context 'with anonymize_user_ip configuration option enabled' do
@@ -167,17 +187,42 @@ describe Rollbar::RequestDataExtractor do
   
             expect(result[:user_ip]).to be_eql('2.2.2.0')
           end
+          
+          it 'it anonymizes IP addresses in X-Forwarded-For' do
+            result = subject.extract_request_data_from_rack(env)
+  
+            expect(result[:headers]['X-Forwarded-For']).to be_eql('2.2.2.0, 3.3.3.0')
+          end
+          
+          it 'it anonymizes IP addresses in X-Real-Ip' do
+            result = subject.extract_request_data_from_rack(env)
+  
+            expect(result[:headers]['X-Real-Ip']).to be_eql('2.2.2.0')
+          end
         end
       end
 
       context 'with private first client IP' do
-        let(:header_value) { '192.168.1.1, 2.2.2.2, 3.3.3.3' }
+        let(:x_forwarded_for) { '192.168.1.1, 2.2.2.2, 3.3.3.3' }
+        let(:x_real_ip) { '2.2.2.2' }
 
         it 'extracts the correct user IP' do
           result = subject.extract_request_data_from_rack(env)
 
           expect(result[:user_ip]).to be_eql('2.2.2.2')
         end
+        
+        it 'extracts the correct X-Forwarded-For' do
+          result = subject.extract_request_data_from_rack(env)
+
+          expect(result[:headers]['X-Forwarded-For']).to be_eql('192.168.1.1, 2.2.2.2, 3.3.3.3')
+        end
+        
+        it 'extracts the correct X-Real-Ip' do
+          result = subject.extract_request_data_from_rack(env)
+
+          expect(result[:headers]['X-Real-Ip']).to be_eql('2.2.2.2')
+        end
       end
     end
 

data/spec/rollbar_spec.rb

@@ -1043,18 +1043,20 @@ describe Rollbar do
     end
 
     context 'via environment variables' do
+      before do
+        @uri = URI.parse(Rollbar::Configuration::DEFAULT_ENDPOINT)
+      end
+
       it 'honors proxy settings in the environment' do
         ENV['http_proxy']  = 'http://user:pass@example.com:80'
         ENV['https_proxy'] = 'http://user:pass@example.com:80'
 
-        uri = URI.parse(Rollbar::Configuration::DEFAULT_ENDPOINT)
-        expect(Net::HTTP).to receive(:new).with(uri.host, uri.port, 'example.com', 80, 'user', 'pass').and_call_original
+        expect(Net::HTTP).to receive(:new).with(@uri.host, @uri.port, 'example.com', 80, 'user', 'pass').and_call_original
         Rollbar.info("proxy this")
       end
 
       it 'does not use a proxy if no proxy settings in environemnt' do
-        uri = URI.parse(Rollbar::Configuration::DEFAULT_ENDPOINT)
-        expect(Net::HTTP).to receive(:new).with(uri.host, uri.port, nil, nil, nil, nil).and_call_original
+        expect(Net::HTTP).to receive(:new).with(@uri.host, @uri.port, nil, nil, nil, nil).and_call_original
         Rollbar.info("proxy this")
       end
     end
@@ -1069,11 +1071,12 @@ describe Rollbar do
             :password => 'bar'
           }
         end
+
+        @uri = URI.parse(Rollbar::Configuration::DEFAULT_ENDPOINT)
       end
 
       it 'honors proxy settings in the config file' do
-        uri = URI.parse(Rollbar::Configuration::DEFAULT_ENDPOINT)
-        expect(Net::HTTP).to receive(:new).with(uri.host, uri.port, 'config.com', 8080, 'foo', 'bar').and_call_original
+        expect(Net::HTTP).to receive(:new).with(@uri.host, @uri.port, 'config.com', 8080, 'foo', 'bar').and_call_original
         Rollbar.info("proxy this")
       end
 
@@ -1081,8 +1084,16 @@ describe Rollbar do
         ENV['http_proxy']  = 'http://user:pass@example.com:80'
         ENV['https_proxy'] = 'http://user:pass@example.com:80'
 
-        uri = URI.parse(Rollbar::Configuration::DEFAULT_ENDPOINT)
-        expect(Net::HTTP).to receive(:new).with(uri.host, uri.port, 'config.com', 8080, 'foo', 'bar').and_call_original
+        expect(Net::HTTP).to receive(:new).with(@uri.host, @uri.port, 'config.com', 8080, 'foo', 'bar').and_call_original
+        Rollbar.info("proxy this")
+      end
+
+      it 'allows @-signs in passwords' do
+        Rollbar.configure do |config|
+          config.proxy[:password] = "manh@tan"
+	end
+
+        expect(Net::HTTP).to receive(:new).with(@uri.host, @uri.port, 'config.com', 8080, 'foo', 'manh@tan').and_call_original
         Rollbar.info("proxy this")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.16.2
+  version: 2.16.3
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar