Skip to content

Commit 76abf9d

Browse files
author
tailor
committed
[project @ Un-broke all tests for real this time]
1 parent 4779ee5 commit 76abf9d

5 files changed

Lines changed: 69 additions & 43 deletions

File tree

‎openid/consumer/consumer.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,8 @@ def _doIdRes(self, message, endpoint):
554554
elif endpoint.getLocalID() != response_identity:
555555
fmt = 'Mismatch between delegate (%r) and server (%r) response'
556556
return FailureResponse(
557-
endpoint, fmt % (endpoint.delegate, response_identity))
557+
endpoint, fmt % (endpoint.getLocalID(),
558+
response_identity))
558559

559560
signed_fields = ['openid.' + f for f in signed_list]
560561
return SuccessResponse(endpoint, message, signed_fields)
@@ -652,6 +653,11 @@ def _verifyDiscoveryResults(self, orig_endpoint, resp_msg):
652653
else:
653654
identifier = resp_msg.getArg(OPENID_NS, 'identity')
654655

656+
# Identifier absent, so return the original endpoint because
657+
# we don't have any discovery'ing to do
658+
if identifier is None:
659+
return orig_endpoint
660+
655661
# Pick the right discovery method.
656662
if xri.identifierScheme(identifier) == "XRI":
657663
discoverMethod = discoverXRI

‎openid/consumer/discover.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def fromHTML(cls, uri, html):
126126

127127
service = cls()
128128
service.claimed_id = uri
129-
service.delegate = html_parse.findFirstHref(
129+
service.local_id = html_parse.findFirstHref(
130130
link_attrs, local_id_rel)
131131
service.server_url = op_endpoint_url
132132
service.type_uris = [type_uri]
@@ -201,7 +201,7 @@ def discoverYadis(uri):
201201

202202
# Try to parse the response as HTML to get OpenID 1.0/1.1
203203
# <link rel="...">
204-
openid_services = OpenIDServiceEndpoint.fromHTML(claimed_id, body)
204+
openid_services = OpenIDServiceEndpoint.fromHTML(yadis_url, body)
205205

206206
return (yadis_url, openid_services)
207207

‎openid/test/test_consumer.py‎

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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):
911931
class 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)

‎openid/test/test_discover.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def test_noYadis(self):
340340
"More than one service in %r" % (services,))
341341
self.failUnlessEqual(services[0].server_url,
342342
"http://www.myopenid.com/server")
343-
self.failUnlessEqual(services[0].delegate,
343+
self.failUnlessEqual(services[0].local_id,
344344
"http://smoker.myopenid.com/")
345345
self.failUnlessEqual(services[0].claimed_id, self.id_url)
346346
self._notUsedYadis(services[0])
@@ -381,7 +381,7 @@ def test_redirect(self):
381381
"More than one service in %r" % (services,))
382382
self.failUnlessEqual(services[0].server_url,
383383
"http://www.myopenid.com/server")
384-
self.failUnlessEqual(services[0].delegate,
384+
self.failUnlessEqual(services[0].local_id,
385385
"http://smoker.myopenid.com/")
386386
self.failUnlessEqual(services[0].claimed_id, expected_final_url)
387387
self._notUsedYadis(services[0])
@@ -418,9 +418,9 @@ def test_yadisNoDelegate(self):
418418
"Not 1 service in %r" % (services,))
419419
self.failUnlessEqual(services[0].server_url,
420420
"http://www.myopenid.com/server")
421-
self.failUnless(services[0].delegate is None,
421+
self.failUnless(services[0].local_id is None,
422422
'Delegate should be None. Got %r' %
423-
(services[0].delegate,))
423+
(services[0].local_id,))
424424
self._usedYadis(services[0])
425425

426426
def test_yadisIDP(self):
@@ -433,9 +433,9 @@ def test_yadisIDP(self):
433433
self.failUnlessEqual(services[0].server_url,
434434
"http://www.myopenid.com/server")
435435
self.failUnlessEqual(services[0].claimed_id, None)
436-
self.failUnless(services[0].delegate is None,
436+
self.failUnless(services[0].local_id is None,
437437
'Delegate should be None. Got %r' %
438-
(services[0].delegate,))
438+
(services[0].local_id,))
439439
self._usedYadis(services[0])
440440

441441
def test_yadisIDPdelegate(self):
@@ -449,9 +449,9 @@ def test_yadisIDPdelegate(self):
449449
self.failUnlessEqual(services[0].server_url,
450450
"http://www.myopenid.com/server")
451451
self.failUnlessEqual(services[0].claimed_id, None)
452-
self.failUnless(services[0].delegate is None,
452+
self.failUnless(services[0].local_id is None,
453453
'Delegate should be None. Got %r' %
454-
(services[0].delegate,))
454+
(services[0].local_id,))
455455
self._usedYadis(services[0])
456456

457457

@@ -464,9 +464,9 @@ def test_openidNoDelegate(self):
464464
self.failUnlessEqual(services[0].server_url,
465465
"http://www.myopenid.com/server")
466466
self.failUnlessEqual(services[0].claimed_id, self.id_url)
467-
self.failUnless(services[0].delegate is None,
467+
self.failUnless(services[0].local_id is None,
468468
'Delegate should be None. Got %r' %
469-
(services[0].delegate,))
469+
(services[0].local_id,))
470470

