ruby-openid 1.1.1 → 1.1.2

data/examples/rails_openid_login_generator/templates/controller.rb~

@@ -0,0 +1,111 @@
+require "pathname"
+require "cgi"
+
+# load the openid library
+begin
+  require "rubygems"
+  require_gem "ruby-openid", ">= 1.0"
+rescue LoadError
+  require "openid"
+end
+
+class <%= class_name %>Controller < ApplicationController
+  layout  'scaffold'
+  
+  # process the login request, disover the openid server, and
+  # then redirect.
+  def login
+    openid_url = @params[:openid_url]
+
+    if @request.post?
+      request = consumer.begin(openid_url)
+
+      case request.status
+      when OpenID::SUCCESS
+        return_to = url_for(:action=> 'complete')
+        trust_root = url_for(:controller=>'')
+
+        url = request.redirect_url(trust_root, return_to)
+        redirect_to(url)
+        return
+
+      when OpenID::FAILURE
+        escaped_url = CGI::escape(openid_url)
+        flash[:notice] = "Could not find OpenID server for #{escaped_url}"
+        
+      else
+        flash[:notice] = "An unknown error occured."
+
+      end      
+    end    
+
+  end
+
+  # handle the openid server response
+  def complete
+    response = consumer.complete(@params)
+    
+    case response.status
+    when OpenID::SUCCESS
+
+      @user = User.get(response.identity_url)
+      
+      # create user object if one does not exist
+      if @user.nil?
+        @user = User.new(:openid_url => response.identity_url)
+        @user.save
+      end
+
+      # storing both the openid_url and user id in the session for for quick
+      # access to both bits of information.  Change as needed.
+      @session[:user_id] = @user.id
+
+      flash[:notice] = "Logged in as #{CGI::escape(response.identity_url)}"
+       
+      redirect_to :action => "welcome"
+      return
+
+    when OpenID::FAILURE
+      if response.identity_url
+        flash[:notice] = "Verification of #{CGI::escape(response.identity_url)} failed."
+
+      else
+        flash[:notice] = 'Verification failed.'
+      end
+
+    when OpenID::CANCEL
+      flash[:notice] = 'Verification cancelled.'
+
+    else
+      flash[:notice] = 'Unknown response from OpenID server.'
+    end
+  
+    redirect_to :action => 'login'
+  end
+  
+  def logout
+    @session[:user_id] = nil
+  end
+    
+  def welcome
+  end
+
+  private
+
+  # Get the OpenID::Consumer object.
+  def consumer
+    # create the OpenID store for storing associations and nonces,
+    # putting it in your app's db directory
+    store_dir = Pathname.new(RAILS_ROOT).join('db').join('openid-store')
+    store = OpenID::FilesystemStore.new(store_dir)
+
+    return OpenID::Consumer.new(@session, store)
+  end
+
+  # get the logged in user object
+  def find_user
+    return nil if session[:user_id].nil?
+    User.find(session[:user_id])
+  end
+  
+end

data/lib/openid/consumer.rb

@@ -530,17 +530,17 @@ module OpenID
       if assoc.nil?
         # It's not an association we know about. Dumb mode is our
         # only possible path for recovery.
-        code = self.check_auth(nonce, query, server_url)
+        code, msg = self.check_auth(nonce, query, server_url)
         if code == SUCCESS
           return SuccessResponse.new(consumer_id, query)
         else
-          return FailureResponse.new(consumer_id, 'check_auth failed')
+          return FailureResponse.new(consumer_id, 'check_auth failed: #{msg}')
         end
       end
 
       if assoc.expires_in <= 0
         OpenID::Util.log("Association with #{server_url} expired")
-        FailureResponse.new(consumer_id, 'assoc expired')
+        return FailureResponse.new(consumer_id, 'assoc expired')
       end
 
       # Check the signature
@@ -572,7 +572,7 @@ module OpenID
 
       ret = @fetcher.post(server_url, post_data)
       if ret.nil?
-        return FAILURE
+        return FAILURE, "unable to post to #{server_url}"
       else
         url, body = ret
       end
@@ -581,19 +581,31 @@ module OpenID
       is_valid = results.fetch("is_valid", "false")
     
       if is_valid == "true"
+
+        # we started this request with a bad association,
+        # falling back to dumb mode, the invalidate_handle tells
+        # us to handle of the assoc to remove from our store.
         invalidate_handle = results["invalidate_handle"]
-        unless invalidate_handle.nil?
+        if invalidate_handle
           @store.remove_association(server_url, invalidate_handle)
         end
+
+        # make sure response is not getting replayed by checking the nonce
         unless @store.use_nonce(nonce)
-          return FAILURE
+          return FAILURE, "#{server_url}, nonce #{nonce} already used"
         end
-        return SUCCESS
+
+        # is_valid = true, and we successfully used the nonce.
+        return SUCCESS, nil
       end
     
       error = results["error"]
-      return FAILURE unless error.nil?
-      return FAILURE
+      if error
+        msg = "error from server: #{error}"
+      else
+        msg = "is_valid was false"
+      end
+      return FAILURE, msg
     end
 
     # Create a nonce and store it for preventing replace attacks.

data/lib/openid/server.rb

@@ -357,7 +357,8 @@ module OpenID
         raise ProtocolError.new(query, 'openid.return_to missing') unless return_to
 
         trust_root = query['openid.trust_root']
-        
+        trust_root = nil if trust_root and trust_root.empty?
+
         unless OpenID::TrustRoot.parse(return_to)
           raise MalformedReturnURL.new(query, return_to)
         end

data/test/runtests.rb~

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby
+
+# the tests exploit some corner cases which generate warning messages
+# on stderr.  try and silence those messages to avoid unnecessarily concerning
+# the library user.
+begin
+  STDERR.reopen('/dev/null', 'w')
+rescue
+  print ''
+end
+
+require "teststore"
+require "assoc"
+require "dh"
+require "util"
+require "linkparse"
+require "trustroot"
+require "assoc"
+require "server2"
+require "consumer"
+require "service"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-openid
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2006-08-20 00:00:00 -07:00
+  version: 1.1.2
+date: 2006-08-23 00:00:00 -07:00
 summary: A library for consuming and serving OpenID identities.
 require_paths: 
 - lib
@@ -28,17 +28,14 @@ cert_chain:
 authors: 
 - Brian Ellin (JanRain, Inc)
 files: 
-- examples/rails_server
 - examples/consumer.rb
+- examples/rails_server
 - examples/README
-- examples/cacert.pem
 - examples/rails_openid_login_generator
 - examples/rails_active_record_store
-- examples/openid-store
-- examples/consumerd.rb
 - examples/rails_server/app
-- examples/rails_server/config
 - examples/rails_server/components
+- examples/rails_server/config
 - examples/rails_server/db
 - examples/rails_server/doc
 - examples/rails_server/lib
@@ -49,19 +46,16 @@ files:
 - examples/rails_server/vendor
 - examples/rails_server/Rakefile
 - examples/rails_server/README
-- examples/rails_server/tmp
 - examples/rails_server/app/controllers
 - examples/rails_server/app/helpers
 - examples/rails_server/app/models
 - examples/rails_server/app/views
-- examples/rails_server/app/controllers/application.rb
-- examples/rails_server/app/controllers/login_controller.rb
 - examples/rails_server/app/controllers/server_controller.rb
-- examples/rails_server/app/controllers/server_controller.rb~
-- examples/rails_server/app/controllers/login_controller.rb~
-- examples/rails_server/app/helpers/application_helper.rb
-- examples/rails_server/app/helpers/login_helper.rb
+- examples/rails_server/app/controllers/login_controller.rb
+- examples/rails_server/app/controllers/application.rb
 - examples/rails_server/app/helpers/server_helper.rb
+- examples/rails_server/app/helpers/login_helper.rb
+- examples/rails_server/app/helpers/application_helper.rb
 - examples/rails_server/app/views/layouts
 - examples/rails_server/app/views/login
 - examples/rails_server/app/views/server
@@ -71,37 +65,23 @@ files:
 - examples/rails_server/config/environments
 - examples/rails_server/config/database.yml
 - examples/rails_server/config/routes.rb
-- examples/rails_server/config/boot.rb
 - examples/rails_server/config/environment.rb
+- examples/rails_server/config/boot.rb
+- examples/rails_server/config/environments/test.rb
 - examples/rails_server/config/environments/production.rb
 - examples/rails_server/config/environments/development.rb
-- examples/rails_server/config/environments/test.rb
-- examples/rails_server/db/openid-server
-- examples/rails_server/db/openid-store
-- examples/rails_server/db/openid-server/nonces
-- examples/rails_server/db/openid-server/associations
-- examples/rails_server/db/openid-server/temp
-- examples/rails_server/db/openid-store/nonces
-- examples/rails_server/db/openid-store/associations
-- examples/rails_server/db/openid-store/temp
-- examples/rails_server/db/openid-store/associations/http-localhost_2F_7Cnormal-YU.tkND1J4fEZhnuAoT5Zc0yCA0
-- examples/rails_server/db/openid-store/associations/http-localhost_2F_7Cnormal-jRS20gc5OzJ5pkpjy9BjqvTj3B0
 - examples/rails_server/doc/README_FOR_APP
 - examples/rails_server/lib/tasks
