ruby-openid 2.0.1 → 2.0.2

data/CHANGELOG

@@ -0,0 +1,215 @@
+Mon Jan 23 12:48:00 PST 2006  brian@janrain.com
+  * fixed bug in expiresIn.  added expired? method
+
+    M ./lib/openid/filestore.rb -1 +1
+    M ./lib/openid/stores.rb +4
+
+Mon Jan 23 12:46:37 PST 2006  brian@janrain.com
+  * removed deps section from INSTALL file.  deps are now included in lib because they are so small and to lower to bar of installing the library.
+
+    M ./INSTALL -9
+
+Tue Jan 17 14:45:57 PST 2006  brian@janrain.com
+  * added better handling of non-URL input
+
+    M ./lib/openid/consumer.rb -1 +5
+
+Sat Jan 14 19:39:57 PST 2006  brian@janrain.com
+  * added html and hmac deps into lib since they are so small
+
+    A ./lib/hmac-md5.rb
+    A ./lib/hmac-rmd160.rb
+    A ./lib/hmac-sha1.rb
+    A ./lib/hmac-sha2.rb
+    A ./lib/hmac.rb
+    A ./lib/html/
+    A ./lib/html/htmltokenizer.rb
+
+Mon Jan 16 15:04:05 PST 2006  Josh Hoyt <josh@janrain.com>
+  * Add script that will prepare the repository for release
+
+    A ./admin/fixperms
+    A ./admin/prepare-release
+
+Mon Jan 16 14:35:27 PST 2006  Josh Hoyt <josh@janrain.com>
+  * Add custom boring file
+
+    A ./admin/darcs-ignore
+
+Mon Jan 16 14:07:13 PST 2006  Josh Hoyt <josh@janrain.com>
+  * Put the build-docs script into the admin directory
+
+     ./build-docs -> ./admin/build-docs
+    A ./admin/
+
+Mon Jan 16 14:05:47 PST 2006  Josh Hoyt <josh@janrain.com>
+  * Add script to build documentation
+
+    A ./build-docs
+
+Wed Jan  4 16:06:41 PST 2006  brian@janrain.com
+  tagged ruby-openid-0.9.2
+
+
+Wed Jan  4 16:02:32 PST 2006  brian@janrain.com
+  * added openid_login_generator rails generator to examples
+
+    A ./examples/openid_login_generator/
+    A ./examples/openid_login_generator/USAGE
+    A ./examples/openid_login_generator/openid_login_generator.rb
+    A ./examples/openid_login_generator/templates/
+    A ./examples/openid_login_generator/templates/README
+    A ./examples/openid_login_generator/templates/controller.rb
+    A ./examples/openid_login_generator/templates/helper.rb
+    A ./examples/openid_login_generator/templates/login_system.rb
+    A ./examples/openid_login_generator/templates/user.rb
+    A ./examples/openid_login_generator/templates/view_login.rhtml
+    A ./examples/openid_login_generator/templates/view_logout.rhtml
+    A ./examples/openid_login_generator/templates/view_signup.rhtml
+    A ./examples/openid_login_generator/templates/view_welcome.rhtml
+
+Wed Jan  4 16:01:12 PST 2006  brian@janrain.com
+  * updated examples README to include openid_login_generator
+
+    M ./examples/README +11
+
+Wed Jan  4 14:58:24 PST 2006  brian@janrain.com
+  * added link to ruby library from consumer.rb example
+
+    M ./examples/consumer.rb -1 +1
+
+Wed Jan  4 10:56:45 PST 2006  brian@janrain.com
+  * ensure Content-type header is present for POSTs
+
+    M ./lib/openid/fetchers.rb -1 +2
+
+Fri Dec 30 17:05:25 PST 2005  brian@janrain.com
+  tagged ruby-openid-0.9.1
+
+
+Fri Dec 30 17:03:54 PST 2005  brian@janrain.com
+  * added Ruby on Rails example consumer
+
+    M ./examples/README -1 +14
+    A ./examples/openid_rails.tar.gz
+
+Thu Dec 29 16:00:20 PST 2005  brian@janrain.com
+  tagged ruby-openid-0.9.0
+
+
+Thu Dec 29 15:43:07 PST 2005  brian@janrain.com
+  * removed docs directory. generated rdoc html will be added manually to tarballs, and not be kept in repository
+
+    R ./docs/
+    R ./docs/README
+
+Thu Dec 29 15:21:21 PST 2005  brian@janrain.com
+  * added more docs for stores
+
+    M ./TODO -2 +4
+    M ./lib/openid/filestore.rb -16 +3
+    M ./lib/openid/stores.rb -9 +1
+
+Thu Dec 29 14:58:52 PST 2005  brian@janrain.com
+  * Huge documentation patch
+
+    M ./INSTALL -12 +22
+    M ./README -1 +1
+    M ./lib/openid/consumer.rb -24 +370
+    M ./lib/openid/fetchers.rb -2 +1
+    M ./lib/openid/filestore.rb -6 +4
+    M ./lib/openid/stores.rb -2 +1
+
+Thu Dec 29 10:59:54 PST 2005  brian@janrain.com
+  * added more info and rdoc formatting to README
+
+    M ./README -10 +26
+
+Thu Dec 29 09:45:51 PST 2005  brian@janrain.com
+  * fixed bad comment
+
+    M ./examples/consumer.rb -1 +1
+
+Wed Dec 28 17:59:48 PST 2005  brian@janrain.com
+  * added platform agnositc temp dir discovery
+
+    M ./examples/consumer.rb -1 +5
+
+Wed Dec 28 17:13:21 PST 2005  brian@janrain.com
+  * moved getOpenIDParamerters to util
+
+    M ./lib/openid/consumer.rb -10 +2
+    M ./lib/openid/util.rb +8
+
+Wed Dec 28 15:47:51 PST 2005  brian@janrain.com
+  * code cleanup
+
+    M ./lib/openid/consumer.rb -5
+
+Wed Dec 28 15:29:31 PST 2005  brian@janrain.com
+  * added linkparse to test suite script
+
+    M ./test/runtests -1 +1
+
+Wed Dec 28 15:29:07 PST 2005  brian@janrain.com
+  * added link parsing tests, lots of em
+
+    A ./test/linkparse.rb
+
+Wed Dec 28 15:28:07 PST 2005  brian@janrain.com
+  * link parsing more robust: handle non-html data, and make sure link tag is in head
+
+    M ./lib/openid/parse.rb -5 +13
+
+Tue Dec 27 16:11:09 PST 2005  brian@janrain.com
+  * added more tests for openid/util
+
+    M ./test/dh.rb -2 +1
+    M ./test/runtests +1
+    A ./test/util.rb
+
+Tue Dec 27 16:10:28 PST 2005  brian@janrain.com
+  * change util methods to use all use /dev/urandom if available
+
+    M ./lib/openid/util.rb -15 +35
+
+Tue Dec 27 16:09:53 PST 2005  brian@janrain.com
+  * changed tmp pathname to something more useful
+
+    M ./examples/consumer.rb -1 +1
+
+Fri Dec 16 09:04:59 PST 2005  Josh Hoyt <josh@janrain.com>
+  * Removed (now obsolete) interface.rb
+  
+  This has been subsumed by consumer.rb
+
+    R ./lib/openid/interface.rb
+
+Thu Dec 15 18:25:04 PST 2005  brian@janrain.com
+  * initial checkin
+
+    A ./COPYING
+    A ./INSTALL
+    A ./README
+    A ./TODO
+    A ./docs/
+    A ./docs/README
+    A ./examples/
+    A ./examples/README
+    A ./examples/consumer.rb
+    A ./lib/
+    A ./lib/openid/
+    A ./lib/openid/consumer.rb
+    A ./lib/openid/dh.rb
+    A ./lib/openid/fetchers.rb
+    A ./lib/openid/filestore.rb
+    A ./lib/openid/interface.rb
+    A ./lib/openid/parse.rb
+    A ./lib/openid/stores.rb
+    A ./lib/openid/util.rb
+    A ./setup.rb
+    A ./test/
+    A ./test/assoc.rb
+    A ./test/dh.rb
+    A ./test/runtests
+    A ./test/teststore.rb

data/LICENSE

@@ -1,3 +1,8 @@
+The code in lib/hmac/ is Copyright 2001 by Daiki Ueno, and distributed under
+the terms of the Ruby license.  See http://www.ruby-lang.org/en/LICENSE.txt
+
+The remainder of this package is Copyright 2006-2007 by JanRain, Inc. and
+distributed under the terms of license below:
 
                                  Apache License
                            Version 2.0, January 2004

data/NOTICE

@@ -0,0 +1,2 @@
+This product includes software developed by JanRain,
+available from http://openidenabled.com/

data/examples/active_record_openid_store/XXX_upgrade_open_id_store.rb

@@ -1,6 +1,6 @@
 # Use this migration to upgrade the old 1.1 ActiveRecord store schema
 # to the new 2.0 schema.
-class UpgradeOpenIDStore < ActiveRecord::Migration
+class UpgradeOpenIdStore < ActiveRecord::Migration
   def self.up
     drop_table "open_id_settings"
     drop_table "open_id_nonces"

data/examples/discover

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 require "openid/consumer/discovery"
+require 'openid/fetchers'
+
+OpenID::fetcher_use_env_proxy
 
 $names = [[:server_url,   "Server URL  "],
           [:local_id,     "Local ID    "],

data/examples/rails_openid/app/controllers/consumer_controller.rb

@@ -50,9 +50,10 @@ class ConsumerController < ApplicationController
   end
 
   def complete
-    return_to = url_for(:action => 'complete', :only_path => false)
+    # FIXME - url_for some action is not necessarily the current URL.
+    current_url = url_for(:action => 'complete', :only_path => false)
     parameters = params.reject{|k,v|request.path_parameters[k]}
-    oidresp = consumer.complete(parameters, return_to)
+    oidresp = consumer.complete(parameters, current_url)
     case oidresp.status
     when OpenID::Consumer::FAILURE
       if oidresp.display_identifier

data/examples/rails_openid/app/controllers/login_controller.rb

@@ -1,6 +1,8 @@
 # Controller for handling the login, logout process for "users" of our
 # little server.  Users have no password.  This is just an example.
 
+require 'openid'
+
 class LoginController < ApplicationController
 
   layout 'server'

data/examples/rails_openid/app/views/consumer/index.rhtml

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Rails OpenID Example Consumer</title>
+<title>Rails OpenID Example Relying Party</title>
 </head>
   <style type="text/css">
       * {
@@ -39,7 +39,7 @@
       }
   </style>
   <body>
-    <h1>Rails OpenID Example Consumer</h1>
+    <h1>Rails OpenID Example Relying Party</h1>
     <% if flash[:alert] %>
       <div class='alert'>
        <%= h(flash[:alert]) %>

data/examples/rails_openid/app/views/layouts/server.rhtml

@@ -32,7 +32,13 @@
       table {
         padding: 1em;
       }
-      li {margin-bottom: .5em;}		
+      li {margin-bottom: .5em;}
+      span.openid:before {
+        content: url(<%= @base_url %>images/openid_login_bg.gif) ;
+      }
+      span.openid {
+        font-size: smaller;
+      }
   </style>
   <body>
 
@@ -40,7 +46,8 @@
 
     <% if session[:username] %>
       <div style="float:right;">
-        Welcome, <%= session[:username] %> | <%= link_to('Log out', :controller => 'login', :action => 'logout') %>
+        Welcome, <%= session[:username] %> | <%= link_to('Log out', :controller => 'login', :action => 'logout') %><br />
+	<span class="openid"><%= @base_url %>user/<%= session[:username] %></span>
       </div>
     <% end %>
 

data/examples/rails_openid/app/views/login/index.rhtml

@@ -13,20 +13,44 @@ Type a username:
 
 <% end %>
 
-<p>
-Welcome to the Ruby OpenID server example.  This code is a starting point for developers wishing to implement an OpenID server on the <a href="http://rubyonrails.org/">Rails</a> platform.
-</p> 
+<p> Welcome to the Ruby OpenID example.  This code is a starting point
+for developers wishing to implement an OpenID provider or relying
+party.  We've used the <a href="http://rubyonrails.org/">Rails</a>
+platform to demonstrate, but the library code is not Rails specific.</p>
 
-<h2>To use the example</h2>
+<h2>To use the example provider</h2>
 <p>
   <ol>
-    <li>Enter a username in the form above.  You will be "Logged In" to the server, at which point you may authenticate using an OpenID consumer. Your OpenID URL will be displayed after you log in.<p>The server will automatically create an identity page for you at <%= @base_url %>user/<i>name</i></p></li>
-    <li>Run the example OpenID consumer: <blockquote>ruby examples/consumer.rb</blockquote></li>
-    <li>In another browser window visit <a href="http://localhost:2000/">http://localhost:2000/</a>, and type your OpenID URL to verfiy your identity with this server.</li>
+
+    <li>Enter a username in the form above.  You will be "Logged In"
+    to the server, at which point you may authenticate using an OpenID
+    consumer. Your OpenID URL will be displayed after you log
+    in.<p>The server will automatically create an identity page for
+    you at <%= @base_url %>user/<i>name</i></p></li>
+
+    <li><p>Because WEBrick can only handle one thing at a time, you'll need to
+    run another instance of the example on another port if you want to use
+    a relying party to use with this example provider:</p>
+    <blockquote>
+    <code>script/server --port=3001</code>
+    </blockquote>
+
+    <p>(The RP needs to be able to access the provider, so unless you're
+    running this example on a public IP, you can't use the live example
+    at <a href="http://openidenabled.com/">openidenabled.com</a> on
+    your local provider.)</p>
+    </li>
+
+    <li>Point your browser to this new instance and follow the directions
+    below.</li>
+    <!-- Fun fact: 'url_for :port => 3001' doesn't work very well. -->
   </ol>
 
 </p>
 
+<h2>To use the example relying party</h2>
 
-
+<p>Visit <a href="<%= url_for :controller => 'consumer' %>">/consumer</a>
+and enter your OpenID.</p>
+</p>
 

data/examples/rails_openid/config/database.yml

@@ -6,26 +6,15 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql
-  database: rails_server_development
-  username: root
-  password:
-  socket: /path/to/your/mysql.sock
-
-  # Connect on a TCP socket.  If omitted, the adapter will connect on the
-  # domain socket given by socket instead.
-  #host: localhost
-  #port: 3306
+  adapter: sqlite3
+  database: db/development.sqlite3
   
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
-  database: rails_server_test
-  username: root
-  password:
-  socket: /path/to/your/mysql.sock
+  adapter: sqlite3
+  database: ":memory:"
 
 production:
   adapter: mysql

data/lib/openid.rb

@@ -1,2 +1,16 @@
+# Copyright 2006-2007 JanRain, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you
+# may not use this file except in compliance with the License. You may
+# obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
 require "openid/consumer"
 require 'openid/server'

data/lib/openid/consumer.rb

@@ -170,7 +170,7 @@ module OpenID
   #
   # Get a Consumer instance with the same session and store as before
   # and call its complete() method, passing in all the received query
-  # arguments and the <tt>return_to</tt> URL mentioned above.
+  # arguments and URL currently being handled.
   #
   # There are multiple possible return types possible from that
   # method. These indicate the whether or not the login was
@@ -265,16 +265,20 @@ module OpenID
     # because <tt>controller</tt> and <tt>action</tt> and other
     # "path parameters" are included in params.
     #
-    # return_to: The return URL used to invoke the application.
-    # Extract the URL from your application's web request framework
-    # and specify it here to have it checked against the
-    # openid.return_to value in the response.  If the return_to URL
-    # check fails, the status of the completion will be FAILURE.
+    # current_url: Extract the URL of the current request from your
+    # application's web request framework and specify it here to have it
+    # checked against the openid.return_to value in the response.  Do not
+    # just pass <tt>args['openid.return_to']</tt> here; that will defeat the
+    # purpose of this check.  (See OpenID Authentication 2.0 section 11.1.)
+    #
+    # If the return_to URL check fails, the status of the completion will be
+    # FAILURE.
+
     #
     # Returns a subclass of Response. The type of response is
     # indicated by the status attribute, which will be one of
     # SUCCESS, CANCEL, FAILURE, or SETUP_NEEDED.
-    def complete(query, return_to)
+    def complete(query, current_url)
       message = Message.from_post_args(query)
       mode = message.get_arg(OPENID_NS, 'mode', 'invalid')
       begin
@@ -282,7 +286,7 @@ module OpenID
       rescue NameError
         meth = method(:complete_invalid)
       end
-      response = meth.call(message, return_to)
+      response = meth.call(message, current_url)
       cleanup_last_requested_endpoint
       if [SUCCESS, CANCEL].member?(response.status)
         cleanup_session
@@ -338,8 +342,8 @@ module OpenID
                              service.compatibility_mode, negotiator)
     end
 
