rack-wwwhisper 1.1.0 → 1.1.1

data/lib/rack/wwwhisper.rb

@@ -58,9 +58,9 @@ class WWWhisper
   @@AUTH_COOKIES_PREFIX = 'wwwhisper'
   # Headers that are passed to wwwhisper ('Cookie' is handled
   # in a special way: only wwwhisper related cookies are passed).
-  # In addition, the original Host header is passed as X-Forwarded-Host.
+  # In addition, the current site url is passed in the Site-Url header.
   @@FORWARDED_HEADERS = ['Accept', 'Accept-Language', 'Cookie', 'Origin',
-                         'X-CSRFToken', 'X-Forwarded-Proto', 'X-Requested-With']
+                         'X-CSRFToken', 'X-Requested-With']
   @@DEFAULT_IFRAME = \
 %Q[<iframe id="wwwhisper-iframe" src="%s" width="340" height="29"
  frameborder="0" scrolling="no" style="position:fixed; overflow:hidden;
@@ -177,8 +177,8 @@ class WWWhisper
   def sub_request_init(rack_req, method, path)
     sub_req = Net::HTTP.const_get(method).new(path)
     copy_headers(rack_req.env, sub_req)
-    sub_req['X-Forwarded-Host'] = rack_req.env['HTTP_HOST']
-    sub_req['X-Forwarded-Proto'] ||=  rack_req.scheme
+    scheme = rack_req.env['HTTP_X_FORWARDED_PROTO'] ||=  rack_req.scheme
+    sub_req['Site-Url'] = "#{scheme}://#{rack_req.env['HTTP_HOST']}"
     if @wwwhisper_uri.user and @wwwhisper_uri.password
       sub_req.basic_auth(@wwwhisper_uri.user, @wwwhisper_uri.password)
     end

data/test/test_wwwhisper.rb

@@ -260,21 +260,17 @@ class TestWWWhisper < Test::Unit::TestCase
     assert_equal 'invalid request', last_response.body
   end
 
-  def test_x_forwarded_headers
+  def test_site_url
     path = '/wwwhisper/admin/index.html'
 
     # X-Forwarded headers must be sent to wwwhisper backend.
     stub_request(:get, full_url(@wwwhisper.auth_query(path))).
       with(:headers => {
-             'X-Forwarded-Host' => SITE_HOST,
-             'X-Forwarded-Proto' => SITE_PROTO,
+             'Site-url' =>  "#{SITE_PROTO}://#{SITE_HOST}"
            }).
       to_return(granted())
     stub_request(:get, full_url(path)).
-      with(:headers => {
-             'X-Forwarded-Host' => SITE_HOST,
-             'X-Forwarded-Proto' => SITE_PROTO,
-           }).
+      with(:headers => {'Site-url' =>  "#{SITE_PROTO}://#{SITE_HOST}"}).
       to_return(:status => 200, :body => 'Admin page', :headers => {})
 
     get path
@@ -290,7 +286,7 @@ class TestWWWhisper < Test::Unit::TestCase
     host = 'localhost:5000'
     stub_request(:get, full_url(@wwwhisper.auth_query(path))).
       # Test makes sure that port is not repeated in Site-Url.
-      with(:headers => {'X-Forwarded-Host' => host}).
+      with(:headers => {'Site-Url' => "#{SITE_PROTO}://#{host}"}).
       to_return(:status => 401, :body => 'Login required', :headers => {})
 
     get(path, {}, {'HTTP_HOST' => host})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-wwwhisper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3463097767127012702
+      hash: -3079132124466735415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3463097767127012702
+      hash: -3079132124466735415
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24