-- examples/rails_server/log/server.log
-- examples/rails_server/log/production.log
-- examples/rails_server/log/development.log
-- examples/rails_server/log/test.log
 - examples/rails_server/public/images
 - examples/rails_server/public/javascripts
 - examples/rails_server/public/stylesheets
+- examples/rails_server/public/favicon.ico
+- examples/rails_server/public/robots.txt
 - examples/rails_server/public/dispatch.rb
-- examples/rails_server/public/dispatch.cgi
 - examples/rails_server/public/dispatch.fcgi
-- examples/rails_server/public/404.html
+- examples/rails_server/public/dispatch.cgi
 - examples/rails_server/public/500.html
-- examples/rails_server/public/favicon.ico
-- examples/rails_server/public/robots.txt
+- examples/rails_server/public/404.html
 - examples/rails_server/public/images/rails.png
 - examples/rails_server/public/javascripts/prototype.js
 - examples/rails_server/public/javascripts/effects.js
@@ -109,82 +89,56 @@ files:
 - examples/rails_server/public/javascripts/controls.js
 - examples/rails_server/script/performance
 - examples/rails_server/script/process
-- examples/rails_server/script/about
-- examples/rails_server/script/breakpointer
-- examples/rails_server/script/console
-- examples/rails_server/script/destroy
 - examples/rails_server/script/generate
-- examples/rails_server/script/runner
 - examples/rails_server/script/server
+- examples/rails_server/script/runner
 - examples/rails_server/script/plugin
+- examples/rails_server/script/breakpointer
+- examples/rails_server/script/destroy
+- examples/rails_server/script/console
+- examples/rails_server/script/about
 - examples/rails_server/script/performance/benchmarker
 - examples/rails_server/script/performance/profiler
-- examples/rails_server/script/process/reaper
-- examples/rails_server/script/process/spawner
 - examples/rails_server/script/process/spinner
+- examples/rails_server/script/process/spawner
+- examples/rails_server/script/process/reaper
 - examples/rails_server/test/fixtures
 - examples/rails_server/test/functional
 - examples/rails_server/test/mocks
 - examples/rails_server/test/unit
 - examples/rails_server/test/test_helper.rb
-- examples/rails_server/test/functional/login_controller_test.rb
 - examples/rails_server/test/functional/server_controller_test.rb
+- examples/rails_server/test/functional/login_controller_test.rb
 - examples/rails_server/test/mocks/development
 - examples/rails_server/test/mocks/test
-- examples/rails_server/tmp/sessions
-- examples/rails_server/tmp/cache
-- examples/rails_server/tmp/sockets
-- examples/rails_server/tmp/sessions/ruby_sess.fb154d2f7c286aba
-- examples/rails_server/tmp/sessions/ruby_sess.968757c6d12af322
-- examples/rails_server/tmp/sessions/ruby_sess.d2ef8fe29591ef9b
-- examples/rails_server/tmp/sessions/ruby_sess.a87a5045744b3abf
-- examples/rails_server/tmp/sessions/ruby_sess.e23240e097e2c83d
-- examples/rails_server/tmp/sessions/ruby_sess.5406e21ba5b1c7bb
-- examples/rails_server/tmp/sessions/ruby_sess.3910508c0c857695
-- examples/rails_server/tmp/sessions/ruby_sess.cf2acf62b93dbc88
-- examples/rails_server/tmp/sessions/ruby_sess.20ed70e0e63d7e31
-- examples/rails_server/tmp/sessions/ruby_sess.cd269e6040645b5b
-- examples/rails_server/tmp/sessions/ruby_sess.1b3584d2b3784c97
-- examples/rails_server/tmp/sessions/ruby_sess.1b2e9635e0f69c0d
-- examples/rails_server/tmp/sessions/ruby_sess.30cf5b98539677d5
-- examples/rails_server/tmp/sessions/ruby_sess.472170ef38098672
-- examples/rails_server/tmp/sessions/ruby_sess.5d2bd2b7086f12d5
-- examples/rails_server/tmp/sessions/ruby_sess.ca9f0a416be0be57
 - examples/rails_openid_login_generator/templates
+- examples/rails_openid_login_generator/gemspec
 - examples/rails_openid_login_generator/USAGE
 - examples/rails_openid_login_generator/openid_login_generator.rb
