ruby-openid 2.1.8 → 2.2.0

data/test/test_consumer.rb

@@ -1,6 +1,6 @@
-require "openid/consumer"
 require "test/unit"
 require "testutil"
+require "openid/consumer"
 
 module OpenID
   class Consumer
@@ -182,9 +182,11 @@ module OpenID
         end
 
         def test_setup_needed_openid2
-          args = {'openid.ns' => OPENID2_NS, 'openid.mode' => 'setup_needed'}
+          setup_url = 'http://setup.url/'
+          args = {'openid.ns' => OPENID2_NS, 'openid.mode' => 'setup_needed', 'openid.user_setup_url' => setup_url}
           response = @consumer.complete(args, nil)
           assert_equal(SETUP_NEEDED, response.status)
+          assert_equal(setup_url, response.setup_url)
         end
 
         def test_idres_setup_needed_openid1
@@ -195,6 +197,7 @@ module OpenID
           }
           response = @consumer.complete(args, nil)
           assert_equal(SETUP_NEEDED, response.status)
+          assert_equal(setup_url, response.setup_url)
         end
 
         def test_error

data/test/test_cryptutil.rb

@@ -1,5 +1,5 @@
 # coding: ASCII-8BIT
-require 'test/unit'
+require "test/unit"
 require "openid/cryptutil"
 require "pathname"
 

data/test/test_dh.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
-require 'openid/dh'
 require 'testutil'
+require 'openid/dh'
 
 module OpenID
   class DiffieHellmanExposed < OpenID::DiffieHellman

data/test/test_discover.rb

@@ -1,8 +1,6 @@
-
+require 'test/unit'
 require 'testutil'
 require 'util'
-
-require 'test/unit'
 require 'openid/fetchers'
 require 'openid/yadis/discovery'
 require 'openid/consumer/discovery'
@@ -48,7 +46,7 @@ module OpenID
       @responses.each { |response_set|
         @url = response_set[0].final_url
         OpenID.fetcher = SimpleMockFetcher.new(self, response_set)
-      
+
         expected_status = response_set[-1].code
         begin
           OpenID.discover(@url)

data/test/test_discovery_manager.rb

@@ -1,8 +1,6 @@
-
 require 'test/unit'
 require 'openid/consumer/discovery_manager'
 require 'openid/extras'
-
 require 'testutil'
 
 module OpenID
@@ -41,7 +39,7 @@ module OpenID
       @disco_services.next
       assert(@disco_services.started?)
       @disco_services.next
-      assert(@disco_services.started?) 
+      assert(@disco_services.started?)
       @disco_services.next
       assert(!@disco_services.started?)
     end

data/test/test_extension.rb

@@ -1,6 +1,6 @@
+require 'test/unit'
 require 'openid/extension'
 require 'openid/message'
-require 'test/unit'
 
 module OpenID
   class DummyExtension < OpenID::Extension
@@ -29,7 +29,7 @@ module OpenID
        assert_equal(DummyExtension::TEST_ALIAS,
                     namespaces.get_alias(DummyExtension::TEST_URI))
      end
- 
+
      def test_OpenID2
        oid2_msg = Message.new(OPENID2_NS)
        ext = DummyExtension.new

data/test/test_fetchers.rb

@@ -1,14 +1,10 @@
-# -*- coding: utf-8 -*-
-
+# encoding: utf-8
 require 'test/unit'
 require 'net/http'
 require 'webrick'
-
 require 'testutil'
 require 'util'
-
 require 'openid/fetchers'
-
 require 'stringio'
 
 begin
@@ -412,7 +408,7 @@ EOF
       f.fetch("https://bogus.com/")
     }
   end
-  
+
   class TestingException < OpenID::FetchingError; end
 
   class NoSSLSupportConnection
@@ -543,7 +539,7 @@ class ProxyTest < Test::Unit::TestCase
   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)

data/test/test_filters.rb

@@ -1,6 +1,8 @@
-
-require 'test/unit'
-require 'openid/yadis/filters'
+require "test/unit"
+require "testutil"
+require "rexml/document"
+require "openid/yadis/xrds"
+require "openid/yadis/filters"
 
 module OpenID
   class BasicServiceEndpointTest < Test::Unit::TestCase