-    def handle_idres(message, return_to)
-      IdResHandler.new(message, return_to, @store, last_requested_endpoint)
+    def handle_idres(message, current_url)
+      IdResHandler.new(message, current_url, @store, last_requested_endpoint)
     end
 
     def complete_invalid(message, unused_return_to)
@@ -369,7 +373,7 @@ module OpenID
       end
     end
 
-    def complete_id_res(message, return_to)
+    def complete_id_res(message, current_url)
       if message.is_openid1
         setup_url = message.get_arg(OPENID1_NS, 'user_setup_url')
         if !setup_url.nil?
@@ -378,7 +382,7 @@ module OpenID
       end
 
       begin
-        idres = handle_idres(message, return_to)
+        idres = handle_idres(message, current_url)
       rescue DiscoveryFailure, ProtocolError => why
         return FailureResponse.new(last_requested_endpoint, why.message)
       else

data/lib/openid/consumer/idres.rb

@@ -47,11 +47,11 @@ module OpenID
     class IdResHandler
       attr_reader :endpoint, :message
 
-      def initialize(message, return_to, store=nil, endpoint=nil)
+      def initialize(message, current_url, store=nil, endpoint=nil)
         @store = store # Fer the nonce and invalidate_handle
         @message = message
         @endpoint = endpoint
-        @return_to = return_to
+        @current_url = current_url
         @signed_list = nil
 
         # Start the verification process
@@ -140,11 +140,11 @@ module OpenID
         begin
           msg_return_to = URI.parse(fetch('return_to'))
         rescue URI::InvalidURIError
-          raise ProrocolError("return_to is not a valid URI")
+          raise ProtocolError, ("return_to is not a valid URI")
         end
 
         verify_return_to_args(msg_return_to)
-        if !@return_to.nil?
+        if !@current_url.nil?
           verify_return_to_base(msg_return_to)
         end
       end
@@ -177,9 +177,9 @@ module OpenID
 
       def verify_return_to_base(msg_return_to)
         begin
-          app_parsed = URI.parse(@return_to)
+          app_parsed = URI.parse(@current_url)
         rescue URI::InvalidURIError
-          raise ProtocolError, "return_to is not a valid URI"
+          raise ProtocolError, "current_url is not a valid URI: #{@current_url}"
         end
 
         [:scheme, :host, :port, :path].each do |meth|
@@ -425,8 +425,8 @@ module OpenID
         if services.length == 0
           # XXX: this might want to be something other than
           # ProtocolError. In Python, it's DiscoveryFailure
-          raise ProtocolError("No OpenID information found at "\
-                             "#{to_match.claimed_id}")
+          raise ProtocolError, ("No OpenID information found at "\
+                                "#{to_match.claimed_id}")
         end
         verify_discovered_services(services, to_match)
       end
@@ -455,8 +455,8 @@ module OpenID
         end
 
         # XXX: is DiscoveryFailure in Python OpenID
-        raise ProtocolError("No matching endpoint found after "\
-                            "discovering #{to_match.claimed_id}")
+        raise ProtocolError, ("No matching endpoint found after "\
+                              "discovering #{to_match.claimed_id}")
       end
 
       def verify_discovery_single(endpoint, to_match)

data/lib/openid/fetchers.rb

@@ -99,6 +99,17 @@ module OpenID
     @fetcher = fetcher
   end
 
+  # Set the default fetcher to use the HTTP proxy defined in the environment
+  # variable 'http_proxy'.
+  def self.fetcher_use_env_http_proxy
+    proxy_string = ENV['http_proxy']
+    return unless proxy_string
+
+    proxy_uri = URI.parse(proxy_string)
+    @fetcher = StandardFetcher.new(proxy_uri.host, proxy_uri.port,
+                                   proxy_uri.user, proxy_uri.password)
+  end
+  
   class StandardFetcher
 
     USER_AGENT = "ruby-openid/#{OpenID::VERSION} (#{PLATFORM})"
@@ -107,8 +118,11 @@ module OpenID
 
     attr_accessor :ca_file
 
-    def initialize
+    # I can fetch through a HTTP proxy; arguments are as for Net::HTTP::Proxy.
+    def initialize(proxy_addr=nil, proxy_port=nil,
+                   proxy_user=nil, proxy_pass=nil)
       @ca_file = nil
+      @proxy = Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user, proxy_pass)
     end
 
     def supports_ssl?(conn)
@@ -116,7 +130,7 @@ module OpenID
     end
 
     def make_http(uri)
-      Net::HTTP.new(uri.host, uri.port)
+      @proxy.new(uri.host, uri.port)
     end
 
     def set_verified(conn, verify)

data/lib/openid/util.rb

@@ -12,7 +12,7 @@ module OpenID
   class AssertionError < Exception
   end
 
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 
   # Exceptions that are raised by the library are subclasses of this
   # exception type, so if you want to catch all exceptions raised by

data/test/test_fetchers.rb

@@ -470,3 +470,38 @@ class DefaultFetcherTest < Test::Unit::TestCase
     assert(OpenID.fetcher.is_a?(OpenID::StandardFetcher))
   end
 end
+
+class ProxyTest < Test::Unit::TestCase
+  def test_proxy_unreachable
+    assert_raise(Errno::ECONNREFUSED) {
+      f = OpenID::StandardFetcher.new('127.0.0.1', 1)
+      # If this tries to connect to the proxy (on port 1), I expect
+      # a 'connection refused' error.  If it tries to contact the below
+      # URI first, it will get some other sort of error.
+      f.fetch("http://unittest.invalid")
+    }
+  end
+
+  def test_proxy_env
+    ENV['http_proxy'] = 'http://127.0.0.1:3128/'
+    OpenID.fetcher_use_env_http_proxy
+    
+    # make_http just to give us something with readable attributes to inspect.
+    conn = OpenID.fetcher.make_http(URI.parse('http://127.0.0.2'))
+    assert_equal('127.0.0.1', conn.proxy_address)
+    assert_equal(3128, conn.proxy_port)
+  end
+  # These aren't fully automated tests, but if you start a proxy
+  # on port 8888 (tinyproxy's default) and check its logs...
+#   def test_proxy
+#     f = OpenID::StandardFetcher.new('127.0.0.1', 8888)
+#     result = f.fetch("http://www.example.com/")
+#     assert_match(/RFC.*2606/, result.body)
+#   end
+
+#   def test_proxy_https
+#     f = OpenID::StandardFetcher.new('127.0.0.1', 8888)
+#     result = f.fetch("https://www.myopenid.com/")
+#     assert_match(/myOpenID/, result.body)
+#   end
+end

data/test/test_idres.rb

@@ -811,6 +811,46 @@ module OpenID
                        signed_fields.map {|f|'openid.' + f})
         end
       end
+
+
+      class DiscoverAndVerifyTest < Test::Unit::TestCase
+        include ProtocolErrorMixin
+        include TestUtil
+
+        def test_no_services
+          me = self
+          disco = Proc.new do |e|
+            me.assert_equal(e, :sentinel)
+            [:undefined, []]
+          end
+          endpoint = OpenIDServiceEndpoint.new
+          endpoint.claimed_id = :sentinel
+          idres = IdResHandler.new(nil, nil)
+          assert_log_matches('Performing discovery on') do
+            assert_protocol_error('No OpenID information found') do
+              OpenID.with_method_overridden(:discover, disco) do
+                idres.send(:discover_and_verify, endpoint)
+              end
+            end
+          end
+        end
+      end
+
+      class VerifyDiscoveredServicesTest < Test::Unit::TestCase
+        include ProtocolErrorMixin
+        include TestUtil
+
+        def test_no_services
+          endpoint = OpenIDServiceEndpoint.new
+          endpoint.claimed_id = :sentinel
+          idres = IdResHandler.new(nil, nil)
+          assert_log_matches('Discovery verification failure') do
+            assert_protocol_error('No matching endpoint') do
+              idres.send(:verify_discovered_services, [], endpoint)
+            end
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-openid
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
-date: 2007-12-14 00:00:00 -08:00
+  version: 2.0.2
+date: 2007-12-21 00:00:00 -08:00
 summary: A library for consuming and serving OpenID identities.
 require_paths: 
 - lib
@@ -29,251 +29,252 @@ post_install_message:
 authors: 
 - JanRain, Inc
 files: 
-- examples/README
-- examples/active_record_openid_store
 - examples/rails_openid_login_generator
 - examples/rails_openid
+- examples/README
 - examples/discover
-- examples/active_record_openid_store/lib
-- examples/active_record_openid_store/test
-- examples/active_record_openid_store/init.rb
-- examples/active_record_openid_store/README
-- examples/active_record_openid_store/XXX_add_open_id_store_to_db.rb
-- examples/active_record_openid_store/XXX_upgrade_open_id_store.rb
-- examples/active_record_openid_store/lib/association.rb
-- examples/active_record_openid_store/lib/nonce.rb
-- examples/active_record_openid_store/lib/open_id_setting.rb
-- examples/active_record_openid_store/lib/openid_ar_store.rb
-- examples/active_record_openid_store/test/store_test.rb
-- examples/rails_openid_login_generator/templates
-- examples/rails_openid_login_generator/gemspec
+- examples/active_record_openid_store
 - examples/rails_openid_login_generator/USAGE
+- examples/rails_openid_login_generator/gemspec
 - examples/rails_openid_login_generator/openid_login_generator.rb
-- examples/rails_openid_login_generator/templates/user.rb
+- examples/rails_openid_login_generator/templates
+- examples/rails_openid_login_generator/templates/controller_test.rb
 - examples/rails_openid_login_generator/templates/README
+- examples/rails_openid_login_generator/templates/view_logout.rhtml
 - examples/rails_openid_login_generator/templates/controller.rb
-- examples/rails_openid_login_generator/templates/helper.rb
 - examples/rails_openid_login_generator/templates/view_login.rhtml
-- examples/rails_openid_login_generator/templates/view_logout.rhtml
+- examples/rails_openid_login_generator/templates/user.rb
+- examples/rails_openid_login_generator/templates/openid_login_system.rb
 - examples/rails_openid_login_generator/templates/view_welcome.rhtml
-- examples/rails_openid_login_generator/templates/controller_test.rb
-- examples/rails_openid_login_generator/templates/user_test.rb
 - examples/rails_openid_login_generator/templates/users.yml
-- examples/rails_openid_login_generator/templates/openid_login_system.rb
-- examples/rails_openid/app
-- examples/rails_openid/components
-- examples/rails_openid/config
+- examples/rails_openid_login_generator/templates/user_test.rb
+- examples/rails_openid_login_generator/templates/helper.rb
 - examples/rails_openid/db
+- examples/rails_openid/app
 - examples/rails_openid/doc
 - examples/rails_openid/lib
 - examples/rails_openid/log
-- examples/rails_openid/public
-- examples/rails_openid/script
 - examples/rails_openid/test
-- examples/rails_openid/vendor
 - examples/rails_openid/Rakefile
 - examples/rails_openid/README
+- examples/rails_openid/components
+- examples/rails_openid/config
+- examples/rails_openid/public
+- examples/rails_openid/script
+- examples/rails_openid/vendor
+- examples/rails_openid/app/views
 - examples/rails_openid/app/controllers
-- examples/rails_openid/app/helpers
 - examples/rails_openid/app/models
-- examples/rails_openid/app/views
-- examples/rails_openid/app/controllers/application.rb
-- examples/rails_openid/app/controllers/login_controller.rb
-- examples/rails_openid/app/controllers/server_controller.rb
-- examples/rails_openid/app/controllers/consumer_controller.rb
-- examples/rails_openid/app/helpers/application_helper.rb
-- examples/rails_openid/app/helpers/login_helper.rb
-- examples/rails_openid/app/helpers/server_helper.rb
-- examples/rails_openid/app/views/layouts
+- examples/rails_openid/app/helpers
 - examples/rails_openid/app/views/login
-- examples/rails_openid/app/views/server
+- examples/rails_openid/app/views/layouts
 - examples/rails_openid/app/views/consumer
-- examples/rails_openid/app/views/layouts/server.rhtml
+- examples/rails_openid/app/views/server
 - examples/rails_openid/app/views/login/index.rhtml
-- examples/rails_openid/app/views/server/decide.rhtml
+- examples/rails_openid/app/views/layouts/server.rhtml
 - examples/rails_openid/app/views/consumer/start.rhtml
 - examples/rails_openid/app/views/consumer/index.rhtml
+- examples/rails_openid/app/views/server/decide.rhtml
+- examples/rails_openid/app/controllers/consumer_controller.rb
+- examples/rails_openid/app/controllers/login_controller.rb
+- examples/rails_openid/app/controllers/server_controller.rb
+- examples/rails_openid/app/controllers/application.rb
+- examples/rails_openid/app/helpers/server_helper.rb
+- examples/rails_openid/app/helpers/login_helper.rb
+- examples/rails_openid/app/helpers/application_helper.rb
+- examples/rails_openid/doc/README_FOR_APP
+- examples/rails_openid/lib/tasks
+- examples/rails_openid/test/unit
+- examples/rails_openid/test/mocks
+- examples/rails_openid/test/functional
+- examples/rails_openid/test/fixtures
+- examples/rails_openid/test/test_helper.rb
+- examples/rails_openid/test/mocks/test
+- examples/rails_openid/test/mocks/development
+- examples/rails_openid/test/functional/login_controller_test.rb
+- examples/rails_openid/test/functional/server_controller_test.rb
+- examples/rails_openid/config/routes.rb
 - examples/rails_openid/config/environments
 - examples/rails_openid/config/database.yml
-- examples/rails_openid/config/boot.rb
 - examples/rails_openid/config/environment.rb
-- examples/rails_openid/config/routes.rb
+- examples/rails_openid/config/boot.rb
+- examples/rails_openid/config/environments/test.rb
 - examples/rails_openid/config/environments/development.rb
 - examples/rails_openid/config/environments/production.rb
-- examples/rails_openid/config/environments/test.rb
-- examples/rails_openid/doc/README_FOR_APP
-- examples/rails_openid/lib/tasks
-- examples/rails_openid/public/images
-- examples/rails_openid/public/javascripts
-- examples/rails_openid/public/stylesheets
-- examples/rails_openid/public/dispatch.cgi
+- examples/rails_openid/public/favicon.ico
 - examples/rails_openid/public/404.html
-- examples/rails_openid/public/500.html
+- examples/rails_openid/public/stylesheets
+- examples/rails_openid/public/javascripts
+- examples/rails_openid/public/robots.txt
+- examples/rails_openid/public/images
 - examples/rails_openid/public/dispatch.fcgi
+- examples/rails_openid/public/500.html
 - examples/rails_openid/public/dispatch.rb
-- examples/rails_openid/public/favicon.ico
-- examples/rails_openid/public/robots.txt
-- examples/rails_openid/public/images/openid_login_bg.gif
+- examples/rails_openid/public/dispatch.cgi
+- examples/rails_openid/public/javascripts/prototype.js
 - examples/rails_openid/public/javascripts/controls.js
-- examples/rails_openid/public/javascripts/dragdrop.js
 - examples/rails_openid/public/javascripts/effects.js
-- examples/rails_openid/public/javascripts/prototype.js
-- examples/rails_openid/script/performance
-- examples/rails_openid/script/process
+- examples/rails_openid/public/javascripts/dragdrop.js
+- examples/rails_openid/public/images/openid_login_bg.gif
 - examples/rails_openid/script/console
-- examples/rails_openid/script/about
-- examples/rails_openid/script/breakpointer
 - examples/rails_openid/script/destroy
+- examples/rails_openid/script/about
 - examples/rails_openid/script/generate
+- examples/rails_openid/script/breakpointer
 - examples/rails_openid/script/plugin
-- examples/rails_openid/script/runner
 - examples/rails_openid/script/server
-- examples/rails_openid/script/performance/benchmarker
-- examples/rails_openid/script/performance/profiler
+- examples/rails_openid/script/runner
+- examples/rails_openid/script/process
+- examples/rails_openid/script/performance
 - examples/rails_openid/script/process/spawner
-- examples/rails_openid/script/process/reaper
 - examples/rails_openid/script/process/spinner
-- examples/rails_openid/test/fixtures
-- examples/rails_openid/test/functional
-- examples/rails_openid/test/mocks
-- examples/rails_openid/test/unit
-- examples/rails_openid/test/test_helper.rb
-- examples/rails_openid/test/functional/login_controller_test.rb
-- examples/rails_openid/test/functional/server_controller_test.rb
-- examples/rails_openid/test/mocks/development
-- examples/rails_openid/test/mocks/test
-- lib/openid
+- examples/rails_openid/script/process/reaper
+- examples/rails_openid/script/performance/benchmarker
+- examples/rails_openid/script/performance/profiler
+- examples/active_record_openid_store/lib
+- examples/active_record_openid_store/test
+- examples/active_record_openid_store/README
+- examples/active_record_openid_store/XXX_add_open_id_store_to_db.rb
+- examples/active_record_openid_store/XXX_upgrade_open_id_store.rb
+- examples/active_record_openid_store/init.rb
+- examples/active_record_openid_store/lib/nonce.rb
+- examples/active_record_openid_store/lib/open_id_setting.rb
+- examples/active_record_openid_store/lib/openid_ar_store.rb
+- examples/active_record_openid_store/lib/association.rb
+- examples/active_record_openid_store/test/store_test.rb
 - lib/hmac
 - lib/openid.rb
-- lib/openid/cryptutil.rb
-- lib/openid/extras.rb
+- lib/openid
+- lib/hmac/sha1.rb
+- lib/hmac/sha2.rb
+- lib/hmac/hmac.rb
+- lib/openid/kvform.rb
 - lib/openid/urinorm.rb
-- lib/openid/util.rb
-- lib/openid/trustroot.rb
 - lib/openid/message.rb
-- lib/openid/yadis
-- lib/openid/consumer
-- lib/openid/fetchers.rb
-- lib/openid/dh.rb
-- lib/openid/kvform.rb
 - lib/openid/association.rb
+- lib/openid/dh.rb
 - lib/openid/store
+- lib/openid/yadis
+- lib/openid/server.rb
+- lib/openid/trustroot.rb
+- lib/openid/consumer.rb
 - lib/openid/kvpost.rb
-- lib/openid/extensions
+- lib/openid/consumer
 - lib/openid/protocolerror.rb
-- lib/openid/server.rb
 - lib/openid/extension.rb
-- lib/openid/consumer.rb
+- lib/openid/cryptutil.rb
+- lib/openid/util.rb
+- lib/openid/extensions
+- lib/openid/extras.rb
+- lib/openid/fetchers.rb
+- lib/openid/store/nonce.rb
+- lib/openid/store/filesystem.rb
+- lib/openid/store/interface.rb
+- lib/openid/store/memory.rb
+- lib/openid/yadis/xrds.rb
 - lib/openid/yadis/htmltokenizer.rb
+- lib/openid/yadis/discovery.rb
 - lib/openid/yadis/parsehtml.rb
-- lib/openid/yadis/filters.rb
-- lib/openid/yadis/xrds.rb
 - lib/openid/yadis/accept.rb
 - lib/openid/yadis/constants.rb
-- lib/openid/yadis/discovery.rb
-- lib/openid/yadis/xri.rb
 - lib/openid/yadis/xrires.rb
+- lib/openid/yadis/filters.rb
+- lib/openid/yadis/xri.rb
 - lib/openid/yadis/services.rb
-- lib/openid/consumer/html_parse.rb
-- lib/openid/consumer/idres.rb
-- lib/openid/consumer/associationmanager.rb
 - lib/openid/consumer/discovery.rb
+- lib/openid/consumer/html_parse.rb
 - lib/openid/consumer/discovery_manager.rb
-- lib/openid/consumer/checkid_request.rb
+- lib/openid/consumer/idres.rb
 - lib/openid/consumer/responses.rb
-- lib/openid/store/filesystem.rb
-- lib/openid/store/interface.rb
-- lib/openid/store/nonce.rb
-- lib/openid/store/memory.rb
-- lib/openid/extensions/sreg.rb
+- lib/openid/consumer/checkid_request.rb
+- lib/openid/consumer/associationmanager.rb
 - lib/openid/extensions/ax.rb
+- lib/openid/extensions/sreg.rb
 - lib/openid/extensions/pape.rb
-- lib/hmac/hmac.rb
-- lib/hmac/sha1.rb
-- lib/hmac/sha2.rb
 - test/data
-- test/test_association.rb
-- test/test_urinorm.rb
-- test/testutil.rb
-- test/test_util.rb
-- test/test_message.rb
-- test/test_cryptutil.rb
-- test/test_extras.rb
-- test/util.rb
-- test/test_trustroot.rb
-- test/test_parsehtml.rb
-- test/test_fetchers.rb
-- test/test_dh.rb
-- test/test_kvform.rb
-- test/test_openid_yadis.rb
-- test/test_linkparse.rb
-- test/test_stores.rb
-- test/test_filters.rb
-- test/test_xrds.rb
 - test/test_nonce.rb
-- test/test_accept.rb
-- test/test_kvpost.rb
-- test/test_associationmanager.rb
-- test/discoverdata.rb
+- test/test_ax.rb
+- test/test_xrds.rb
+- test/test_dh.rb
+- test/test_urinorm.rb
+- test/test_checkid_request.rb
 - test/test_server.rb