471471
self._notUsedYadis(services[0])
472472

@@ -480,7 +480,7 @@ def test_openid2(self):
480480
"http://www.myopenid.com/server")
481481
self.failUnlessEqual(services[0].claimed_id, self.id_url)
482482
self.failUnlessEqual('http://smoker.myopenid.com/',
483-
services[0].delegate)
483+
services[0].local_id)
484484
self.failUnlessEqual([discover.OPENID_2_0_TYPE], services[0].type_uris)
485485
self._notUsedYadis(services[0])
486486
self.failUnlessEqual(1, len(services))
@@ -495,7 +495,7 @@ def test_openid1(self):
495495
"http://www.myopenid.com/server")
496496
self.failUnlessEqual(services[0].claimed_id, self.id_url)
497497
self.failUnlessEqual('http://smoker.myopenid.com/',
498-
services[0].delegate)
498+
services[0].local_id)
499499
self.failUnlessEqual([discover.OPENID_1_1_TYPE], services[0].type_uris)
500500
self._notUsedYadis(services[0])
501501
self.failUnlessEqual(1, len(services))
@@ -514,7 +514,7 @@ def test_openid_1_and_2(self):
514514
"http://www.myopenid.com/server")
515515
self.failUnlessEqual(services[1].claimed_id, self.id_url)
516516
self.failUnlessEqual('http://smoker.myopenid.com/',
517-
services[1].delegate)
517+
services[1].local_id)
518518
self.failUnlessEqual([discover.OPENID_2_0_TYPE], services[1].type_uris)
519519
self._notUsedYadis(services[1])
520520

@@ -523,7 +523,7 @@ def test_openid_1_and_2(self):
523523
"http://www.myopenid.com/server")
524524
self.failUnlessEqual(services[0].claimed_id, self.id_url)
525525
self.failUnlessEqual('http://smoker.myopenid.com/',
526-
services[0].delegate)
526+
services[0].local_id)
527527
self.failUnlessEqual([discover.OPENID_1_1_TYPE], services[0].type_uris)
528528
self._notUsedYadis(services[0])
529529

‎openid/test/test_openidyadis.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
def mkXRDS(services):
2020
return XRDS_BOILERPLATE % (services,)
2121

22-
def mkService(uris=None, type_uris=None, delegate=None, dent=' '):
22+
def mkService(uris=None, type_uris=None, local_id=None, dent=' '):
2323
chunks = [dent, '<Service>\n']
2424
dent2 = dent + ' '
2525
if type_uris:
@@ -38,9 +38,9 @@ def mkService(uris=None, type_uris=None, delegate=None, dent=' '):
3838
chunks.extend([' priority="', str(prio), '"'])
3939
chunks.extend(['>', uri, '</URI>\n'])
4040

41-
if delegate:
41+
if local_id:
4242
chunks.extend(
43-
[dent2, '<openid:Delegate>', delegate, '</openid:Delegate>\n'])
43+
[dent2, '<openid:Delegate>', local_id, '</openid:Delegate>\n'])
4444

4545
chunks.extend([dent, '</Service>\n'])
4646

@@ -85,26 +85,26 @@ def subsets(l):
8585
]
8686

8787
# Range of valid Delegate tag values for generating test data
88-
delegate_options = [
88+
local_id_options = [
8989
None,
9090
'http://vanity.domain/',
9191
'https://somewhere/yadis/',
9292
]
9393

9494
# All combinations of valid URIs, Type URIs and Delegate tags
9595
data = [
96-
(uris, type_uris, delegate)
96+
(uris, type_uris, local_id)
9797
for uris in server_url_options
9898
for type_uris in type_uri_options
99-
for delegate in delegate_options
99+
for local_id in local_id_options
100100
]
101101

102102
class OpenIDYadisTest(unittest.TestCase):
103-
def __init__(self, uris, type_uris, delegate):
103+
def __init__(self, uris, type_uris, local_id):
104104
unittest.TestCase.__init__(self)
105105
self.uris = uris
106106
self.type_uris = type_uris
107-
self.delegate = delegate
107+
self.local_id = local_id
108108

109109
def shortDescription(self):
110110
# XXX:
@@ -116,7 +116,7 @@ def setUp(self):
116116
# Create an XRDS document to parse
117117
services = mkService(uris=self.uris,
118118
type_uris=self.type_uris,
119-
delegate=self.delegate)
119+
local_id=self.local_id)
120120
self.xrds = mkXRDS(services)
121121

122122
def runTest(self):
@@ -140,8 +140,8 @@ def runTest(self):
140140
# All endpoints will have same yadis_url
141141
self.failUnlessEqual(self.yadis_url, endpoint.claimed_id)
142142

143-
# and delegate
144-
self.failUnlessEqual(self.delegate, endpoint.delegate)
143+
# and local_id
144+
self.failUnlessEqual(self.local_id, endpoint.local_id)
145145

146146
# and types
147147
actual_types = list(endpoint.type_uris)

0 commit comments

Comments
 (0)