@@ -390,6 +390,12 @@ def test_cancel(self):
390390 self .failUnlessEqual (r .status , CANCEL )
391391 self .failUnless (r .identity_url == self .endpoint .claimed_id )
392392
393+ def test_cancel_with_return_to (self ):
394+ message = Message .fromPostArgs ({'openid.mode' : 'cancel' })
395+ r = self .consumer .complete (message , self .endpoint , self .return_to )
396+ self .failUnlessEqual (r .status , CANCEL )
397+ self .failUnless (r .identity_url == self .endpoint .claimed_id )
398+
393399 def test_error (self ):
394400 msg = 'an error message'
395401 message = Message .fromPostArgs ({'openid.mode' : 'error' ,
@@ -441,7 +447,7 @@ def test_idResMissingField(self):
441447 # *check_auth* failed, not because it's missing an arg, exactly.
442448 message = Message .fromPostArgs ({'openid.mode' : 'id_res' })
443449 self .failUnlessRaises (ProtocolError , self .consumer ._doIdRes ,
444- message , self .endpoint )
450+ message , self .endpoint , None )
445451
446452 def test_idResURLMismatch (self ):
447453 class VerifiedError (Exception ): pass
@@ -725,7 +731,8 @@ def setUp(self):
725731 def mkSuccessTest (openid_args , signed_list ):
726732 def test (self ):
727733 message = Message .fromOpenIDArgs (openid_args )
728- self .consumer ._idResCheckForFields (message , signed_list )
734+ message .setArg (OPENID_NS , 'signed' , ',' .join (signed_list ))
735+ self .consumer ._idResCheckForFields (message )
729736 return test
730737
731738 test_openid1Success = mkSuccessTest (
@@ -759,16 +766,13 @@ def test(self):
759766 ['return_to' , 'response_nonce' , 'identity' ,
760767 'claimed_id' , 'assoc_handle' ])
761768
762- def mkFailureTest (openid_args , signed_list , sig_fail = False ):
769+ def mkFailureTest (openid_args , signed_list ):
763770 def test (self ):
764771 message = Message .fromOpenIDArgs (openid_args )
765772 try :
766- self .consumer ._idResCheckForFields (message , signed_list )
773+ self .consumer ._idResCheckForFields (message )
767774 except ProtocolError , why :
768- if sig_fail :
769- self .failUnless (why [0 ].endswith ('not signed' ))
770- else :
771- self .failUnless (why [0 ].startswith ('Missing required' ))
775+ self .failUnless (why [0 ].startswith ('Missing required' ))
772776 else :
773777 self .fail ('Expected an error, but none occurred' )
774778 return test
@@ -779,17 +783,15 @@ def test(self):
779783 'sig' :'a signature' ,
780784 'identity' :'someone' ,
781785 },
782- ['identity' ],
783- sig_fail = True )
786+ ['identity' ])
784787
785788 test_openid1Missing_identitySig = mkFailureTest (
786789 {'return_to' :'return' ,
787790 'assoc_handle' :'assoc handle' ,
788791 'sig' :'a signature' ,
789792 'identity' :'someone' ,
790793 },
791- ['return_to' ],
792- sig_fail = True )
794+ ['return_to' ])
793795
794796 test_openid1MissingReturnTo = mkFailureTest (
795797 {'assoc_handle' :'assoc handle' ,
@@ -932,7 +934,7 @@ def test_checkAuthTriggered(self):
932934 'openid.signed' : 'identity,return_to' ,
933935 })
934936 try :
935- result = self .consumer ._doIdRes (message , self .endpoint )
937+ result = self .consumer ._doIdRes (message , self .endpoint , None )
936938 except CheckAuthHappened :
937939 pass
938940 else :
@@ -956,7 +958,7 @@ def test_checkAuthTriggeredWithAssoc(self):
956958 'openid.signed' : 'identity,return_to' ,
957959 })
958960 try :
959- result = self .consumer ._doIdRes (message , self .endpoint )
961+ result = self .consumer ._doIdRes (message , self .endpoint , None )
960962 except CheckAuthHappened :
961963 pass
962964 else :
@@ -981,7 +983,7 @@ def test_expiredAssoc(self):
981983 'openid.signed' : 'identity,return_to' ,
982984 })
983985 self .failUnlessRaises (ProtocolError , self .consumer ._doIdRes ,
984- message , self .endpoint )
986+ message , self .endpoint , None )
985987
986988 def test_newerAssoc (self ):
987989 lifetime = 1000
@@ -1006,7 +1008,7 @@ def test_newerAssoc(self):
10061008
10071009 message = Message .fromOpenIDArgs (query )
10081010 message = good_assoc .signMessage (message )
1009- info = self .consumer ._doIdRes (message , self .endpoint )
1011+ info = self .consumer ._doIdRes (message , self .endpoint , None )
10101012 self .failUnlessEqual (info .status , SUCCESS , info .message )
10111013 self .failUnlessEqual (self .consumer_id , info .identity_url )
10121014
@@ -1101,11 +1103,7 @@ def test_completeBadReturnTo(self):
11011103
11021104 for bad in bad_return_tos :
11031105 m .setArg (OPENID_NS , 'return_to' , bad )
1104- result = self .consumer .complete (m , endpoint , return_to )
1105- self .failUnless (isinstance (result , FailureResponse ), \
1106- "Expected FailureResponse, got %r for %s" % (result , bad ))
1107- self .failUnless (result .message == \
1108- "openid.return_to does not match return URL" )
1106+ self .failIf (self .consumer ._checkReturnTo (m , return_to ))
11091107
11101108 def test_completeGoodReturnTo (self ):
11111109 """Test GenericConsumer.complete()'s handling of good
@@ -1376,8 +1374,8 @@ def test_setAssociationPreference(self):
13761374 association .SessionNegotiator ))
13771375 self .failUnlessEqual ([],
13781376 self .consumer .consumer .negotiator .allowed_types )
1379- self .consumer .setAssociationPreference ([('FOO ' , 'BAR ' )])
1380- self .failUnlessEqual ([('FOO ' , 'BAR ' )],
1377+ self .consumer .setAssociationPreference ([('HMAC-SHA1 ' , 'DH-SHA1 ' )])
1378+ self .failUnlessEqual ([('HMAC-SHA1 ' , 'DH-SHA1 ' )],
13811379 self .consumer .consumer .negotiator .allowed_types )
13821380
13831381 def withDummyDiscovery (self , callable , dummy_getNextService ):
@@ -1607,7 +1605,7 @@ def verifyDiscoveryResults(identifier, endpoint):
16071605 return discovered_endpoint
16081606 self .consumer ._verifyDiscoveryResults = verifyDiscoveryResults
16091607 self .consumer ._idResCheckNonce = lambda * args : True
1610- response = self .consumer ._doIdRes (message , self .endpoint )
1608+ response = self .consumer ._doIdRes (message , self .endpoint , None )
16111609
16121610 self .failUnlessSuccess (response )
16131611 self .failUnlessEqual (response .identity_url , "=directed_identifier" )
@@ -1629,7 +1627,7 @@ def verifyDiscoveryResults(identifier, endpoint):
16291627 raise DiscoveryFailure ("PHREAK!" , None )
16301628 self .consumer ._verifyDiscoveryResults = verifyDiscoveryResults
16311629 self .failUnlessRaises (DiscoveryFailure , self .consumer ._doIdRes ,
1632- message , self .endpoint )
1630+ message , self .endpoint , None )
16331631
16341632
16351633 def failUnlessSuccess (self , response ):
0 commit comments