-- examples/rails_openid_login_generator/gemspec
-- examples/rails_openid_login_generator/templates/controller_test.rb
-- examples/rails_openid_login_generator/templates/view_login.rhtml
+- examples/rails_openid_login_generator/openid_login_generator-0.1.gem
 - examples/rails_openid_login_generator/templates/controller.rb
 - examples/rails_openid_login_generator/templates/README
+- examples/rails_openid_login_generator/templates/user_test.rb
 - examples/rails_openid_login_generator/templates/helper.rb
 - examples/rails_openid_login_generator/templates/user.rb
+- examples/rails_openid_login_generator/templates/view_login.rhtml
+- examples/rails_openid_login_generator/templates/users.yml
 - examples/rails_openid_login_generator/templates/view_logout.rhtml
+- examples/rails_openid_login_generator/templates/controller.rb~
 - examples/rails_openid_login_generator/templates/view_welcome.rhtml
-- examples/rails_openid_login_generator/templates/user_test.rb
-- examples/rails_openid_login_generator/templates/users.yml
+- examples/rails_openid_login_generator/templates/controller_test.rb
 - examples/rails_openid_login_generator/templates/openid_login_system.rb
 - examples/rails_active_record_store/models
-- examples/rails_active_record_store/README
-- examples/rails_active_record_store/XX_add_openidstore.rb
-- examples/rails_active_record_store/openid_helper.rb
 - examples/rails_active_record_store/openidstore_test.rb
-- examples/rails_active_record_store/schema.postgresql.sql
-- examples/rails_active_record_store/schema.mysql.sql
 - examples/rails_active_record_store/schema.sqlite.sql
-- examples/rails_active_record_store/models/openid_association.rb
-- examples/rails_active_record_store/models/openid_nonce.rb
+- examples/rails_active_record_store/schema.mysql.sql
+- examples/rails_active_record_store/schema.postgresql.sql
+- examples/rails_active_record_store/openid_helper.rb
+- examples/rails_active_record_store/README
+- examples/rails_active_record_store/XX_add_openidstore.rb
 - examples/rails_active_record_store/models/openid_setting.rb
-- examples/openid-store/nonces
-- examples/openid-store/associations
-- examples/openid-store/temp
-- examples/openid-store/auth_key
-- examples/openid-store/nonces/PNiw86rQ
-- examples/openid-store/nonces/uHhMdi1i
-- examples/openid-store/nonces/hdZo7WC9
-- examples/openid-store/associations/http-localhost_3A3000_2Fserver-LQl7HUNueJIJcpPoAGiHEHNdJMc
-- examples/openid-store/associations/http-www.myopenid.com_2Fserver-ZFp96P4qV1FjqgGt2rtZBvRJWic
+- examples/rails_active_record_store/models/openid_nonce.rb
+- examples/rails_active_record_store/models/openid_association.rb
 - lib/openid
 - lib/hmac-sha2.rb
 - lib/hmac.rb
@@ -192,6 +146,7 @@ files:
 - lib/hmac-rmd160.rb
 - lib/hmac-md5.rb
 - lib/openid.rb
+- lib/openid/htmltokenizer.rb
 - lib/openid/consumer.rb
 - lib/openid/dh.rb
 - lib/openid/fetchers.rb
@@ -199,29 +154,26 @@ files:
 - lib/openid/parse.rb
 - lib/openid/stores.rb
 - lib/openid/util.rb
-- lib/openid/server.rb
 - lib/openid/association.rb
 - lib/openid/trustroot.rb
+- lib/openid/server.rb
+- lib/openid/urinorm.rb
 - lib/openid/discovery.rb
-- lib/openid/htmltokenizer.rb
 - lib/openid/service.rb
-- lib/openid/stores.rb~
-- lib/openid/urinorm.rb
-- lib/openid/discovery.rb~
 - test/storetestcase.rb
 - test/linkparse.rb
 - test/assoc.rb
 - test/dh.rb
 - test/teststore.rb
-- test/util.rb
 - test/data
+- test/util.rb
 - test/trustroot.rb
-- test/extensions.rb
-- test/consumer.rb
+- test/runtests.rb~
 - test/runtests.rb
+- test/extensions.rb
 - test/server2.rb
+- test/consumer.rb
 - test/service.rb
-- test/teststore.rb~
 - test/urinorm.rb
 - test/data/urinorm.txt
 - test/data/brian.xrds
@@ -253,5 +205,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: 0.3.3
     version: