ruby-openid 2.0.2 → 2.0.3

data/CHANGELOG

@@ -1,215 +1,60 @@
-Mon Jan 23 12:48:00 PST 2006  brian@janrain.com
-  * fixed bug in expiresIn.  added expired? method
+Fri Jan 11 11:31:29 PST 2008  cygnus@janrain.com
+  tagged 2.0.3
 
-    M ./lib/openid/filestore.rb -1 +1
-    M ./lib/openid/stores.rb +4
+Fri Jan 11 11:29:57 PST 2008  cygnus@janrain.com
+  * Set version to 2.0.3
 
-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.
+Thu Jan 10 15:23:31 PST 2008  Kevin Turner <kevin@janrain.com>
+  * UPGRADE: formatting
 
-    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
+Thu Jan 10 15:18:17 PST 2008  Kevin Turner <kevin@janrain.com>
+  * Consumer.Response: documentation for identity_url and display_identifier
+  
+  Too bad that rdoc doesn't automatically display this in the documentation for
+  SuccessResponse; you have to follow the link to the Response docs.
 
-Wed Dec 28 15:47:51 PST 2005  brian@janrain.com
-  * code cleanup
+Tue Jan  8 16:14:56 PST 2008  Kevin Turner <kevin@janrain.com>
+  * examples/discover: correct namespace of DiscoveryFailure
 
-    M ./lib/openid/consumer.rb -5
+Thu Jan 10 10:15:04 PST 2008  cygnus@janrain.com
+  * Catch HTTPStatusError when making KV post in association manager
 
-Wed Dec 28 15:29:31 PST 2005  brian@janrain.com
-  * added linkparse to test suite script
+Wed Jan  9 17:39:53 PST 2008  cygnus@janrain.com
+  * Fix FetchRequest.ns_uri
 
-    M ./test/runtests -1 +1
+Wed Jan  9 17:02:49 PST 2008  cygnus@janrain.com
+  * Fix FetchResponse.from_success_response, assign correct NS_URI value for AX messages
 
-Wed Dec 28 15:29:07 PST 2005  brian@janrain.com
-  * added link parsing tests, lots of em
+Tue Jan  8 15:46:43 PST 2008  Kevin Turner <kevin@janrain.com>
+  * examples/rails_openid/app/controllers: render_text was deprecated, use render :text.
 
-    A ./test/linkparse.rb
+Tue Jan  8 13:56:39 PST 2008  Kevin Turner <kevin@janrain.com>
+  * Yadis.discover: add more information to exception messages.
 
