Skip to content

Commit d764257

Browse files
author
tailor
committed
[project @ Change OpenIDServiceEndpoint.identity_url to .claimed_id]
1 parent a26d9b9 commit d764257

5 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎openid/consumer/consumer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ def _checkNonce(self, server_url, response):
490490
except ValueError:
491491
return FailureResponse(response.endpoint, 'Malformed nonce')
492492
if not self.store.useNonce(server_url, timestamp, salt):
493-
return FailureResponse(response,
493+
return FailureResponse(response.endpoint,
494494
'Nonce missing from store')
495495

496496
# If the nonce check succeeded, return the original success
@@ -620,7 +620,7 @@ def serviceMatches(endpoint):
620620
return (
621621
(endpoint.server_url == server_url) and
622622
# Delegate must be equivalent to the discovered URL.
623-
((endpoint.getServerID() == endpoint.identity_url) or
623+
((endpoint.getServerID() == endpoint.claimed_id) or
624624
(endpoint.getServerID() == identifier)))
625625

626626
services = filter(serviceMatches, services)
@@ -930,7 +930,7 @@ def setEndpoint(self, endpoint):
930930
if endpoint is None:
931931
self.identity_url = None
932932
else:
933-
self.identity_url = endpoint.identity_url
933+
self.identity_url = endpoint.claimed_id
934934

935935
class SuccessResponse(Response):
936936
"""A response with a status of SUCCESS. Indicates that this request is a
@@ -956,7 +956,7 @@ def __init__(self, endpoint, message, signed_fields=None):
956956
# Don't use setEndpoint, because endpoint should never be None
957957
# for a successfull transaction.
958958
self.endpoint = endpoint
959-
self.identity_url = endpoint.identity_url
959+
self.identity_url = endpoint.claimed_id
960960

961961
self.message = message
962962

‎openid/consumer/discover.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def preferredNamespace(self):
4747
return OPENID_1_0_MESSAGE_NS
4848

4949
def __init__(self):
50-
self.identity_url = None
50+
self.claimed_id = None
5151
self.server_url = None
5252
self.type_uris = []
5353
self.delegate = None
@@ -70,13 +70,13 @@ def parseService(self, yadis_url, uri, type_uris, service_element):
7070
# that's a pathological configuration anyway, so I don't
7171
# think I care.
7272
self.delegate = findDelegate(service_element)
73-
self.identity_url = yadis_url
73+
self.claimed_id = yadis_url
7474

7575
def getServerID(self):
7676
"""Return the identifier that should be sent as the
7777
openid.identity_url parameter to the server."""
7878
if self.delegate is None:
79-
return self.canonicalID or self.identity_url
79+
return self.canonicalID or self.claimed_id
8080
else:
8181
return self.delegate
8282

@@ -111,7 +111,7 @@ def fromHTML(cls, uri, html):
111111
"""
112112
delegate_url, server_url = parseOpenIDLinkRel(html)
113113
service = cls()
114-
service.identity_url = uri
114+
service.claimed_id = uri
115115
service.delegate = delegate_url
116116
service.server_url = server_url
117117
service.type_uris = [OPENID_1_0_TYPE]
@@ -150,7 +150,7 @@ def discoverYadis(uri):
150150
@param uri: normalized identity URL
151151
@type uri: str
152152
153-
@return: (identity_url, services)
153+
@return: (claimed_id, services)
154154
@rtype: (str, list(OpenIDServiceEndpoint))
155155
156156
@raises: DiscoveryFailure
@@ -161,7 +161,7 @@ def discoverYadis(uri):
161161
# bother to catch it.
162162
response = yadisDiscover(uri)
163163

164-
identity_url = response.normalized_uri
164+
claimed_id = response.normalized_uri
165165
try:
166166
openid_services = extractServices(
167167
response.normalized_uri, response.response_text,
@@ -184,13 +184,13 @@ def discoverYadis(uri):
184184
# Try to parse the response as HTML to get OpenID 1.0/1.1
185185
# <link rel="...">
186186
try:
187-
service = OpenIDServiceEndpoint.fromHTML(identity_url, body)
187+
service = OpenIDServiceEndpoint.fromHTML(claimed_id, body)
188188
except ParseError:
189189
pass # Parsing failed, so return an empty list
190190
else:
191191
openid_services = [service]
192192

193-
return (identity_url, openid_services)
193+
return (claimed_id, openid_services)
194194

195195
def discoverXRI(iname):
196196
endpoints = []
@@ -218,18 +218,18 @@ def discoverNoYadis(uri):
218218
raise DiscoveryFailure(
219219
'HTTP Response status from identity URL host is not 200. '
220220
'Got status %r' % (http_resp.status,), http_resp)
221-
identity_url = http_resp.final_url
221+
claimed_id = http_resp.final_url
222222

223223
# Try to parse the response as HTML to get OpenID 1.0/1.1
224224
# <link rel="...">
225225
try:
226-
service = OpenIDServiceEndpoint.fromHTML(identity_url, http_resp.body)
226+
service = OpenIDServiceEndpoint.fromHTML(claimed_id, http_resp.body)
227227
except ParseError:
228228
openid_services = []
229229
else:
230230
openid_services = [service]
231231

232-
return identity_url, openid_services
232+
return claimed_id, openid_services
233233

234234
def discover(uri):
235235
parsed = urlparse.urlparse(uri)
@@ -240,6 +240,6 @@ def discover(uri):
240240
uri = 'http://' + uri
241241

242242
uri = normalizeURL(uri)
243-
identity_url, openid_services = discoverYadis(uri)
244-
identity_url = normalizeURL(identity_url)
245-
return identity_url, openid_services
243+
claimed_id, openid_services = discoverYadis(uri)
244+
claimed_id = normalizeURL(claimed_id)
245+
return claimed_id, openid_services

‎openid/test/test_consumer.py‎

Lines changed: 16 additions & 16 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
mode = 'checkid_setup'
142142

143143
endpoint = OpenIDServiceEndpoint()
144-
endpoint.identity_url = user_url
144+
endpoint.claimed_id = user_url
145145
endpoint.server_url = server_url
146146
endpoint.delegate = delegate_url
147147

@@ -267,7 +267,7 @@ def setUp(self):
267267
self.consumer = self.consumer_class(self.store)
268268
self.return_to = "nonny"
269269
self.endpoint = OpenIDServiceEndpoint()
270-
self.endpoint.identity_url = self.consumer_id = "consu"
270+
self.endpoint.claimed_id = self.consumer_id = "consu"
271271
self.endpoint.server_url = self.server_url = "serlie"
272272
self.endpoint.delegate = self.server_id = "sirod"
273273

@@ -335,7 +335,7 @@ def test_cancel(self):
335335
message = Message.fromPostArgs({'openid.mode': 'cancel'})
336336
r = self.consumer.complete(message, self.endpoint)
337337
self.failUnlessEqual(r.status, CANCEL)
338-
self.failUnless(r.identity_url == self.endpoint.identity_url)
338+
self.failUnless(r.identity_url == self.endpoint.claimed_id)
339339

340340
def test_error(self):
341341
msg = 'an error message'
@@ -344,7 +344,7 @@ def test_error(self):
344344
})
345345
r = self.consumer.complete(message, self.endpoint)
346346
self.failUnlessEqual(r.status, FAILURE)
347-
self.failUnless(r.identity_url == self.endpoint.identity_url)
347+
self.failUnless(r.identity_url == self.endpoint.claimed_id)
348348
self.failUnlessEqual(r.message, msg)
349349

350350
def test_errorWithNoOptionalKeys(self):
@@ -356,7 +356,7 @@ def test_errorWithNoOptionalKeys(self):
356356
})
357357
r = self.consumer.complete(message, self.endpoint)
358358
self.failUnlessEqual(r.status, FAILURE)
359-
self.failUnless(r.identity_url == self.endpoint.identity_url)
359+
self.failUnless(r.identity_url == self.endpoint.claimed_id)
360360
self.failUnless(r.contact == contact)
361361
self.failUnless(r.reference is None)
362362
self.failUnlessEqual(r.message, msg)
@@ -371,7 +371,7 @@ def test_errorWithOptionalKeys(self):
371371
})
372372
r = self.consumer.complete(message, self.endpoint)
373373
self.failUnlessEqual(r.status, FAILURE)
374-
self.failUnless(r.identity_url == self.endpoint.identity_url)
374+
self.failUnless(r.identity_url == self.endpoint.claimed_id)
375375
self.failUnless(r.contact == contact)
376376
self.failUnless(r.reference == reference)
377377
self.failUnlessEqual(r.message, msg)
@@ -380,7 +380,7 @@ def test_noMode(self):
380380
message = Message.fromPostArgs({})
381381
r = self.consumer.complete(message, self.endpoint)
382382
self.failUnlessEqual(r.status, FAILURE)
383-
self.failUnless(r.identity_url == self.endpoint.identity_url)
383+
self.failUnless(r.identity_url == self.endpoint.claimed_id)
384384

