Skip to content

Commit f301aea

Browse files
author
Josh Hoyt
committed
[project @ Add test for using pre-discovered information in discovery for OpenID2]
1 parent 479b759 commit f301aea

2 files changed

Lines changed: 20 additions & 6 deletions

File tree

‎openid/consumer/consumer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
from openid import fetchers
189189

190190
from openid.consumer.discover import discover, OpenIDServiceEndpoint, \
191-
DiscoveryFailure, OPENID_1_1_TYPE
191+
DiscoveryFailure, OPENID_1_1_TYPE, OPENID_2_0_TYPE
192192
from openid.message import Message, OPENID_NS, OPENID2_NS, OPENID1_NS, \
193193
IDENTIFIER_SELECT, no_default
194194
from openid import cryptutil
@@ -718,7 +718,7 @@ def _verifyReturnToArgs(query):
718718

719719
def _verifyDiscoveryResultsOpenID2(self, resp_msg, endpoint):
720720
to_match = OpenIDServiceEndpoint()
721-
to_match.type_uris = [OPENID2_NS]
721+
to_match.type_uris = [OPENID_2_0_TYPE]
722722
to_match.claimed_id = resp_msg.getArg(OPENID2_NS, 'claimed_id')
723723
to_match.local_id = resp_msg.getArg(OPENID2_NS, 'identity')
724724

‎openid/test/test_verifydisco.py‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from openid.test.support import OpenIDTestMixin, CatchLogs
44
from openid.consumer import consumer
55
from openid.test.test_consumer import TestIdRes
6-
from openid.consumer.discover import OpenIDServiceEndpoint
6+
from openid.consumer import discover
77

88
class Stub(object):
99
def __init__(self, test_case, result, expected_args=None):
@@ -37,7 +37,7 @@ def failUnlessProtocolError(self, prefix, callable, *args, **kwargs):
3737
'got successful return %r' % (prefix, result))
3838

3939
def test_openID1NoLocalID(self):
40-
endpoint = OpenIDServiceEndpoint()
40+
endpoint = discover.OpenIDServiceEndpoint()
4141
endpoint.claimed_id = 'bogus'
4242

4343
msg = message.Message.fromOpenIDArgs({})
@@ -100,7 +100,7 @@ def test_openID2NoEndpointDoesDisco(self):
100100
self.failUnlessLogMatches('No pre-discovered')
101101

102102
def test_openID2MismatchedDoesDisco(self):
103-
mismatched = OpenIDServiceEndpoint()
103+
mismatched = discover.OpenIDServiceEndpoint()
104104
mismatched.identity = 'nothing special, but different'
105105
mismatched.local_id = 'green cheese'
106106

@@ -116,7 +116,21 @@ def test_openID2MismatchedDoesDisco(self):
116116
self.failUnlessEqual(sentinel, result)
117117
self.failUnlessLogMatches('Mismatched pre-disco')
118118

119-
119+
def test_openid2UsePreDiscovered(self):
120+
endpoint = discover.OpenIDServiceEndpoint()
121+
endpoint.local_id = 'my identity'
122+
endpoint.claimed_id = 'i am sam'
123+
endpoint.server_url = 'Phone Home'
124+
endpoint.type_uris = [discover.OPENID_2_0_TYPE]
125+
126+
msg = message.Message.fromOpenIDArgs(
127+
{'ns':message.OPENID2_NS,
128+
'identity':endpoint.local_id,
129+
'claimed_id':endpoint.claimed_id,
130+
'op_endpoint':endpoint.server_url})
131+
result = self.consumer._verifyDiscoveryResults(msg, endpoint)
132+
self.failUnless(result is endpoint)
133+
self.failUnlessLogEmpty()
120134

121135
if __name__ == '__main__':
122136
unittest.main()

0 commit comments

Comments
 (0)