+- test/test_cryptutil.rb
 - test/test_yadis_discovery.rb
+- test/test_message.rb
+- test/test_consumer.rb
+- test/test_accept.rb
+- test/test_responses.rb
 - test/test_sreg.rb
+- test/test_association.rb
+- test/test_kvpost.rb
+- test/test_xrires.rb
 - test/test_idres.rb
-- test/test_ax.rb
+- test/test_linkparse.rb
+- test/test_util.rb
+- test/test_openid_yadis.rb
+- test/test_filters.rb
+- test/test_pape.rb
+- test/discoverdata.rb
+- test/test_parsehtml.rb
+- test/test_stores.rb
+- test/util.rb
 - test/test_xri.rb
-- test/test_xrires.rb
+- test/test_trustroot.rb
+- test/test_extras.rb
+- test/test_fetchers.rb
+- test/test_associationmanager.rb
+- test/testutil.rb
+- test/test_kvform.rb
 - test/test_discover.rb
-- test/test_consumer.rb
-- test/test_pape.rb
-- test/test_checkid_request.rb
 - test/test_discovery_manager.rb
-- test/test_responses.rb
-- test/data/test_xrds
-- test/data/urinorm.txt
 - test/data/n2b64
-- test/data/trustroot.txt
-- test/data/dh.txt
-- test/data/test1-parsehtml.txt
+- test/data/test_discover
 - test/data/linkparse.txt
+- test/data/dh.txt
 - test/data/accept.txt
-- test/data/test_discover
+- test/data/test1-parsehtml.txt
+- test/data/urinorm.txt
 - test/data/example-xrds.xml
+- test/data/trustroot.txt
+- test/data/test_xrds
 - test/data/test1-discover.txt
-- test/data/test_xrds/ref.xrds
+- test/data/test_discover/openid_and_yadis.html
+- test/data/test_discover/yadis_0entries.xml
+- test/data/test_discover/yadis_another_delegate.xml
+- test/data/test_discover/yadis_2entries_idp.xml
+- test/data/test_discover/openid_1_and_2.html
+- test/data/test_discover/openid2.html
+- test/data/test_discover/openid_1_and_2_xrds_bad_delegate.xml
+- test/data/test_discover/openid.html
+- test/data/test_discover/yadis_idp_delegate.xml
+- test/data/test_discover/yadis_idp.xml
+- test/data/test_discover/openid_1_and_2_xrds.xml
+- test/data/test_discover/openid2_xrds.xml
+- test/data/test_discover/yadis_2_bad_local_id.xml
+- test/data/test_discover/openid_no_delegate.html
+- test/data/test_discover/yadis_2entries_delegate.xml
+- test/data/test_discover/openid2_xrds_no_local_id.xml
+- test/data/test_discover/yadis_no_delegate.xml
+- test/data/test_xrds/=j3h.2007.11.14.xrds
+- test/data/test_xrds/delegated-20060809.xrds
+- test/data/test_xrds/status222.xrds
 - test/data/test_xrds/README
 - test/data/test_xrds/delegated-20060809-r1.xrds
 - test/data/test_xrds/delegated-20060809-r2.xrds
-- test/data/test_xrds/delegated-20060809.xrds
-- test/data/test_xrds/no-xrd.xml
-- test/data/test_xrds/not-xrds.xml
-- test/data/test_xrds/prefixsometimes.xrds
 - test/data/test_xrds/sometimesprefix.xrds
 - test/data/test_xrds/spoof1.xrds
 - test/data/test_xrds/spoof2.xrds
 - test/data/test_xrds/spoof3.xrds
-- test/data/test_xrds/status222.xrds
 - test/data/test_xrds/valid-populated-xrds.xml
-- test/data/test_xrds/=j3h.2007.11.14.xrds
-- test/data/test_discover/openid2_xrds.xml
-- test/data/test_discover/openid.html
-- test/data/test_discover/openid2.html
-- test/data/test_discover/openid2_xrds_no_local_id.xml
-- test/data/test_discover/openid_1_and_2.html
-- test/data/test_discover/openid_1_and_2_xrds.xml
-- test/data/test_discover/openid_and_yadis.html
-- test/data/test_discover/openid_1_and_2_xrds_bad_delegate.xml
-- test/data/test_discover/openid_no_delegate.html
-- test/data/test_discover/yadis_0entries.xml
-- test/data/test_discover/yadis_2_bad_local_id.xml
-- test/data/test_discover/yadis_2entries_delegate.xml
-- test/data/test_discover/yadis_2entries_idp.xml
-- test/data/test_discover/yadis_another_delegate.xml
-- test/data/test_discover/yadis_idp.xml
-- test/data/test_discover/yadis_idp_delegate.xml
-- test/data/test_discover/yadis_no_delegate.xml
+- test/data/test_xrds/prefixsometimes.xrds
+- test/data/test_xrds/no-xrd.xml
+- test/data/test_xrds/not-xrds.xml
+- test/data/test_xrds/ref.xrds
+- NOTICE
+- CHANGELOG
 - README
 - INSTALL
-- COPYING
 - LICENSE
 - UPGRADE
 test_files: 
@@ -284,7 +285,6 @@ rdoc_options:
 extra_rdoc_files: 
 - README
 - INSTALL
-- COPYING
 - LICENSE
 - UPGRADE
 executables: []

data/COPYING

@@ -1,13 +0,0 @@
-Copyright 2006 JanRain, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you
-may not use this file except in compliance with the License. You may
-obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing
-permissions and limitations under the License.