@@ -12,8 +14,7 @@ module OpenID
 
       no_types_endpoint = Yadis::BasicServiceEndpoint.new(yadis_url, [], nil, nil)
 
-      some_types_endpoint = Yadis::BasicServiceEndpoint.new(yadis_url, types,
-                                                            nil, nil)
+      some_types_endpoint = Yadis::BasicServiceEndpoint.new(yadis_url, types, nil, nil)
 
       assert(no_types_endpoint.match_types([]) == [])
       assert(no_types_endpoint.match_types(["urn:absent"]) == [])
@@ -158,15 +159,14 @@ module OpenID
                    ]
 
       cf = Yadis::CompoundFilter.new(subfilters)
-      assert(cf.get_service_endpoints("unused", "unused") == all)
+      assert cf.get_service_endpoints("unused", "unused") == all
     end
   end
 
   class MakeFilterTest < Test::Unit::TestCase
     def test_parts_nil
       result = Yadis.make_filter(nil)
-      assert(result.is_a?(Yadis::TransformFilterMaker),
-             result)
+      assert result.is_a?(Yadis::TransformFilterMaker)
     end
 
     def test_parts_array
@@ -174,53 +174,49 @@ module OpenID
       e2 = Yadis::BasicServiceEndpoint.new(nil, [], nil, nil)
 
       result = Yadis.make_filter([e1, e2])
-      assert(result.is_a?(Yadis::TransformFilterMaker),
-             result)
-      assert(result.filter_procs[0] == e1.method('from_basic_service_endpoint'))
-      assert(result.filter_procs[1] == e2.method('from_basic_service_endpoint'))
+      assert result.is_a?(Yadis::TransformFilterMaker)
+      assert result.filter_procs[0] == e1.method('from_basic_service_endpoint')
+      assert result.filter_procs[1] == e2.method('from_basic_service_endpoint')
     end
 
     def test_parts_single
       e = Yadis::BasicServiceEndpoint.new(nil, [], nil, nil)
       result = Yadis.make_filter(e)
-      assert(result.is_a?(Yadis::TransformFilterMaker),
-             result)
+      assert result.is_a?(Yadis::TransformFilterMaker)
     end
   end
 
   class MakeCompoundFilterTest < Test::Unit::TestCase
     def test_no_filters
       result = Yadis.mk_compound_filter([])
-      assert(result.subfilters == [])
+      assert result.subfilters == []
     end
 
     def test_single_transform_filter
       f = Yadis::TransformFilterMaker.new([])
-      assert(Yadis.mk_compound_filter([f]) == f)
+      assert_equal f, Yadis.mk_compound_filter([f])
     end
 
     def test_single_endpoint
       e = Yadis::BasicServiceEndpoint.new(nil, [], nil, nil)
       result = Yadis.mk_compound_filter([e])
-      assert(result.is_a?(Yadis::TransformFilterMaker))
+      assert result.is_a?(Yadis::TransformFilterMaker)
 
       # Expect the transform filter to call
       # from_basic_service_endpoint on the endpoint
       filter = result.filter_procs[0]
-      assert(filter == e.method('from_basic_service_endpoint'),
-             filter)
+      assert_equal filter, e.method('from_basic_service_endpoint')
     end
 
     def test_single_proc
       # Create a proc that just returns nil for any endpoint
       p = Proc.new { |endpoint| nil }
       result = Yadis.mk_compound_filter([p])
-      assert(result.is_a?(Yadis::TransformFilterMaker))
+      assert result.is_a?(Yadis::TransformFilterMaker)
 
       # Expect the transform filter to call
       # from_basic_service_endpoint on the endpoint
-      filter = result.filter_procs[0]
-      assert(filter == p)
+      assert_equal result.filter_procs[0], p
     end
 
     def test_multiple_filters_same_type
@@ -231,8 +227,8 @@ module OpenID
       # from f1 and f2.
       result = Yadis.mk_compound_filter([f1, f2])
 
