@@ -141,7 +141,7 @@ def _test_success(server_url, user_url, delegate_url, links, immediate=False):
141141 endpoint = OpenIDServiceEndpoint ()
142142 endpoint .claimed_id = user_url
143143 endpoint .server_url = server_url
144- endpoint .delegate = delegate_url
144+ endpoint .local_id = delegate_url
145145
146146 fetcher = TestFetcher (None , None , assocs [0 ])
147147 fetchers .setDefaultFetcher (fetcher , wrap_exceptions = False )
@@ -267,7 +267,7 @@ def setUp(self):
267267 self .endpoint = OpenIDServiceEndpoint ()
268268 self .endpoint .claimed_id = self .consumer_id = "consu"
269269 self .endpoint .server_url = self .server_url = "serlie"
270- self .endpoint .delegate = self .server_id = "sirod"
270+ self .endpoint .local_id = self .server_id = "sirod"
271271
272272
273273
@@ -421,18 +421,24 @@ def setUp(self):
421421 self .server_url = "http://idp.unittest/"
422422 CatchLogs .setUp (self )
423423
424+ claimed_id = 'bogus.claimed'
425+
424426 self .message = Message .fromPostArgs (
425427 {'openid.mode' : 'id_res' ,
426428 'openid.return_to' : 'return_to (just anything)' ,
427- 'openid.identity' : 'something something' ,
429+ 'openid.identity' : claimed_id ,
428430 'openid.assoc_handle' : 'does not matter' ,
429431 'openid.sig' : GOODSIG ,
430432 'openid.response_nonce' : mkNonce (),
431- 'openid.signed' : 'identity,return_to,response_nonce' ,
433+ 'openid.signed' : 'identity,return_to,response_nonce,assoc_handle,claimed_id' ,
434+ 'openid.claimed_id' : claimed_id ,
435+ 'openid.op_endpoint' : self .server_url ,
432436 'openid.ns' :OPENID2_NS ,
433437 })
438+
434439 self .endpoint = OpenIDServiceEndpoint ()
435440 self .endpoint .server_url = self .server_url
441+ self .endpoint .claimed_id = claimed_id
436442
437443 def tearDown (self ):
438444 CatchLogs .tearDown (self )
@@ -443,7 +449,7 @@ def _vrfy(vid, surl):
443449 endpoint = OpenIDServiceEndpoint ()
444450 endpoint .claimed_id = vid
445451 endpoint .server_url = surl
446- endpoint .delegate = vid
452+ endpoint .local_id = vid
447453 return endpoint
448454
449455 self .consumer ._verifyDiscoveryResults = _vrfy
@@ -453,19 +459,33 @@ def _vrfy(vid, surl):
453459
454460 def test_idResNoIdentity (self ):
455461 self .message .delArg (OPENID_NS , 'identity' )
456- self .message .setArg (OPENID_NS , 'signed' , 'return_to,response_nonce' )
462+ self .message .delArg (OPENID_NS , 'claimed_id' )
463+ self .endpoint .claimed_id = None
464+ self .message .setArg (OPENID_NS , 'signed' , 'return_to,response_nonce,assoc_handle' )
457465 r = self .consumer .complete (self .message , self .endpoint )
458466 self .failUnlessSuccess (r )
459467
460468
461469 def test_idResMissingIdentitySig (self ):
462- self .message .setArg (OPENID_NS , 'signed' , 'return_to,response_nonce' )
470+ self .message .setArg (OPENID_NS , 'signed' , 'return_to,response_nonce,assoc_handle,claimed_id ' )
463471 r = self .consumer .complete (self .message , self .endpoint )
464472 self .failUnlessEqual (r .status , FAILURE )
465473
466474
467475 def test_idResMissingReturnToSig (self ):
468- self .message .setArg (OPENID_NS , 'signed' , 'identity,response_nonce' )
476+ self .message .setArg (OPENID_NS , 'signed' , 'identity,response_nonce,assoc_handle,claimed_id' )
477+ r = self .consumer .complete (self .message , self .endpoint )
478+ self .failUnlessEqual (r .status , FAILURE )
479+
480+
481+ def test_idResMissingAssocHandleSig (self ):
482+ self .message .setArg (OPENID_NS , 'signed' , 'identity,response_nonce,return_to,claimed_id' )
483+ r = self .consumer .complete (self .message , self .endpoint )
484+ self .failUnlessEqual (r .status , FAILURE )
485+
486+
487+ def test_idResMissingClaimedIDSig (self ):
488+ self .message .setArg (OPENID_NS , 'signed' , 'identity,response_nonce,return_to,assoc_handle' )
469489 r = self .consumer .complete (self .message , self .endpoint )
470490 self .failUnlessEqual (r .status , FAILURE )
471491
@@ -911,7 +931,7 @@ def test_error_exception(self):
911931class TestAuthRequest (unittest .TestCase ):
912932 def setUp (self ):
913933 self .endpoint = OpenIDServiceEndpoint ()
914- self .endpoint .delegate = 'http://server.unittest/joe'
934+ self .endpoint .local_id = 'http://server.unittest/joe'
915935 self .endpoint .server_url = 'http://server.unittest/'
916936 self .assoc = self
917937 self .assoc .handle = 'assoc@handle'
@@ -933,15 +953,15 @@ def test_addExtensionArg(self):
933953 'extension arg not found in %s' % (url ,))
934954
935955 def test_idpEndpoint (self ):
936- self .endpoint .delegate = None
956+ self .endpoint .local_id = None
937957 self .endpoint .claimed_id = None
938958 url = self .authreq .redirectURL ('http://7.utest/' , 'http://7.utest/r' )
939959 _ , qstring = url .split ('?' )
940960 params = dict (cgi .parse_qsl (qstring ))
941961 self .failUnlessEqual (params ['openid.identity' ], IDENTIFIER_SELECT )
942962
943963 def test_idpAnonymous (self ):
944- self .endpoint .delegate = None
964+ self .endpoint .local_id = None
945965 self .endpoint .claimed_id = None
946966 self .authreq .anonymous = True
947967 url = self .authreq .redirectURL ('http://7.utest/' , 'http://7.utest/r' )
@@ -1233,7 +1253,7 @@ def test_idpDrivenComplete(self):
12331253 endpoint = OpenIDServiceEndpoint ()
12341254 endpoint .claimed_id = identifier
12351255 endpoint .server_url = self .endpoint .server_url
1236- endpoint .delegate = identifier
1256+ endpoint .local_id = identifier
12371257 iverified = []
12381258 def verifyDiscoveryResults (identifier , server_url ):
12391259 iverified .append (endpoint )
@@ -1303,7 +1323,7 @@ def test_theGoodStuff(self):
13031323 endpoint .type_uris = [OPENID2_NS ]
13041324 endpoint .claimed_id = self .identifier
13051325 endpoint .server_url = self .server_url
1306- endpoint .delegate = self .identifier
1326+ endpoint .local_id = self .identifier
13071327 self .services = [endpoint ]
13081328 r = self .consumer ._verifyDiscoveryResults (endpoint , self .message )
13091329
@@ -1315,7 +1335,7 @@ def test_otherServer(self):
13151335 endpoint = OpenIDServiceEndpoint ()
13161336 endpoint .claimed_id = self .identifier
13171337 endpoint .server_url = "http://the-MOON.unittest/"
1318- endpoint .delegate = self .identifier
1338+ endpoint .local_id = self .identifier
13191339 self .services = [endpoint ]
13201340 self .failUnlessRaises (DiscoveryFailure ,
13211341 self .consumer ._verifyDiscoveryResults ,
@@ -1327,7 +1347,7 @@ def test_foreignDelegate(self):
13271347 endpoint = OpenIDServiceEndpoint ()
13281348 endpoint .claimed_id = self .identifier
13291349 endpoint .server_url = self .server_url
1330- endpoint .delegate = "http://unittest/juan-carlos"
1350+ endpoint .local_id = "http://unittest/juan-carlos"
13311351 self .failUnlessRaises (DiscoveryFailure ,
13321352 self .consumer ._verifyDiscoveryResults ,
13331353 endpoint , self .message )
0 commit comments