#758: enable optional disabling of collecting X-Real-Ip and anonymization

Author: ArturMoczulski

lib/rollbar/request_data_extractor.rb

@@ -109,6 +109,10 @@ def rollbar_headers(env)
           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

spec/rollbar/request_data_extractor_spec.rb

@@ -147,6 +147,12 @@ class ExtractorDummy
           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
@@ -163,6 +169,12 @@ class ExtractorDummy
 
             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
@@ -181,6 +193,12 @@ class ExtractorDummy
 
             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
 
@@ -199,6 +217,12 @@ class ExtractorDummy
 
           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