Skip to content

Commit 0d7c730

Browse files
author
Josh Hoyt
committed
[project @ Make discovery tests more consistent and thorough. Add an expected fail test for LocalID with OpenID 2.0 Yadis]
1 parent 53cbbf0 commit 0d7c730

2 files changed

Lines changed: 137 additions & 108 deletions

File tree

‎openid/consumer/discover.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ def fromHTML(cls, uri, html):
113113
@rtype: [OpenIDServiceEndpoint]
114114
"""
115115
discovery_types = [
116-
(OPENID_1_1_TYPE, 'openid.server', 'openid.delegate'),
117116
(OPENID_2_0_TYPE, 'openid2.provider', 'openid2.local_id'),
117+
(OPENID_1_1_TYPE, 'openid.server', 'openid.delegate'),
118118
]
119119

120120
link_attrs = html_parse.parseLinkAttrs(html)

‎openid/test/test_discover.py‎

Lines changed: 136 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,29 @@ def _discover(self, content_type, data,
192192
self.failUnlessEqual(expected_id, id_url)
193193
return services
194194

195-
def _usedYadis(self, service):
196-
self.failUnless(service.used_yadis, "Expected to use Yadis")
195+
def _checkService(self, s,
196+
server_url,
197+
claimed_id=None,
198+
local_id=None,
199+
types=None,
200+
used_yadis=False
201+
):
202+
self.failUnlessEqual(server_url, s.server_url)
203+
if types == ['2.0 OP']:
204+
self.failIf(claimed_id)
205+
self.failIf(local_id)
206+
self.failIf(s.claimed_id)
207+
self.failIf(s.local_id)
208+
else:
209+
self.failUnlessEqual(claimed_id, s.claimed_id)
210+
self.failUnlessEqual(local_id, s.local_id)
197211

198-
def _notUsedYadis(self, service):
199-
self.failIf(service.used_yadis, "Expected to use old-style discovery")
212+
if used_yadis:
213+
self.failUnless(s.used_yadis, "Expected to use Yadis")
214+
else:
215+
self.failIf(s.used_yadis,
216+
"Expected to use old-style discovery")
200217

201-
def _hasTypes(self, service, *types):
202-
"""Check to see if the specified type URIs are present in the
203-
service element in order"""
204218
openid_types = {
205219
'1.1': discover.OPENID_1_1_TYPE,
206220
'1.0': discover.OPENID_1_0_TYPE,
@@ -209,7 +223,7 @@ def _hasTypes(self, service, *types):
209223
}
210224

211225
type_uris = [openid_types[t] for t in types]
212-
self.failUnlessEqual(type_uris, service.type_uris)
226+
self.failUnlessEqual(type_uris, s.type_uris)
213227

214228
def test_404(self):
215229
self.failUnlessRaises(DiscoveryFailure,
@@ -226,27 +240,38 @@ def test_yadis(self):
226240
data=readDataFile('yadis_2entries_delegate.xml'),
227241
expected_services=2)
228242

229-
self.failUnlessEqual(services[0].server_url,
230-
"http://www.myopenid.com/server")
231-
self._usedYadis(services[0])
232-
self._hasTypes(services[0], '1.0')
233-
self.failUnlessEqual(services[1].server_url,
234-
"http://www.livejournal.com/openid/server.bml")
235-
self._usedYadis(services[1])
236-
self._hasTypes(services[0], '1.0')
243+
self._checkService(
244+
services[0],
245+
used_yadis=True,
246+
types=['1.0'],
247+
server_url="http://www.myopenid.com/server",
248+
claimed_id=self.id_url,
249+
local_id='http://smoker.myopenid.com/',
250+
)
251+
252+
self._checkService(
253+
services[1],
254+
used_yadis=True,
255+
types=['1.0'],
256+
server_url="http://www.livejournal.com/openid/server.bml",
257+
claimed_id=self.id_url,
258+
local_id='http://frank.livejournal.com/',
259+
)
237260

238261
def test_yadis_another(self):
239262
services = self._discover(
240263
content_type='application/xrds+xml',
241264
data=readDataFile('yadis_another_delegate.xml'),
242265
expected_services=1)
243266

244-
self.failUnlessEqual(services[0].local_id,
245-
"http://smoker.myopenid.com/")
246-
self.failUnlessEqual(services[0].server_url,
247-
"http://vroom.unittest/server")
248-
self._usedYadis(services[0])
249-
self._hasTypes(services[0], '1.0')
267+
self._checkService(
268+
services[0],
269+
used_yadis=True,
270+
types=['1.0'],
271+
server_url="http://vroom.unittest/server",
272+
claimed_id=self.id_url,
273+
local_id="http://smoker.myopenid.com/",
274+
)
250275

251276
def test_redirect(self):
252277
expected_final_url = "http://elsewhere.unittest/"
@@ -256,13 +281,14 @@ def test_redirect(self):
256281
expected_services=1,
257282
expected_id=expected_final_url)
258283

259-
self.failUnlessEqual(services[0].server_url,
260-
"http://www.myopenid.com/server")
261-
self.failUnlessEqual(services[0].local_id,
262-
"http://smoker.myopenid.com/")
263-
self.failUnlessEqual(services[0].claimed_id, expected_final_url)
264-
self._notUsedYadis(services[0])
265-
self._hasTypes(services[0], '1.1')
284+
self._checkService(
285+
services[0],
286+
used_yadis=False,
287+
types=['1.1'],
288+
server_url="http://www.myopenid.com/server",
289+
claimed_id=expected_final_url,
290+
local_id="http://smoker.myopenid.com/",
291+
)
266292

267293
def test_emptyList(self):
268294
services = self._discover(content_type='application/xrds+xml',
@@ -278,38 +304,42 @@ def test_emptyListWithLegacy(self):
278304
data=readDataFile('openid_and_yadis.html'),
279305
expected_services=1)
280306

281-
self.failUnlessEqual(services[0].server_url,
282-
"http://www.myopenid.com/server")
283-
self.failUnlessEqual(services[0].claimed_id, self.id_url)
284-
self._notUsedYadis(services[0])
285-
self._hasTypes(services[0], '1.1')
307+
self._checkService(
308+
services[0],
309+
used_yadis=False,
310+
types=['1.1'],
311+
server_url="http://www.myopenid.com/server",
312+
claimed_id=self.id_url,
313+
local_id='http://smoker.myopenid.com/',
314+
)
286315

287316
def test_yadisNoDelegate(self):
288317
services = self._discover(content_type='application/xrds+xml',
289318
data=readDataFile('yadis_no_delegate.xml'),
290319
expected_services=1)
291320

292-
self.failUnlessEqual(services[0].server_url,
293-
"http://www.myopenid.com/server")
294-
self.failUnless(services[0].local_id is None,
295-
'Delegate should be None. Got %r' %
296-
(services[0].local_id,))
297-
self._usedYadis(services[0])
298-
self._hasTypes(services[0], '1.0')
321+
self._checkService(
322+
services[0],
323+
used_yadis=True,
324+
types=['1.0'],
325+
server_url="http://www.myopenid.com/server",
326+
claimed_id=self.id_url,
327+
local_id=None,
328+
)
299329

300330
def test_yadisIDP(self):
301-
services = self._discover(content_type='application/xrds+xml',
302-
data=readDataFile('yadis_idp.xml'),
303-
expected_services=1)
331+
services = self._discover(
332+
content_type='application/xrds+xml',
333+
data=readDataFile('yadis_idp.xml'),
334+
expected_services=1,
335+
)
304336

305-
self.failUnlessEqual(services[0].server_url,
306-
"http://www.myopenid.com/server")
307-
self.failUnlessEqual(services[0].claimed_id, None)
308-
self.failUnless(services[0].local_id is None,
309-
'Delegate should be None. Got %r' %
310-
(services[0].local_id,))
311-
self._usedYadis(services[0])
312-
self._hasTypes(services[0], '2.0 OP')
337+
self._checkService(
338+
services[0],
339+
used_yadis=True,
340+
types=['2.0 OP'],
341+
server_url="http://www.myopenid.com/server",
342+
)
313343

314344
def test_yadisIDPdelegate(self):
315345
"""The delegate tag isn't meaningful for IdP entries."""
@@ -319,94 +349,93 @@ def test_yadisIDPdelegate(self):
319349
expected_services=1,
320350
)
321351

