rollbar 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05a8983a4b7621ec27fb68f6a8181357f709f5b
-  data.tar.gz: cad9b0ab2cf6ca8a05dcda83aeff733e9c8ee6ad
+  metadata.gz: 8082846880731311ecb0f18a70e1beb6db7b186d
+  data.tar.gz: c9378f92930c2f40e13cfb587d52d392db3c6800
 SHA512:
-  metadata.gz: e63b34f583fd421501c41d60df6f597ee0acd7656704e251a42af46923450140e87759ac1414ff3d64cebe3e906ce2a45dfcd20e4f2ed0f6a6dd974dba01c8e4
-  data.tar.gz: a034f48d725e87bc5b7013698a5e30e78378fca32aa276558582c72885faafefddcce6442c8a663e6622f9830bbecf3080d220da2eaa1605057dedfb2d4d9f43
+  metadata.gz: b16682566ae76dd0ec673427e4e3eac2eec91e9ab87cf47c3803e683464a8dc82baa13c48ac2a94a96488bdcb829752c6ed9d267f480ed5b94b66aa0f8d37c65
+  data.tar.gz: ef469ba5168631c3a49a2f775f09e1d0e7c8f742eb7f122e7c47da8d26e8424cdd62da0317ec44cf17718ad9ac845dee12804df46acb331f11026e56f9696f25

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**0.11.4**
+- Respect different proxy headers when building the request url
+
 **0.11.3**
 - Make sure the environment is valid at item sending time so that it isn't set incorrectly during configuration
 

data/lib/rollbar/request_data_extractor.rb

@@ -52,12 +52,20 @@ module Rollbar
     end
 
     def rollbar_url(env)
-      scheme = env['rack.url_scheme']
-      host = env['HTTP_HOST'] || env['SERVER_NAME']
+      scheme = env['HTTP_X_FORWARDED_PROTO'] || env['rack.url_scheme']
+      
+      host = env['HTTP_X_FORWARDED_HOST'] || env['HTTP_HOST'] || env['SERVER_NAME']
       path = env['ORIGINAL_FULLPATH'] || env['REQUEST_URI']
       unless path.nil? || path.empty?
         path = '/' + path.to_s if path.to_s.slice(0, 1) != '/'
       end
+      
+      port = env['HTTP_X_FORWARDED_PORT']
+      if port && !(scheme.downcase == 'http' && port.to_i == 80) && \
+                 !(scheme.downcase == 'https' && port.to_i == 443) && \
+                 !(host.include? ':')
+        host = host + ':' + port
+      end
 
       [scheme, '://', host, path].join
     end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.11.3"
+  VERSION = "0.11.4"
 end

data/spec/controllers/home_controller_spec.rb

@@ -159,6 +159,34 @@ describe HomeController do
 
         controller.send(:rollbar_request_data)[:url].should == 'http://rollbar.com'
       end
+      
+      it "should respect forwarded host" do
+        req = controller.request
+        req.host = '127.0.0.1:8080'
+        req.env['HTTP_X_FORWARDED_HOST'] = 'test.com'
+
+        controller.send(:rollbar_request_data)[:url].should == 'http://test.com'
+      end
+      
+      it "should respect forwarded proto" do
+        req = controller.request
+        req.host = 'rollbar.com'
+        req.env['HTTP_X_FORWARDED_PROTO'] = 'https'
+
+        controller.send(:rollbar_request_data)[:url].should == 'https://rollbar.com'
+      end
+      
+      it "should respect forwarded port" do
+        req = controller.request
+        req.host = '127.0.0.1:8080'
+        req.env['HTTP_X_FORWARDED_HOST'] = 'test.com'
+        req.env['HTTP_X_FORWARDED_PORT'] = '80'
+
+        controller.send(:rollbar_request_data)[:url].should == 'http://test.com'
+        
+        req.env['HTTP_X_FORWARDED_PORT'] = '81'
+        controller.send(:rollbar_request_data)[:url].should == 'http://test.com:81'
+      end
     end
 
     context "rollbar_user_ip" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Brian Rue