rack-ssl-enforcer 0.1.1 → 0.1.2

data/README.rdoc

@@ -26,6 +26,10 @@ You might need the :redirect_to option if the requested URL can't be determined
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Thanks!
+
+* To {Dan Mayer}[http://github.com/danmayer] for making proxied ssl setups work
+
 == Copyright
 
 Copyright (c) 2010 Tobias Matthies. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rack-ssl-enforcer.rb

@@ -18,8 +18,8 @@ module Rack
     private
       
       def ssl_request?(env)
-        env['rack.url_scheme'] == 'https'
+        (env['HTTP_X_FORWARDED_PROTO'] || env['rack.url_scheme']) == 'https'
       end
  
   end
-end
+end

data/rack-ssl-enforcer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-ssl-enforcer}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Matthies"]
-  s.date = %q{2010-03-18}
+  s.date = %q{2010-07-30}
   s.email = %q{tm@mit2m.de}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tobmatth/rack-ssl-enforcer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple Rack middleware to enforce SSL}
   s.test_files = [
     "test/helper.rb",
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])

data/test/test_rack-ssl-enforcer.rb

@@ -21,12 +21,31 @@ class TestRackSslEnforcer < Test::Unit::TestCase
         assert_equal 301, response.status
         assert_equal response.location, 'https://www.example.org/'
       end
+
+      #heroku / etc do proxied SSL
+      #http://github.com/pivotal/refraction/issues/issue/2
+      should 'respect X-Forwarded-Proto header for proxied SSL' do
+        response = @request.get('http://www.example.org/',
+                                {'HTTP_X_FORWARDED_PROTO' => 'http',
+                                  'rack.url_scheme' => 'http'})
+        assert_equal 301, response.status
+        assert_equal response.location, 'https://www.example.org/'
+      end
       
       should 'respond not redirect ssl requests' do
         response = @request.get('https://www.example.org/', {})
         assert_equal 200, response.status
         assert_equal response.body, 'Hello world!'
       end
+
+      should 'respond not redirect ssl requests and respect X-Forwarded-Proto header for proxied SSL' do
+         response = @request.get('http://www.example.org/',
+                                {'HTTP_X_FORWARDED_PROTO' => 'https',
+                                  'rack.url_scheme' => 'http'})
+        assert_equal 200, response.status
+        assert_equal response.body, 'Hello world!'
+      end
+
     end
     
     context 'that has :redirect_to set' do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-ssl-enforcer
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tobias Matthies
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +01:00
+date: 2010-07-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -59,23 +62,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple Rack middleware to enforce SSL