-      assert(result.is_a?(Yadis::CompoundFilter))
-      assert(result.subfilters == [f1, f2])
+      assert result.is_a?(Yadis::CompoundFilter)
+      assert result.subfilters == [f1, f2]
     end
 
     def test_multiple_filters_different_type
@@ -247,14 +243,12 @@ module OpenID
       # from f1 and f2.
       result = Yadis.mk_compound_filter([f1, f2, f3, f4])
 
-      assert(result.is_a?(Yadis::CompoundFilter))
+      assert result.is_a?(Yadis::CompoundFilter)
 
-      assert(result.subfilters[0] == f1)
-      assert(result.subfilters[1].filter_procs[0] ==
-             e.method('from_basic_service_endpoint'))
-      assert(result.subfilters[2].filter_procs[0] ==
-             f2.method('from_basic_service_endpoint'))
-      assert(result.subfilters[2].filter_procs[1] == f3)
+      assert result.subfilters[0] == f1
+      assert result.subfilters[1].filter_procs[0] == e.method('from_basic_service_endpoint')
+      assert result.subfilters[2].filter_procs[0] == f2.method('from_basic_service_endpoint')
+      assert result.subfilters[2].filter_procs[1] == f3
     end
 
     def test_filter_type_error

data/test/test_idres.rb

@@ -1,6 +1,6 @@
+require "test/unit"
 require "testutil"
 require "util"
-require "test/unit"
 require "openid/consumer/idres"
 require "openid/protocolerror"
 require "openid/store/memory"
@@ -103,21 +103,21 @@ module OpenID
         end
 
         def test_112
-          args = {'openid.assoc_handle' => 'fa1f5ff0-cde4-11dc-a183-3714bfd55ca8', 
-                  'openid.claimed_id' => 'http://binkley.lan/user/test01', 
-                  'openid.identity' => 'http://test01.binkley.lan/', 
-                  'openid.mode' => 'id_res', 
-                  'openid.ns' => 'http://specs.openid.net/auth/2.0', 
-                  'openid.ns.pape' => 'http://specs.openid.net/extensions/pape/1.0', 
-                  'openid.op_endpoint' => 'http://binkley.lan/server', 
-                  'openid.pape.auth_policies' => 'none', 
-                  'openid.pape.auth_time' => '2008-01-28T20:42:36Z', 
-                  'openid.pape.nist_auth_level' => '0', 
-                  'openid.response_nonce' => '2008-01-28T21:07:04Z99Q=', 
-                  'openid.return_to' => 'http://binkley.lan:8001/process?janrain_nonce=2008-01-28T21%3A07%3A02Z0tMIKx', 
-                  'openid.sig' => 'YJlWH4U6SroB1HoPkmEKx9AyGGg=', 
-                  'openid.signed' => 'assoc_handle,identity,response_nonce,return_to,claimed_id,op_endpoint,pape.auth_time,ns.pape,pape.nist_auth_level,pape.auth_policies' 
-	         } 
+          args = {'openid.assoc_handle' => 'fa1f5ff0-cde4-11dc-a183-3714bfd55ca8',
+                  'openid.claimed_id' => 'http://binkley.lan/user/test01',
+                  'openid.identity' => 'http://test01.binkley.lan/',
+                  'openid.mode' => 'id_res',
+                  'openid.ns' => 'http://specs.openid.net/auth/2.0',
+                  'openid.ns.pape' => 'http://specs.openid.net/extensions/pape/1.0',
+                  'openid.op_endpoint' => 'http://binkley.lan/server',
+                  'openid.pape.auth_policies' => 'none',
+                  'openid.pape.auth_time' => '2008-01-28T20:42:36Z',
+                  'openid.pape.nist_auth_level' => '0',
+                  'openid.response_nonce' => '2008-01-28T21:07:04Z99Q=',
+                  'openid.return_to' => 'http://binkley.lan:8001/process?janrain_nonce=2008-01-28T21%3A07%3A02Z0tMIKx',
+                  'openid.sig' => 'YJlWH4U6SroB1HoPkmEKx9AyGGg=',
+                  'openid.signed' => 'assoc_handle,identity,response_nonce,return_to,claimed_id,op_endpoint,pape.auth_time,ns.pape,pape.nist_auth_level,pape.auth_policies'
+	         }
           assert_equal(args['openid.ns'], OPENID2_NS)
           incoming = Message.from_post_args(args)
           assert(incoming.is_openid2)