385385
def test_idResMissingField(self):
386386
# XXX - this test is passing, but not necessarily by what it
@@ -437,7 +437,7 @@ def tearDown(self):
437437
def test_idResMissingNoSigs(self):
438438
def _vrfy(vid, surl):
439439
endpoint = OpenIDServiceEndpoint()
440-
endpoint.identity_url = vid
440+
endpoint.claimed_id = vid
441441
endpoint.server_url = surl
442442
endpoint.delegate = vid
443443
return endpoint
@@ -874,15 +874,15 @@ def test_addExtensionArg(self):
874874

875875
def test_idpEndpoint(self):
876876
self.endpoint.delegate = None
877-
self.endpoint.identity_url = None
877+
self.endpoint.claimed_id = None
878878
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
879879
_, qstring = url.split('?')
880880
params = dict(cgi.parse_qsl(qstring))
881881
self.failUnlessEqual(params['openid.identity'], IDENTIFIER_SELECT)
882882

883883
def test_idpAnonymous(self):
884884
self.endpoint.delegate = None
885-
self.endpoint.identity_url = None
885+
self.endpoint.claimed_id = None
886886
self.authreq.anonymous = True
887887
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
888888
self.failUnless(url.find('openid.identity') == -1,
@@ -897,7 +897,7 @@ def test_userAnonymous(self):
897897
class TestSuccessResponse(unittest.TestCase):
898898
def setUp(self):
899899
self.endpoint = OpenIDServiceEndpoint()
900-
self.endpoint.identity_url = 'identity_url'
900+
self.endpoint.claimed_id = 'identity_url'
901901

902902
def test_extensionResponse(self):
903903
resp = mkSuccess(self.endpoint, {
@@ -1020,7 +1020,7 @@ def complete(self, message, endpoint):
10201020
class ConsumerTest(unittest.TestCase):
10211021
def setUp(self):
10221022
self.endpoint = OpenIDServiceEndpoint()
1023-
self.endpoint.identity_url = self.identity_url = 'http://identity.url/'
1023+
self.endpoint.claimed_id = self.identity_url = 'http://identity.url/'
10241024
self.store = None
10251025
self.session = {}
10261026
self.consumer = Consumer(self.session, self.store)
@@ -1165,7 +1165,7 @@ def test_idpDrivenComplete(self):
11651165
})
11661166

11671167
endpoint = OpenIDServiceEndpoint()
1168-
endpoint.identity_url = identifier
1168+
endpoint.claimed_id = identifier
11691169
endpoint.server_url = self.endpoint.server_url
11701170
endpoint.delegate = identifier
11711171
iverified = []
@@ -1226,7 +1226,7 @@ def tearDown(self):
12261226

12271227
def test_theGoodStuff(self):
12281228
endpoint = OpenIDServiceEndpoint()
1229-
endpoint.identity_url = self.identifier
1229+
endpoint.claimed_id = self.identifier
12301230
endpoint.server_url = self.server_url
12311231
endpoint.delegate = self.identifier
12321232
self.services = [endpoint]
@@ -1238,7 +1238,7 @@ def test_theGoodStuff(self):
12381238
def test_otherServer(self):
12391239
# a set of things without the stuff
12401240
endpoint = OpenIDServiceEndpoint()
1241-
endpoint.identity_url = self.identifier
1241+
endpoint.claimed_id = self.identifier
12421242
endpoint.server_url = "http://the-MOON.unittest/"
12431243
endpoint.delegate = self.identifier
12441244
self.services = [endpoint]
@@ -1250,7 +1250,7 @@ def test_otherServer(self):
12501250
def test_foreignDelegate(self):
12511251
# a set of things with the server stuff but other delegate
12521252
endpoint = OpenIDServiceEndpoint()
1253-
endpoint.identity_url = self.identifier
1253+
endpoint.claimed_id = self.identifier
12541254
endpoint.server_url = self.server_url
12551255
endpoint.delegate = "http://unittest/juan-carlos"
12561256
self.failUnlessRaises(DiscoveryFailure,

‎openid/test/test_discover.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ def test_noYadis(self):
322322
"http://www.myopenid.com/server")
323323
self.failUnlessEqual(services[0].delegate,
324324
"http://smoker.myopenid.com/")
325-
self.failUnlessEqual(services[0].identity_url, self.id_url)
325+
self.failUnlessEqual(services[0].claimed_id, self.id_url)
326326
self._notUsedYadis(services[0])
327327

328328
def test_noOpenID(self):
@@ -363,7 +363,7 @@ def test_redirect(self):
363363
"http://www.myopenid.com/server")
364364
self.failUnlessEqual(services[0].delegate,
365365
"http://smoker.myopenid.com/")
366-
self.failUnlessEqual(services[0].identity_url, expected_final_url)
366+
self.failUnlessEqual(services[0].claimed_id, expected_final_url)
367367
self._notUsedYadis(services[0])
368368

369369
def test_emptyList(self):
@@ -385,7 +385,7 @@ def test_emptyListWithLegacy(self):
385385
"Not one service in %r" % (services,))
386386
self.failUnlessEqual(services[0].server_url,
387387
"http://www.myopenid.com/server")
388-
self.failUnlessEqual(services[0].identity_url, self.id_url)
388+
self.failUnlessEqual(services[0].claimed_id, self.id_url)
389389
self._notUsedYadis(services[0])
390390

391391
def test_yadisNoDelegate(self):
@@ -412,7 +412,7 @@ def test_yadisIDP(self):
412412
"Not 1 service in %r" % (services,))
413413
self.failUnlessEqual(services[0].server_url,
414414
"http://www.myopenid.com/server")
415-
self.failUnlessEqual(services[0].identity_url, None)
415+
self.failUnlessEqual(services[0].claimed_id, None)
416416
self.failUnless(services[0].delegate is None,
417417
'Delegate should be None. Got %r' %
418418
(services[0].delegate,))
@@ -428,7 +428,7 @@ def test_yadisIDPdelegate(self):
428428
"Not 1 service in %r" % (services,))
429429
self.failUnlessEqual(services[0].server_url,
430430
"http://www.myopenid.com/server")
431-
self.failUnlessEqual(services[0].identity_url, None)
431+
self.failUnlessEqual(services[0].claimed_id, None)
432432
self.failUnless(services[0].delegate is None,
433433
'Delegate should be None. Got %r' %
434434
(services[0].delegate,))
@@ -443,7 +443,7 @@ def test_openidNoDelegate(self):
443443
self.failUnlessEqual(self.id_url, id_url)
444444
self.failUnlessEqual(services[0].server_url,
445445
"http://www.myopenid.com/server")
446-
self.failUnlessEqual(services[0].identity_url, self.id_url)
446+
self.failUnlessEqual(services[0].claimed_id, self.id_url)
447447
self.failUnless(services[0].delegate is None,
448448
'Delegate should be None. Got %r' %
449449
(services[0].delegate,))
@@ -504,7 +504,7 @@ def test_useCanonicalID(self):
504504
"""When there is no delegate, the CanonicalID should be used with XRI.
505505
"""
506506
endpoint = discover.OpenIDServiceEndpoint()
507-
endpoint.identity_url = "=example"
507+
endpoint.claimed_id = "=example"
508508
endpoint.canonicalID = XRI("=!1000")
509509
self.failUnlessEqual(endpoint.getServerID(), XRI("=!1000"))
510510

‎openid/test/test_openidyadis.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def runTest(self):
138138
seen_uris.append(endpoint.server_url)
139139

140140
# All endpoints will have same yadis_url
141-
self.failUnlessEqual(self.yadis_url, endpoint.identity_url)
141+
self.failUnlessEqual(self.yadis_url, endpoint.claimed_id)
142142

143143
# and delegate
144144
self.failUnlessEqual(self.delegate, endpoint.delegate)

0 commit comments

Comments
 (0)