rack-openid 1.3.1 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ffa1c0c3b3e9d62ad033405c449ca5bbe6289734
+  data.tar.gz: fa39ead3431fa078dba08042948b0b45bd681a46
+SHA512:
+  metadata.gz: ffdb2ac397a554858029744ac48855745fccffdb4b49c410255a8f857e3a92fe97ebb2e43a95c73d752189cf2c3d41e63ec98884aba7ae9fecdec60104ba077a
+  data.tar.gz: 72a9a6834c6584cc39b592aab031023324ca3cfe7122f5ed5ba09605847b7805c57057a7e2bcebb9a11a43223c81684f91eaba063ed48e2b5fd9f3ebd038b48f

data/lib/rack/openid/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  class OpenID
+    VERSION = "1.4.0"
+  end
+end

data/lib/rack/openid.rb

@@ -117,14 +117,14 @@ module Rack #:nodoc:
 
         consumer   = ::OpenID::Consumer.new(session, @store)
         identifier = params['identifier'] || params['identity']
-        immediate  = params['immediate'] == 'true'
 
         begin
           oidreq = consumer.begin(identifier)
           add_simple_registration_fields(oidreq, params)
           add_attribute_exchange_fields(oidreq, params)
           add_oauth_fields(oidreq, params)
-          url = open_id_redirect_url(req, oidreq, params["trust_root"], params["return_to"], params["method"], immediate)
+
+          url = open_id_redirect_url(req, oidreq, params)
           return redirect_to(url)
         rescue ::OpenID::OpenIDError, Timeout::Error => e
           env[RESPONSE] = MissingResponse.new
@@ -181,9 +181,9 @@ module Rack #:nodoc:
         env["REQUEST_URI"] = request_uri
       end
 
-      def realm_url(req)
+      def scheme_with_host_and_port(req, host = nil)
         url = req.scheme + "://"
-        url << req.host
+        url << (host || req.host)
 
         scheme, port = req.scheme, req.port
         if scheme == "https" && port != 443 ||
@@ -194,8 +194,17 @@ module Rack #:nodoc:
         url
       end
 
+      def realm(req, domain = nil)
+        if domain
+          scheme_with_host_and_port(req, domain)
+        else
+          scheme_with_host_and_port(req)
+        end
+
+      end
+
       def request_url(req)
-        url = realm_url(req)
+        url = scheme_with_host_and_port(req)
         url << req.script_name
         url << req.path_info
         url << "?#{req.query_string}" if req.query_string.to_s.length > 0
@@ -206,7 +215,13 @@ module Rack #:nodoc:
         [303, {"Content-Type" => "text/html", "Location" => url}, []]
       end
 
-      def open_id_redirect_url(req, oidreq, trust_root, return_to, method, immediate)
+      def open_id_redirect_url(req, oidreq, options)
+        trust_root = options["trust_root"]
+        return_to  = options["return_to"]
+        method     = options["method"]
+        immediate  = options["immediate"] == "true"
+
+        realm       = realm(req, options["realm_domain"])
         request_url = request_url(req)
 
         if return_to
@@ -218,7 +233,7 @@ module Rack #:nodoc:
 
         method = method.to_s.downcase
         oidreq.return_to_args['_method'] = method unless method == "get"
-        oidreq.redirect_url(trust_root || realm_url(req), return_to || request_url, immediate)
+        oidreq.redirect_url(trust_root || realm, return_to || request_url, immediate)
       end
 
       def add_simple_registration_fields(oidreq, fields)

metadata

@@ -1,101 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-openid
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
+- Michael Grosser
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-25 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-openid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 1
-        - 8
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: ruby-openid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.1.8
   type: :runtime
-  version_requirements: *id002
-description: "    Provides a more HTTPish API around the ruby-openid library\n"
-email: josh@joshpeek.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.8
+description: 
+email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rack/openid.rb
 - lib/rack/openid/simple_auth.rb
-- LICENSE
-- README.rdoc
-has_rdoc: true
-homepage: http://github.com/josh/rack-openid
-licenses: []
-
+- lib/rack/openid/version.rb
+homepage: https://github.com/grosser/rack-openid
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a more HTTPish API around the ruby-openid library
 test_files: []
-

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Joshua Peek
-
-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.

data/README.rdoc

@@ -1,70 +0,0 @@
-= Rack::OpenID
-
-Provides a more HTTPish API around the ruby-openid library.
-
-=== Usage
-
-You trigger an OpenID request similar to HTTP authentication. From your app, return a "401 Unauthorized" and a "WWW-Authenticate" header with the identifier you would like to validate.
-
-On competition, the OpenID response is automatically verified and assigned to
-<tt>env["rack.openid.response"]</tt>.
-
-=== Rack Example
-
-  MyApp = lambda { |env|
-    if resp = env["rack.openid.response"]
-      case resp.status
-      when :success
-        ...
-      when :failure
-        ...
-    else
-      [401, {"WWW-Authenticate" => 'OpenID identifier="http://example.com/"'}, []]
-    end
-  }
-
-  use Rack::OpenID
-  run MyApp
-
-=== Sinatra Example
-
-  # Session needs to be before Rack::OpenID
-  use Rack::Session::Cookie
-
-  require 'rack/openid'
-  use Rack::OpenID
-
-  get '/login' do
-    erb :login
-  end
-
-  post '/login' do
-    if resp = request.env["rack.openid.response"]
-      if resp.status == :success
-        "Welcome: #{resp.display_identifier}"
-      else
-        "Error: #{resp.status}"
-      end
-    else
-      headers 'WWW-Authenticate' => Rack::OpenID.build_header(
-        :identifier => params["openid_identifier"]
-      )
-      throw :halt, [401, 'got openid?']
-    end
-  end
-
-  enable :inline_templates
-
-  __END__
-
-  @@ login
-  <form action="/login" method="post">
-    <p>
-      <label for="openid_identifier">OpenID:</label>
-      <input id="openid_identifier" name="openid_identifier" type="text" />
-    </p>
-
-    <p>
-      <input name="commit" type="submit" value="Sign in" />
-    </p>
-  </form>