@@ -129,7 +129,7 @@ module OpenID
           assert(expected.is_openid2)
           assert_equal(expected, car)
           assert_equal(expected_args, car.to_post_args)
-        end        
+        end
 
         def test_no_signed_list
           msg = Message.new(OPENID2_NS)

data/test/test_kvpost.rb

@@ -1,8 +1,8 @@
+require "test/unit"
+require "testutil"
 require "openid/kvpost"
 require "openid/kvform"
 require "openid/message"
-require "test/unit"
-require 'testutil'
 
 module OpenID
   class KVPostTestCase < Test::Unit::TestCase

data/test/test_message.rb

@@ -1,9 +1,7 @@
 # last synced with Python openid.test.test_message on 6/29/2007.
-
 require 'test/unit'
 require 'util'
 require 'openid/message'
-
 require 'rexml/document'
 
 module OpenID
@@ -902,6 +900,7 @@ module OpenID
         'openid.identity' => 'http://bogus.example.invalid:port/',
         'openid.assoc_handle' => 'FLUB',
         'openid.return_to' => 'Neverland',
+        'openid.ax.value.fullname' => "Bob&Smith'"
       }
 
       @action_url = 'scheme://host:port/path?query'

data/test/test_oauth.rb

@@ -1,3 +1,4 @@
+require 'test/unit'
 require 'openid/extensions/oauth'
 require 'openid/message'
 require 'openid/server'
@@ -8,7 +9,7 @@ module OpenID
   module OAuthTest
     class OAuthRequestTestCase < Test::Unit::TestCase
       def setup
-        @req = OAuth::Request.new 
+        @req = OAuth::Request.new
       end
 
       def test_construct
@@ -137,7 +138,7 @@ module OpenID
       end
 
       def test_from_success_response