322-
self.failUnlessEqual(services[0].server_url,
323-
"http://www.myopenid.com/server")
324-
self.failUnlessEqual(services[0].claimed_id, None)
325-
self.failUnless(services[0].local_id is None,
326-
'Delegate should be None. Got %r' %
327-
(services[0].local_id,))
328-
self._usedYadis(services[0])
329-
self._hasTypes(services[0], '2.0 OP')
330-
331-
def test_yadisIDPFirst(self):
332-
# Make sure an OP identifier takes precedence. The XRDS used
333-
# here has two services, but we only want to get one back.
334-
self.fetcher.documents = {
335-
self.id_url: ('application/xrds+xml',
336-
readDataFile('yadis_idp_last.xml')),
337-
}
338-
339-
id_url, services = discover.discover(self.id_url)
340-
self.failUnlessEqual(len(services), 1,
341-
"Not 1 service in %r" % (services,))
342-
343-
self.failUnlessEqual(services[0].server_url,
344-
"http://www.myopenid.com/server_id")
345-
self.failUnlessEqual(services[0].claimed_id, None)
346-
self._usedYadis(services[0])
347-
352+
self._checkService(
353+
services[0],
354+
used_yadis=True,
355+
types=['2.0 OP'],
356+
server_url="http://www.myopenid.com/server",
357+
)
348358

