rack-openid 1.0.3 → 1.1.0

data/lib/rack/openid.rb

@@ -65,9 +65,9 @@ module Rack #:nodoc:
 
     HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS)
 
-    RESPONSE = "rack.openid.response".freeze
-    AUTHENTICATE_HEADER = "WWW-Authenticate".freeze
-    AUTHENTICATE_REGEXP = /^OpenID/.freeze
+    RESPONSE = "rack.openid.response"
+    AUTHENTICATE_HEADER = "WWW-Authenticate"
+    AUTHENTICATE_REGEXP = /^OpenID/
 
     URL_FIELD_SELECTOR = lambda { |field| field.to_s =~ %r{^https?://} }
 
@@ -84,7 +84,6 @@ module Rack #:nodoc:
     def initialize(app, store = nil)
       @app = app
       @store = store || default_store
-      freeze
     end
 
     # Standard Rack +call+ dispatch that accepts an +env+ and

data/lib/rack/openid/simple_auth.rb

@@ -0,0 +1,67 @@
+require 'rack/openid'
+
+module Rack #:nodoc:
+  class OpenID
+    # A simple OpenID middleware that restricts access to
+    # a single identifier.
+    #
+    #   use Rack::OpenID::SimpleAuth, "http://example.org"
+    #
+    # SimpleAuth will automatically insert the required Rack::OpenID
+    # middleware, so <tt>use Rack::OpenID</tt> is unnecessary.
+    class SimpleAuth
+      def self.new(*args)
+        Rack::OpenID.new(super)
+      end
+
+      attr_reader :app, :identifier
+
+      def initialize(app, identifier)
+        @app        = app
+        @identifier = identifier
+      end
+
+      def call(env)
+        if session_authenticated?(env)
+          app.call(env)
+        elsif successful_response?(env)
+          authenticate_session(env)
+          app.call(env)
+        else
+          authentication_request
+        end
+      end
+
+      private
+        def session(env)
+          env['rack.session'] || raise_session_error
+        end
+
+        def raise_session_error
+          raise RuntimeError, 'Rack::OpenID::SimpleAuth requires a session'
+        end
+
+        def session_authenticated?(env)
+          session(env)['authenticated'] == true
+        end
+
+        def authenticate_session(env)
+          session(env)['authenticated'] = true
+        end
+
+        def successful_response?(env)
+          if resp = env[OpenID::RESPONSE]
+            resp.status == :success && resp.display_identifier == identifier
+          end
+        end
+
+        def authentication_request
+          [401, { OpenID::AUTHENTICATE_HEADER => www_authenticate_header }, []]
+        end
+
+        def www_authenticate_header
+          OpenID.build_header(:identifier => identifier)
+        end
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-openid
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Joshua Peek
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -05:00
+date: 2010-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 4
@@ -34,14 +37,16 @@ dependencies:
   name: ruby-openid
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
-        - 1
-        - 6
-        version: 2.1.6
+        - 0
+        - 3
+        version: 2.0.3
   type: :runtime
   version_requirements: *id002
 description: Provides a more HTTPish API around the ruby-openid library
@@ -55,6 +60,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/rack/openid.rb
+- lib/rack/openid/simple_auth.rb
 has_rdoc: true
 homepage: http://github.com/josh/rack-openid
 licenses: []
@@ -65,23 +71,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: Provides a more HTTPish API around the ruby-openid library