-        
+
         openid_req_msg = Message.from_openid_args({
           'mode' => 'id_res',
           'ns' => OPENID2_NS,

data/test/test_openid_yadis.rb

@@ -1,4 +1,3 @@
-
 require 'test/unit'
 require 'openid/consumer/discovery'
 require 'openid/yadis/services'

data/test/test_pape.rb

@@ -1,3 +1,4 @@
+require 'test/unit'
 require 'openid/extensions/pape'
 require 'openid/message'
 require 'openid/server'
@@ -170,11 +171,11 @@ module OpenID
         assert_equal(nil, @req.auth_time)
         assert_equal([], @req.auth_policies)
       end
-      
+
       def test_parse_extension_args_strict_bogus1
         args = {'auth_policies' => 'http://foo http://bar',
                 'auth_time' => 'this one time'}
-        assert_raises(ArgumentError) { 
+        assert_raises(ArgumentError) {
           @req.parse_extension_args(args, true)
         }
       end
@@ -183,11 +184,11 @@ module OpenID
         args = {'auth_policies' => 'http://foo http://bar',
                 'auth_time' => '1983-11-05T12:30:24Z',
                 'nist_auth_level' => 'some'}
-        assert_raises(ArgumentError) { 
+        assert_raises(ArgumentError) {
           @req.parse_extension_args(args, true)
         }
       end
-      
+
       def test_parse_extension_args_strict_good
         args = {'auth_policies' => 'http://foo http://bar',
                 'auth_time' => '2007-10-11T05:25:18Z',
@@ -208,9 +209,9 @@ module OpenID
         assert_equal(nil, @req.nist_auth_level)
       end
 
-      
+
       def test_from_success_response
-        
+
         openid_req_msg = Message.from_openid_args({
           'mode' => 'id_res',
           'ns' => OPENID2_NS,

data/test/test_parsehtml.rb

@@ -1,6 +1,6 @@
-require 'test/unit'
-require "openid/yadis/parsehtml"
+require "test/unit"
 require "testutil"
+require "openid/yadis/parsehtml"
 
 module OpenID
   class ParseHTMLTestCase < Test::Unit::TestCase

data/test/test_server.rb

@@ -1,3 +1,7 @@
+require 'test/unit'
+require 'testutil'
+require 'util'
+require 'uri'
 require 'openid/server'
 require 'openid/cryptutil'
 require 'openid/association'
@@ -6,11 +10,6 @@ require 'openid/message'
 require 'openid/store/memory'
 require 'openid/dh'
 require 'openid/consumer/associationmanager'
-require 'util'
-require "testutil"
-
-require 'test/unit'
-require 'uri'
 
 # In general, if you edit or add tests here, try to move in the
 # direction of testing smaller units.  For testing the external
@@ -208,7 +207,7 @@ module OpenID
       begin
         result = @decode.call(args)
       rescue ArgumentError => err
-        assert(!err.to_s.index('values').nil?, err)
+        assert !err.to_s.index('values').nil?
       else
         flunk("Expected ArgumentError, but got result #{result}")
       end
@@ -1008,7 +1007,7 @@ module OpenID
       assert(webresponse.headers.has_key?('location'))
       location = webresponse.headers['location']
       query = Util.parse_query(URI::parse(location).query)
-      assert(!query.has_key?('openid.sig'), response.fields.to_post_args())
+      assert !query.has_key?('openid.sig')
     end
 
     def test_assocReply
@@ -1530,7 +1529,7 @@ module OpenID
                    {'blue' => 'star',
                      'mode' => 'id_res',
                    })
-      
+
       assert_equal(@response.fields.get_args(namespace),
                    {'bright' => 'potato'})
     end
@@ -1613,7 +1612,7 @@ module OpenID
       r = @request.answer(@signatory)
       assert_equal({'is_valid' => 'false'},
                    r.fields.get_args(OPENID_NS))
-      
+
     end
 
     def test_replay
@@ -1750,7 +1749,7 @@ module OpenID
                            invalid_s1,
                            invalid_s1_2,
                           ]
-            
+
       bad_request_argss.each { |request_args|
         message = Message.from_post_args(request_args)
         assert_raise(Server::ProtocolError) {
@@ -2299,8 +2298,7 @@ module OpenID
         verified = @signatory.verify(assoc_handle, signed)
       }
 
-      assert(!verified)
-      #assert(@messages)
+      assert !verified
     end
 
     def test_verifyAssocMismatch
@@ -2322,16 +2320,14 @@ module OpenID
         verified = @signatory.verify(assoc_handle, signed)
       }
 
-      assert(!verified)
-      #assert(@messages)
+      assert !verified
     end
 
     def test_getAssoc
       assoc_handle = makeAssoc(true)
       assoc = @signatory.get_association(assoc_handle, true)
-      assert(assoc)
-      assert_equal(assoc.handle, assoc_handle)
-      # @failIf(@messages, @messages)
+      assert assoc
+      assert_equal assoc.handle, assoc_handle
     end
 
     def test_getAssocExpired
@@ -2340,8 +2336,7 @@ module OpenID
       silence_logging {
         assoc = @signatory.get_association(assoc_handle, true)
       }
-      assert(!assoc, assoc)
-      # assert(@messages)
+      assert !assoc
     end
 
     def test_getAssocInvalid
@@ -2428,7 +2423,7 @@ module OpenID
                     'openid.assoc_type' => 'HMAC-SHA1'}
       areq = @server.decode_request(assoc_args)
       aresp = @server.handle_request(areq)
-      
+
       amess = aresp.fields
       assert(amess.is_openid1)
       ahandle = amess.get_arg(OPENID_NS, 'assoc_handle')
@@ -2441,7 +2436,7 @@ module OpenID
                       'openid.return_to' => 'http://example.com/openid/consumer',
                       'openid.assoc_handle' => ahandle,
                       'openid.identity' => 'http://foo.com/'}
-      
+
       cireq = @server.decode_request(checkid_args)
       ciresp = cireq.answer(true)
 
@@ -2449,7 +2444,7 @@ module OpenID
 
       assert_equal(assoc.get_message_signature(signed_resp.fields),
                    signed_resp.fields.get_arg(OPENID_NS, 'sig'))
-                   
+
       assert(assoc.check_message_signature(signed_resp.fields))
     end