349359
def test_openidNoDelegate(self):
350360
services = self._discover(
351361
content_type='text/html',
352362
data=readDataFile('openid_no_delegate.html'),
353-
expected_services=1)
354-
355-
self.failUnlessEqual(services[0].server_url,
356-
"http://www.myopenid.com/server")
357-
self.failUnlessEqual(services[0].claimed_id, self.id_url)
358-
self.failUnless(services[0].local_id is None,
359-
'Delegate should be None. Got %r' %
360-
(services[0].local_id,))
363+
expected_services=1,
364+
)
361365

362-
self._notUsedYadis(services[0])
363-
self._hasTypes(services[0], '1.1')
366+
self._checkService(
367+
services[0],
368+
used_yadis=False,
369+
types=['1.1'],
370+
server_url="http://www.myopenid.com/server",
371+
claimed_id=self.id_url,
372+
local_id=None,
373+
)
364374

365375
def test_openid2(self):
366376
services = self._discover(
367377
content_type='text/html',
368378
data=readDataFile('openid2.html'),
369-
expected_services=1)
379+
expected_services=1,
380+
)
370381

371-
self.failUnlessEqual(services[0].server_url,
372-
"http://www.myopenid.com/server")
373-
self.failUnlessEqual(services[0].claimed_id, self.id_url)
374-
self.failUnlessEqual('http://smoker.myopenid.com/',
375-
services[0].local_id)
376-
self.failUnlessEqual([discover.OPENID_2_0_TYPE], services[0].type_uris)
377-
self._notUsedYadis(services[0])
378-
self._hasTypes(services[0], '2.0')
382+
self._checkService(
383+
services[0],
384+
used_yadis=False,
385+
types=['2.0'],
386+
server_url="http://www.myopenid.com/server",
387+
claimed_id=self.id_url,
388+
local_id='http://smoker.myopenid.com/',
389+
)
379390

380391
def test_openid1(self):
381392
services = self._discover(
382393
content_type='text/html',
383394
data=readDataFile('openid.html'),
384395
expected_services=1)
385396

386-
self.failUnlessEqual(services[0].server_url,
387-
"http://www.myopenid.com/server")
388-
self.failUnlessEqual(services[0].claimed_id, self.id_url)
389-
self.failUnlessEqual('http://smoker.myopenid.com/',
390-
services[0].local_id)
391-
self.failUnlessEqual([discover.OPENID_1_1_TYPE], services[0].type_uris)
392-
self._notUsedYadis(services[0])
393-
self._hasTypes(services[0], '1.1')
397+
398+
self._checkService(
399+
services[0],
400+
used_yadis=False,
401+
types=['1.1'],
402+
server_url="http://www.myopenid.com/server",
403+
claimed_id=self.id_url,
404+
local_id='http://smoker.myopenid.com/',
405+
)
394406

395407
def test_openid_1_and_2(self):
396408
services = self._discover(
397409
content_type='text/html',
398410
data=readDataFile('openid_1_and_2.html'),
399411
expected_services=2)
400412

413+
self.failUnlessEqual(services[1].server_url,
414+
"http://www.myopenid.com/server")
415+
self.failUnlessEqual(services[1].claimed_id, self.id_url)
416+
self.failUnlessEqual('http://smoker.myopenid.com/',
417+
services[1].local_id)
418+
self.failUnlessEqual([discover.OPENID_2_0_TYPE], services[1].type_uris)
419+
self._notUsedYadis(services[1])
420+
421+
401422
self.failUnlessEqual(services[0].server_url,
402423
"http://www.myopenid.com/server")
403424
self.failUnlessEqual(services[0].claimed_id, self.id_url)
404425
self.failUnlessEqual('http://smoker.myopenid.com/',
405426
services[0].local_id)
406-
self.failUnlessEqual([discover.OPENID_2_0_TYPE], services[0].type_uris)
427+
self.failUnlessEqual([discover.OPENID_1_1_TYPE], services[0].type_uris)
407428
self._notUsedYadis(services[0])
408-
self._hasTypes(services[0], '2.0')
429+
self._hasTypes(services[0], '1.1')
409430

431+
self._checkService(
432+
services[0],
433+
used_yadis=False,
434+
types=['2.0'],
435+
server_url="http://www.myopenid.com/server",
436+
claimed_id=self.id_url,
437+
local_id='http://smoker.myopenid.com/',
438+
)
410439

411440
self.failUnlessEqual(services[1].server_url,
412441
"http://www.myopenid.com/server")

0 commit comments

Comments
 (0)