-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
+Mon Jan  7 18:48:50 PST 2008  Kevin Turner <kevin@janrain.com>
+  * OpenIDServiceEndpoint.display_identifier: leave off the fragment from claimed_id.  [#99]
 
-    M ./lib/openid/parse.rb -5 +13
+Tue Jan  8 09:32:27 PST 2008  http://j3h.us/
+  * MalformedTrustRoot raised by the library now gets passed the OpenID Message object instead of nil
 
-Tue Dec 27 16:11:09 PST 2005  brian@janrain.com
-  * added more tests for openid/util
+Fri Dec 21 15:05:32 PST 2007  http://j3h.us/
+  * whitespace
 
-    M ./test/dh.rb -2 +1
-    M ./test/runtests +1
-    A ./test/util.rb
+Mon Jan  7 17:40:45 PST 2008  Kevin Turner <kevin@janrain.com>
+  * Yadis: remove mkXRDTag, mkXRDSTag.  These don't seem to make as much sense with REXML as they did with ElementTree.
 
-Tue Dec 27 16:10:28 PST 2005  brian@janrain.com
-  * change util methods to use all use /dev/urandom if available
+Mon Jan  7 17:33:41 PST 2008  Kevin Turner <kevin@janrain.com>
+  * remove comment applicable to Python
 
-    M ./lib/openid/util.rb -15 +35
+Mon Jan  7 17:00:17 PST 2008  Kevin Turner <kevin@janrain.com>
+  * test_xrds: add test for Yadis.get_canonical_id with subsegments [#93]
 
-Tue Dec 27 16:09:53 PST 2005  brian@janrain.com
-  * changed tmp pathname to something more useful
+Fri Dec 28 16:25:19 PST 2007  Kevin Turner <kevin@janrain.com>
+  * Yadis::get_canonical_id: fixes for delegated xris [#93]
+  patch contributed by =masaki
 
-    M ./examples/consumer.rb -1 +1
+Thu Jan  3 14:46:44 PST 2008  Kevin Turner <kevin@janrain.com>
+  * examples/discover: correct fetcher_use_env_http_proxy
 
-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
+Fri Dec 21 20:44:22 PST 2007  Kevin Turner <kevin@janrain.com>
+  tagged 2.0.2

data/UPGRADE

@@ -1,12 +1,13 @@
-== Upgrading from the OpenID 1.x series library
+= Upgrading from the OpenID 1.x series library
 
-= Consumer Upgrade
+== Consumer Upgrade
 
 The flow is largely the same, however there are a number of significant 
 changes.  The consumer example is helpful to look at:
 examples/ruby_openid/app/controllers/consumer_controller.rb
 
-+ Stores
+
+=== Stores
 
 You will need to require the file for the store that you are using.
 For the filesystem store, this is 'openid/stores/filesystem'
@@ -22,7 +23,7 @@ Also, note that the stores now can be garbage collected with the method
   store.cleanup
 
 
-+ Starting the OpenID transaction
+=== Starting the OpenID transaction
 
 The OpenIDRequest object no longer has status codes.  Instead,
 consumer.begin raises an OpenID::OpenIDError if there is a problem
@@ -56,7 +57,8 @@ additional arguments to the return_to url, use
 Generating the redirect is the same as before, but add any extensions
 first.
 
-+ Requesting Simple Registration Data
+
+=== Requesting Simple Registration Data
 
 You'll need to require the code for the extension
   require 'openid/extensions/sreg'
@@ -74,7 +76,8 @@ Exchange (AX) and Provider Authentication Policy Extension (PAPE) are
 included with the library, and additional extensions can be implemented
 subclassing OpenID::Extension.
 
-+ Completing the transaction
+
+=== Completing the transaction
 
 The return_to and its arguments are verified, so you need to pass in
 the base URL and the arguments.  With Rails, the params method mashes
@@ -102,7 +105,9 @@ with
   nickname = sreg_response['nickname']
   # etc.
 
+
 == Server Upgrade
+
 The server code is mostly the same as before, with the exception of
 extensions.  Also, you must pass in the endpoint URL to the server 
 constructor:

data/examples/discover

@@ -2,7 +2,7 @@
 require "openid/consumer/discovery"
 require 'openid/fetchers'
 
-OpenID::fetcher_use_env_proxy
+OpenID::fetcher_use_env_http_proxy
 
 $names = [[:server_url,   "Server URL  "],
           [:local_id,     "Local ID    "],
@@ -40,7 +40,7 @@ ARGV.each do |openid_identifier|
   puts "Running discovery on #{openid_identifier}"
   begin
     normalized_identifier, services = OpenID.discover(openid_identifier)
-  rescue OpenID::Yadis::DiscoveryFailure => why
+  rescue OpenID::DiscoveryFailure => why
     puts "Discovery failed: #{why.message}"
     puts
   else

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

@@ -23,13 +23,13 @@ class ServerController < ApplicationController
       oidreq = server.decode_request(params)
     rescue ProtocolError => e
       # invalid openid request, so just display a page with an error message
-      render_text e.to_s
+      render :text => e.to_s, :status => 500
       return
     end
 
     # no openid.mode was given
     unless oidreq
-      render_text "This is an OpenID server endpoint."
+      render :text => "This is an OpenID server endpoint."
       return
     end
 
@@ -114,7 +114,7 @@ EOS
     # Also add the Yadis location header, so that they don't have
     # to parse the html unless absolutely necessary.
     response.headers['X-XRDS-Location'] = xrds_url
-    render_text identity_page
+    render :text => identity_page
   end
 
   def user_xrds
@@ -214,7 +214,7 @@ EOS
 EOS
 
     response.headers['content-type'] = 'application/xrds+xml'
-    render_text yadis
+    render :text => yadis
   end
 
   def add_sreg(oidreq, oidresp)

data/lib/openid/consumer/associationmanager.rb

@@ -187,10 +187,12 @@ module OpenID
       def request_association(assoc_type, session_type)
         assoc_session, args = create_associate_request(assoc_type, session_type)
 
-        response = OpenID.make_kv_post(args, @server_url)
-
         begin
+          response = OpenID.make_kv_post(args, @server_url)
           return extract_association(response, assoc_session)
+        rescue HTTPStatusError => why
+          Util.log("Got HTTP status error when requesting association: #{why}")
+          return nil
         rescue Message::KeyNotFound => why
           Util.log("Missing required parameter in response from "\
                    "#{@server_url}: #{why}")

data/lib/openid/consumer/checkid_request.rb

@@ -13,7 +13,7 @@ module OpenID
     # server. It also has serialization options that let you encode
     # the authentication request as a URL or as a form POST.
     class CheckIDRequest
-      attr_accessor :return_to_args
+      attr_accessor :return_to_args, :message
       attr_reader :endpoint
 
       # Users of this library should not create instances of this

data/lib/openid/consumer/discovery.rb

@@ -56,7 +56,13 @@ module OpenID
     end
 
     def display_identifier
-      @display_identifier || @claimed_id
+      return @display_identifier if @display_identifier
+      return @claimed_id if @claimed_id.nil? or not URI.parse(@claimed_id).fragment
+
+      disp = URI.parse(@claimed_id)
+      disp.fragment = nil
+
+      return disp.to_s
     end
 
     def display_identifier=(display_identifier)
@@ -114,11 +120,6 @@ module OpenID
     def get_local_id
       # Return the identifier that should be sent as the
       # openid.identity parameter to the server.
-
-      # I looked at this conditional and thought "ah-hah! there's the
-      # bug!"  but Python actually makes that one big expression
-      # somehow, i.e.  "x is x is x" is not the same thing as "(x is
-      # x) is x".  That's pretty weird, dude.  -- kmt, 1/07
       if @local_id.nil? and @canonical_id.nil?
         return @claimed_id
       else

data/lib/openid/consumer/responses.rb

@@ -26,10 +26,25 @@ module OpenID
         self.class::STATUS
       end
 
+      # The identity URL that has been authenticated; the Claimed Identifier.
+      # See also display_identifier.
       def identity_url
         @endpoint ? @endpoint.claimed_id : nil
       end
 
+      # The display identifier is related to the Claimed Identifier, but the
+      # two are not always identical.  The display identifier is something the
+      # user should recognize as what they entered, whereas the response's
+      # claimed identifier (in the identity_url attribute) may have extra
+      # information for better persistence.
+      #
+      # URLs will be stripped of their fragments for display.  XRIs will
+      # display the human-readable identifier (i-name) instead of the
+      # persistent identifier (i-number).
+      #
+      # Use the display identifier in your user interface.  Use identity_url
+      # for querying your database or authorization server, or other
+      # identifier equality comparisons.
       def display_identifier
         @endpoint ? @endpoint.display_identifier : nil
       end

data/lib/openid/extensions/ax.rb

@@ -29,6 +29,7 @@ module OpenID
       NS_URI = 'http://openid.net/srv/ax/1.0'
       def initialize
         @ns_alias = 'ax'
+        @ns_uri = NS_URI
         @mode = nil
       end
 
@@ -111,6 +112,7 @@ module OpenID
       attr_accessor :update_url
 
       def initialize(update_url = nil)
+        super()
         @mode = 'fetch_request'
         @requested_attributes = {}
         @update_url = update_url
@@ -262,6 +264,7 @@ module OpenID
     class KeyValueMessage < AXMessage
       attr_reader :data
       def initialize
+        super()
         @mode = nil
         @data = {}
         @data.default = []
@@ -446,12 +449,19 @@ module OpenID
       # Construct a FetchResponse object from an OpenID library
       # SuccessResponse object.
       def self.from_success_response(success_response, signed=true)
+        obj = self.new
         if signed
-          ax_args = success_response.get_signed_ns(@ns_uri)
+          ax_args = success_response.get_signed_ns(obj.ns_uri)
         else
-          ax_args = success_response.message.get_args(@ns_uri)
+          ax_args = success_response.message.get_args(obj.ns_uri)
+        end
+
+        begin
+          obj.parse_extension_args(ax_args)
+          return obj
+        rescue Error => e
+          return nil
         end
-        new.parse_extension_args(ax_args)
       end
     end
 

data/lib/openid/server.rb

@@ -576,7 +576,7 @@ module OpenID
 
         tr = TrustRoot::TrustRoot.parse(@trust_root)
         if !tr
-          raise MalformedTrustRoot.new(nil, @trust_root)
+          raise MalformedTrustRoot.new(@message, @trust_root)
         end
 
         if @return_to

data/lib/openid/util.rb

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

data/lib/openid/yadis/discovery.rb

@@ -76,12 +76,12 @@ module OpenID
       begin
         resp = OpenID.fetch(uri, nil, {'Accept' => YADIS_ACCEPT_HEADER})
       rescue Exception
-        raise DiscoveryFailure.new("Failed to fetch identity URL.",$!)
+        raise DiscoveryFailure.new("Failed to fetch identity URL #{uri} : #{$!}", $!)
       end
       if resp.code != "200"
         raise DiscoveryFailure.new(
-                "HTTP Response status from identity URL host is not \"200\""\
-                ". Got status #{resp.code.inspect}", resp)
+                "HTTP Response status from identity URL host is not \"200\"."\
+                "Got status #{resp.code.inspect} for #{resp.final_url}", resp)
       end
 
       # Note the URL after following redirects
@@ -97,12 +97,12 @@ module OpenID
         begin
           resp = OpenID.fetch(result.xrds_uri)
         rescue
-          raise DiscoveryFailure.new("Failed to fetch Yadis URL.", $!)
+          raise DiscoveryFailure.new("Failed to fetch Yadis URL #{result.xrds_uri} : #{$!}", $!)
         end
         if resp.code != "200"
             exc = DiscoveryFailure.new(
                     "HTTP Response status from Yadis host is not \"200\". " +
-                    "Got status #{resp.code.inspect}", resp)
+                                       "Got status #{resp.code.inspect} for #{resp.final_url}", resp)
             exc.identity_url = result.normalized_uri
             raise exc
         end

data/lib/openid/yadis/xrds.rb

@@ -2,6 +2,8 @@ require 'rexml/document'
 require 'rexml/element'
 require 'rexml/xpath'
 
+require 'openid/yadis/xri'
+
 module OpenID
   module Yadis
 
@@ -65,8 +67,8 @@ module OpenID
         parent_sought = childID[0...childID.rindex('!')]
 
         parent_list = []
-        xrd.elements.each_element(CANONICALID_TAG) { |c|
-          XRI.make_xri(c.text)
+        xrd.elements.each("CanonicalID") { |c|
+          parent_list.push(XRI.make_xri(c.text))
         }
 
         if !parent_list.member?(parent_sought)
@@ -85,21 +87,6 @@ module OpenID
       return canonicalID
     end
 
-    def Yadis::mkXRDSTag(name)
-      e = REXML::Element.new('xrds:' + name)
-      e.add_namespace('xrds', XRDS_NS)
-      return e
-    end
-
-    def Yadis::mkXRDTag(name)
-      e = REXML::Element.new('xrd:' + name)
-      e.add_namespace('xrd', XRD_NS_2_0)
-      return e
-    end
-
-    ROOT_TAG = Yadis::mkXRDSTag('XRDS')
-    CANONICALID_TAG = mkXRDTag('CanonicalID')
-
     class XRDSError < StandardError
     end
 
@@ -124,8 +111,8 @@ module OpenID
     def Yadis::is_xrds?(xrds_tree)
       xrds_root = xrds_tree.root
       return (!xrds_root.nil? and
-        xrds_root.name == ROOT_TAG.name and
-        xrds_root.namespace == ROOT_TAG.namespace)
+        xrds_root.name == 'XRDS' and
+        xrds_root.namespace == XRDS_NS)
     end
 
     def Yadis::get_yadis_xrd(xrds_tree)

data/test/data/test_xrds/subsegments.xrds

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XRDS ref="xri://=nishitani*masaki" xmlns="xri://$xrds">
+ <XRD xmlns="xri://$xrd*($v*2.0)">
+  <Query>*nishitani</Query>
+  <Status code="100"/>
+  <Expires>2007-12-25T11:33:39.000Z</Expires>
+  <ProviderID>xri://=</ProviderID>
+  <LocalID priority="10">!E117.EF2F.454B.C707</LocalID>
+  <CanonicalID priority="10">=!E117.EF2F.454B.C707</CanonicalID>
+  <Service priority="10">
+   <Type select="true">http://openid.net/signon/1.0</Type>
+   <ProviderID>xri://!!1003!103</ProviderID>
+   <URI append="none" priority="1">https://linksafe.ezibroker.net/server/</URI>
+  </Service>
+  <Service priority="10">
+   <Type select="true">xri://$res*auth*($v*2.0)</Type>
+   <ProviderID>xri://!!1003!103</ProviderID>
+   <MediaType>application/xrds+xml;trust=none</MediaType>
+   <URI priority="10">http://resolve.ezibroker.net/resolve/=nishitani/</URI>
+  </Service>
+  <Service priority="1">
+   <Type match="content" select="true">xri://+i-service*(+forwarding)*($v*1.0)</Type>
+   <Type match="null" select="false"/>
+   <ProviderID>xri://!!1003!103</ProviderID>
+   <Path match="content">(+index)</Path>
+   <Path match="default"/>
+   <URI append="qxri" priority="1">http://linksafe-forward.ezibroker.net/forwarding/</URI>
+  </Service>
+ </XRD>
+ <XRD xmlns="xri://$xrd*($v*2.0)">
+  <Query>*masaki</Query>
+  <Status code="100">SUCCESS</Status>
+  <ProviderID>xri://!!1003</ProviderID>
+  <LocalID>!0000.0000.3B9A.CA01</LocalID>
+  <CanonicalID>=!E117.EF2F.454B.C707!0000.0000.3B9A.CA01</CanonicalID>
+  <Service>
+   <Type select="true">http://openid.net/signon/1.0</Type>
+   <ProviderID>xri://!!1003!103</ProviderID>
+   <URI append="none" priority="1">https://linksafe.ezibroker.net/server/</URI>
+  </Service>
+  <Service>
+   <Type select="true">xri://+i-service*(+contact)*($v*1.0)</Type>
+   <Type match="null"/>
+   <ProviderID>xri://!!1003!103</ProviderID>
+   <Path select="true">(+contact)</Path>
+   <Path match="null"/>
+   <URI append="authority" priority="1">http://linksafe-contact.ezibroker.net/contact/</URI>
+  </Service>
+  <Service priority="1">
+   <Type match="content" select="true">xri://+i-service*(+forwarding)*($v*1.0)</Type>
+   <Type match="null" select="false"/>
+   <ProviderID>xri://!!1003!103</ProviderID>
+   <Path match="content">(+index)</Path>
+   <Path match="default"/>
+   <URI append="qxri" priority="1">http://linksafe-forward.ezibroker.net/forwarding/</URI>
+  </Service>
+ </XRD>
+</XRDS>

data/test/test_associationmanager.rb

@@ -800,6 +800,9 @@ module OpenID
   end
 
   class TestAssocManagerGetAssociation < Test::Unit::TestCase
+    include FetcherMixin
+    include TestUtil
+
     attr_reader :negotiate_association
 
     def setup
@@ -839,6 +842,21 @@ module OpenID
       @store.store_association(@server_url, @assoc)
       assert_equal(@assoc, @assoc_manager.get_association)
     end
+
+    def test_request_assoc_with_status_error
+      fetcher_class = Class.new do
+        define_method(:fetch) do |*args|
+          MockResponse.new(500, '')
+        end
+      end
+      with_fetcher(fetcher_class.new) do
+        assert_log_matches('Got HTTP status error when requesting') {
+          result = @assoc_manager.send(:request_association, 'HMAC-SHA1',
+                                       'no-encryption')
+          assert(result.nil?)
+        }
+      end
+    end
   end
 
   class TestAssocManagerRequestAssociation < Test::Unit::TestCase

data/test/test_ax.rb

@@ -1,5 +1,8 @@
 require 'openid/extensions/ax'
 require 'openid/message'
+require 'openid/consumer/responses'
+require 'openid/consumer/discovery'
+require 'openid/consumer/checkid_request'
 
 module OpenID
   module AX
@@ -430,6 +433,32 @@ module OpenID
         assert(fr.is_a?(FetchRequest))
       end
 
+      def test_add_extension
+        openid_req_msg = Message.from_openid_args({
+                                                    'mode' => 'checkid_setup',
+                                                    'ns' => OPENID2_NS,
+                                                    'return_to' => 'http://example.com/realm',
+                                                  })
+
+        e = OpenID::OpenIDServiceEndpoint.new
+        openid_req = Consumer::CheckIDRequest.new(nil, e)
+        openid_req.message = openid_req_msg
+
+        fr = FetchRequest.new
+        fr.add(AttrInfo.new("urn:bogus"))
+
+        openid_req.add_extension(fr)
+
+        expected = {
+          'mode' => 'fetch_request',
+          'if_available' => 'ext0',
+          'type.ext0' => 'urn:bogus',
+        }
+
+        expected.each { |k,v|
+          assert(openid_req.message.get_arg(AXMessage::NS_URI, k) == v)
+        }
+      end
     end
 
     class FetchResponseTest < Test::Unit::TestCase
@@ -522,6 +551,38 @@ module OpenID
         assert_raises(Error) { @msg.get_single(@type_a) }
       end
 
+      def test_from_success_response
+        uri = 'http://under.the.sea/'
+        name = 'ext0'
+        value = 'snarfblat'
+
+        m = OpenID::Message.from_openid_args({
+                                               'mode' => 'id_res',
+                                               'ns' => OPENID2_NS,
+                                               'ns.ax' => AXMessage::NS_URI,
+                                               'ax.update_url' => 'http://example.com/realm/update_path',
+                                               'ax.mode' => 'fetch_response',
+                                               'ax.type.' + name => uri,
+                                               'ax.count.' + name => '1',
+                                               'ax.value.' + name + '.1' => value,
+                                             })
+
+        e = OpenID::OpenIDServiceEndpoint.new()
+        resp = OpenID::Consumer::SuccessResponse.new(e, m, [])
+
+        ax_resp = FetchResponse.from_success_response(resp, false)
+
+        values = ax_resp[uri]
+        assert_equal(values, [value])
+      end
+
+      def test_from_success_response_empty
+        e = OpenID::OpenIDServiceEndpoint.new()
+        m = OpenID::Message.from_openid_args({'mode' => 'id_res'})
+        resp = OpenID::Consumer::SuccessResponse.new(e, m, [])
+        ax_resp = FetchResponse.from_success_response(resp)
+        assert(ax_resp.nil?)
+      end
     end
 
     class StoreRequestTest < Test::Unit::TestCase

data/test/test_discover.rb

@@ -769,4 +769,12 @@ module OpenID
                              OPENID_IDP_2_0_TYPE)
     end
   end
+
+  class TestEndpointDisplayIdentifier < Test::Unit::TestCase
+    def test_strip_fragment
+      @endpoint = OpenIDServiceEndpoint.new()
+      @endpoint.claimed_id = 'http://recycled.invalid/#123'
+      assert_equal 'http://recycled.invalid/', @endpoint.display_identifier
+    end
+  end
 end

data/test/test_idres.rb

@@ -320,7 +320,7 @@ module OpenID
             msg = Message.new(OPENID2_NS)
             raise ServerError.from_message(msg), 'For you!'
           end
-            
+
           OpenID.with_method_overridden(:make_kv_post, send_error) do
             assert_protocol_error("Error from") {
               call_check_auth do |idres|
@@ -337,7 +337,7 @@ module OpenID
             me.assert_equal(:req, req)
             :expected_response
           end
-            
+
           OpenID.with_method_overridden(:make_kv_post, send_resp) do
             final_resp = call_check_auth do |idres|
               idres.instance_def(:create_check_auth_request) {

data/test/test_server.rb

@@ -975,9 +975,14 @@ module OpenID
 
     def test_trustRootInvalid_modified
       @request.trust_root = "does://not.parse/"
-      assert_raise(Server::MalformedTrustRoot) {
-        @request.trust_root_valid()
-      }
+      @request.message = :sentinel
+      begin
+        result = @request.trust_root_valid
+      rescue Server::MalformedTrustRoot => why
+        assert_equal(:sentinel, why.openid_message)
+      else
+        flunk("Expected MalformedTrustRoot, got #{result.inspect}")
+      end
     end
 
     def test_trustRootvalid_absent_trust_root

data/test/test_xrds.rb

@@ -156,5 +156,14 @@ END
         assert_same e7, sorted[3]
       end
     end
+
+    class GetCanonicalIDTestCase < Test::Unit::TestCase
+      include XRDSTestMixin
+
+      def test_multisegment_xri
+        xmldoc = Yadis.parseXRDS(read_data_file('subsegments.xrds'))
+        result = Yadis.get_canonical_id('xri://=nishitani*masaki', xmldoc)
+      end
+    end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-openid
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
-date: 2007-12-21 00:00:00 -08:00
+  version: 2.0.3
+date: 2008-01-11 00:00:00 -08:00
 summary: A library for consuming and serving OpenID identities.
 require_paths: 
 - lib
@@ -29,248 +29,249 @@ 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
-- examples/rails_openid_login_generator/USAGE
+- 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/rails_openid_login_generator/USAGE
 - examples/rails_openid_login_generator/openid_login_generator.rb
-- examples/rails_openid_login_generator/templates
-- examples/rails_openid_login_generator/templates/controller_test.rb
+- examples/rails_openid_login_generator/templates/user.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/user.rb
-- examples/rails_openid_login_generator/templates/openid_login_system.rb
+- examples/rails_openid_login_generator/templates/view_logout.rhtml
 - examples/rails_openid_login_generator/templates/view_welcome.rhtml
-- examples/rails_openid_login_generator/templates/users.yml
+- examples/rails_openid_login_generator/templates/controller_test.rb
 - examples/rails_openid_login_generator/templates/user_test.rb
-- examples/rails_openid_login_generator/templates/helper.rb
-- examples/rails_openid/db
+- 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/db
 - examples/rails_openid/doc
 - examples/rails_openid/lib
 - examples/rails_openid/log
-- examples/rails_openid/test
-- 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/test
 - examples/rails_openid/vendor
-- examples/rails_openid/app/views
+- examples/rails_openid/Rakefile
+- examples/rails_openid/README
 - examples/rails_openid/app/controllers
-- examples/rails_openid/app/models
 - examples/rails_openid/app/helpers
-- examples/rails_openid/app/views/login
+- 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/views/consumer
+- examples/rails_openid/app/views/login
 - examples/rails_openid/app/views/server
-- examples/rails_openid/app/views/login/index.rhtml
+- examples/rails_openid/app/views/consumer
 - examples/rails_openid/app/views/layouts/server.rhtml
+- examples/rails_openid/app/views/login/index.rhtml
+- examples/rails_openid/app/views/server/decide.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/environment.rb
 - examples/rails_openid/config/boot.rb
-- examples/rails_openid/config/environments/test.rb
+- examples/rails_openid/config/environment.rb
+- examples/rails_openid/config/routes.rb
 - examples/rails_openid/config/environments/development.rb
 - examples/rails_openid/config/environments/production.rb
-- examples/rails_openid/public/favicon.ico
-- examples/rails_openid/public/404.html
-- examples/rails_openid/public/stylesheets
-- examples/rails_openid/public/javascripts
-- examples/rails_openid/public/robots.txt
+- 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/dispatch.fcgi
+- examples/rails_openid/public/javascripts
+- examples/rails_openid/public/stylesheets
+- examples/rails_openid/public/dispatch.cgi
+- examples/rails_openid/public/404.html
 - examples/rails_openid/public/500.html
+- examples/rails_openid/public/dispatch.fcgi
 - examples/rails_openid/public/dispatch.rb
-- examples/rails_openid/public/dispatch.cgi
-- examples/rails_openid/public/javascripts/prototype.js
+- 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/javascripts/controls.js
-- examples/rails_openid/public/javascripts/effects.js
 - examples/rails_openid/public/javascripts/dragdrop.js
-- examples/rails_openid/public/images/openid_login_bg.gif
+- 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/script/console
-- examples/rails_openid/script/destroy
 - examples/rails_openid/script/about
-- examples/rails_openid/script/generate
 - examples/rails_openid/script/breakpointer
+- examples/rails_openid/script/destroy
+- examples/rails_openid/script/generate
 - examples/rails_openid/script/plugin
-- examples/rails_openid/script/server
 - 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/spinner
-- examples/rails_openid/script/process/reaper
+- examples/rails_openid/script/server
 - 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
+- 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
 - lib/hmac
 - lib/openid.rb
-- lib/openid
-- lib/hmac/sha1.rb
-- lib/hmac/sha2.rb
-- lib/hmac/hmac.rb
-- lib/openid/kvform.rb
+- lib/openid/cryptutil.rb
+- lib/openid/extras.rb
 - lib/openid/urinorm.rb
+- lib/openid/util.rb
+- lib/openid/trustroot.rb
 - lib/openid/message.rb
-- lib/openid/association.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/store
-- lib/openid/yadis
-- lib/openid/server.rb
-- lib/openid/trustroot.rb
-- lib/openid/consumer.rb
 - lib/openid/kvpost.rb
-- lib/openid/consumer
+- lib/openid/extensions
 - lib/openid/protocolerror.rb
+- lib/openid/server.rb
 - lib/openid/extension.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/consumer.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/xrires.rb
-- lib/openid/yadis/filters.rb
+- lib/openid/yadis/discovery.rb
 - lib/openid/yadis/xri.rb
+- lib/openid/yadis/xrires.rb
 - lib/openid/yadis/services.rb
-- lib/openid/consumer/discovery.rb
 - lib/openid/consumer/html_parse.rb
-- lib/openid/consumer/discovery_manager.rb
 - lib/openid/consumer/idres.rb
-- lib/openid/consumer/responses.rb
-- lib/openid/consumer/checkid_request.rb
 - lib/openid/consumer/associationmanager.rb
-- lib/openid/extensions/ax.rb
+- lib/openid/consumer/discovery.rb
+- lib/openid/consumer/discovery_manager.rb
+- lib/openid/consumer/checkid_request.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/extensions/ax.rb
 - lib/openid/extensions/pape.rb
+- lib/hmac/hmac.rb
+- lib/hmac/sha1.rb
+- lib/hmac/sha2.rb
 - test/data
-- test/test_nonce.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_linkparse.rb
+- test/test_urinorm.rb
+- test/testutil.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/test_message.rb
+- test/test_cryptutil.rb
+- test/test_extras.rb
 - test/util.rb
-- test/test_xri.rb
 - test/test_trustroot.rb
-- test/test_extras.rb
+- test/test_parsehtml.rb
 - test/test_fetchers.rb
-- test/test_associationmanager.rb
-- test/testutil.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_server.rb
+- test/test_yadis_discovery.rb
+- test/test_sreg.rb
+- test/test_idres.rb
+- test/test_ax.rb
+- test/test_xri.rb
+- test/test_xrires.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/test_discover
-- test/data/linkparse.txt
+- test/data/trustroot.txt
 - test/data/dh.txt
-- test/data/accept.txt
 - test/data/test1-parsehtml.txt
-- test/data/urinorm.txt
+- test/data/linkparse.txt
+- test/data/accept.txt
+- test/data/test_discover
 - test/data/example-xrds.xml
-- test/data/trustroot.txt
-- test/data/test_xrds
 - test/data/test1-discover.txt
-- 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/ref.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/prefixsometimes.xrds
-- test/data/test_xrds/no-xrd.xml
-- test/data/test_xrds/not-xrds.xml
-- test/data/test_xrds/ref.xrds
+- test/data/test_xrds/=j3h.2007.11.14.xrds
+- test/data/test_xrds/subsegments.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
 - NOTICE
 - CHANGELOG
 - README