omniauth 1.1.2 → 1.1.3

data/README.md

@@ -2,7 +2,7 @@
 [![Gem Version](https://badge.fury.io/rb/omniauth.png)][gem]
 [![CI Build Status](https://secure.travis-ci.org/intridea/omniauth.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/intridea/omniauth.png?travis)][gemnasium]
-[![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
+[![Code Climate](https://codeclimate.com/github/intridea/omniauth.png)][codeclimate]
 
 [gem]: https://rubygems.org/gems/omniauth
 [travis]: http://travis-ci.org/intridea/omniauth
@@ -158,22 +158,7 @@ Constraint][pvc] with two digits of precision. For example:
 [pvc]: http://docs.rubygems.org/read/chapter/16#page74
 
 ## License
-Copyright (c) 2010-2013 Michael Bleigh and Intridea, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright (c) 2010-2013 Michael Bleigh and Intridea, Inc. See [LICENSE][] for
+details.
+
+[license]: LICENSE.md

data/lib/omniauth/strategy.rb

@@ -403,9 +403,8 @@ module OmniAuth
         else
           uri = URI.parse(request.url.gsub(/\?.*$/,''))
           uri.path = ''
-          uri.query = nil
           #sometimes the url is actually showing http inside rails because the other layers (like nginx) have handled the ssl termination.
-          uri.scheme = 'https' if request.ssl?
+          uri.scheme = 'https' if ssl?
           uri.to_s
       end
     end
@@ -466,5 +465,12 @@ module OmniAuth
     def merge_stack(stack)
       stack.inject({}){|c,h| c.merge!(h); c}
     end
+    def ssl?
+      request.env['HTTPS'] == 'on' ||
+      request.env['HTTP_X_FORWARDED_SSL'] == 'on' ||
+      request.env['HTTP_X_FORWARDED_SCHEME'] == 'https' ||
+      (request.env['HTTP_X_FORWARDED_PROTO'] && request.env['HTTP_X_FORWARDED_PROTO'].split(',')[0] == 'https') ||
+      request.env['rack.url_scheme'] == 'https'
+    end
   end
 end

data/lib/omniauth/version.rb

@@ -1,3 +1,3 @@
 module OmniAuth
-  VERSION = "1.1.2" unless defined?(OmniAuth::VERSION)
+  VERSION = "1.1.3" unless defined?(OmniAuth::VERSION)
 end

data/omniauth.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors       = ['Michael Bleigh', 'Erik Michaels-Ober']
-  spec.cert_chain    = ['certs/sferik.pem']
+  spec.cert_chain    = %w(certs/sferik.pem)
   spec.description   = %q{A generalized Rack framework for multiple-provider authentication.}
   spec.email         = ['michael@intridea.com', 'sferik@gmail.com']
   spec.files         = %w(.yardopts LICENSE.md README.md Rakefile omniauth.gemspec)

data/spec/omniauth/strategy_spec.rb

@@ -607,6 +607,18 @@ describe OmniAuth::Strategy do
         expect(strategy.full_host).to eq('my.host.net')
       end
 
+      it "is based on the request if it's not a string nor a proc" do
+        OmniAuth.config.full_host = nil
+        strategy.call(make_env('/whatever', 'rack.url_scheme' => 'http', 'SERVER_NAME' => 'my.host.net', 'SERVER_PORT' => 80))
+        expect(strategy.full_host).to eq('http://my.host.net')
+      end
+
+      it "should honor HTTP_X_FORWARDED_PROTO if present" do
+        OmniAuth.config.full_host = nil
+        strategy.call(make_env('/whatever', 'HTTP_X_FORWARDED_PROTO' => 'https','rack.url_scheme' => 'http', 'SERVER_NAME' => 'my.host.net', 'SERVER_PORT' => 443))
+        expect(strategy.full_host).to eq('https://my.host.net')
+      end
+
       after do
         OmniAuth.config.test_mode = false
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -154,3 +154,4 @@ test_files:
 - spec/omniauth/strategy_spec.rb
 - spec/omniauth_spec.rb
 - spec/spec_helper.rb
+has_rdoc: