Skip to content

Commit 4aa832e

Browse files
author
Josh Hoyt
committed
[project @ FIX #1599: openid.identifier MUST be sent when it's an OpenID 1 request]
also moved auth request tests to their own file for simplicity
1 parent 8c8e9d7 commit 4aa832e

4 files changed

Lines changed: 136 additions & 50 deletions

File tree

‎openid/consumer/consumer.py‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,25 @@ def __init__(self, endpoint, assoc):
10551055
self.return_to_args = {}
10561056
self.message = Message()
10571057
self.message.setOpenIDNamespace(endpoint.preferredNamespace())
1058-
self.anonymous = False
1058+
self._anonymous = False
1059+
1060+
def setAnonymous(self, is_anonymous):
1061+
"""Set whether this request should be made anonymously. If a
1062+
request is anonymous, the identifier will not be sent in the
1063+
request. This is only useful if you are making another kind of
1064+
request with an extension in this request.
1065+
1066+
Anonymous requests are not allowed when the request is made
1067+
with OpenID 1.
1068+
1069+
@raises: ValueError when attempting to set an OpenID1 request
1070+
as anonymous
1071+
"""
1072+
if is_anonymous and self.message.isOpenID1():
1073+
raise ValueError('OpenID 1 requests MUST include the '
1074+
'identifier in the request')
1075+
else:
1076+
self._anonymous = is_anonymous
10591077

10601078
def addExtensionArg(self, namespace, key, value):
10611079
"""Add an extension argument to this OpenID authentication
@@ -1099,10 +1117,14 @@ def getMessage(self, trust_root, return_to, immediate=False):
10991117
'trust_root':trust_root,
11001118
})
11011119

1102-
if not self.anonymous:
1103-
request_identity = self.endpoint.getLocalID()
1104-
if request_identity is None:
1120+
if not self._anonymous:
1121+
if self.endpoint.isOPIdentifier():
1122+
# This will never happen when we're in compatibility
1123+
# mode, as long as isOPIdentifier() returns False
1124+
# whenever preferredNamespace() returns OPENID1_NS.
11051125
request_identity = IDENTIFIER_SELECT
1126+
else:
1127+
request_identity = self.endpoint.getLocalID()
11061128

11071129
message.setArg(OPENID_NS, 'identity', request_identity)
11081130

‎openid/consumer/discover.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ def preferredNamespace(self):
4949
def compatibilityMode(self):
5050
return OPENID_2_0_MESSAGE_NS not in self.type_uris
5151

52+
def isOPIdentifier(self):
53+
return OPENID_IDP_2_0_TYPE in self.type_uris
54+
5255
def __init__(self):
5356
self.claimed_id = None
5457
self.server_url = None

‎openid/test/test_auth_request.py‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
import cgi
2+
import unittest
3+
4+
from openid.consumer import consumer
5+
from openid import message
6+
7+
class DummyEndpoint(object):
8+
preferred_namespace = message.OPENID2_NS
9+
local_id = None
10+
server_url = None
11+
is_op_identifier = False
12+
13+
def preferredNamespace(self):
14+
return self.preferred_namespace
15+
16+
def getLocalID(self):
17+
return self.local_id
18+
19+
def isOPIdentifier(self):
20+
return self.is_op_identifier
21+
22+
class DummyAssoc(object):
23+
handle = "assoc-handle"
24+
25+
class TestAuthRequestBase(unittest.TestCase):
26+
def setUpEndpoint(self):
27+
self.endpoint = DummyEndpoint()
28+
self.endpoint.local_id = 'http://server.unittest/joe'
29+
self.endpoint.server_url = 'http://server.unittest/'
30+
31+
def setUp(self):
32+
self.setUpEndpoint()
33+
self.assoc = DummyAssoc()
34+
self.authreq = consumer.AuthRequest(self.endpoint, self.assoc)
35+
36+
class TestAuthRequest(TestAuthRequestBase):
37+
def test_justConstruct(self):
38+
"""Make sure that constructing an AuthRequest works"""
39+
40+
def test_addExtensionArg(self):
41+
self.authreq.addExtensionArg('bag:', 'color', 'brown')
42+
self.authreq.addExtensionArg('bag:', 'material', 'paper')
43+
self.failUnless('bag:' in self.authreq.message.namespaces)
44+
self.failUnlessEqual(self.authreq.message.getArgs('bag:'),
45+
{'color': 'brown',
46+
'material': 'paper'})
47+
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
48+
self.failUnless(url.find('openid.ns.0=bag%3A') != -1,
49+
'extension bag namespace not found in %s' % (url,))
50+
self.failUnless(url.find('openid.0.color=brown') != -1,
51+
'extension arg not found in %s' % (url,))
52+
self.failUnless(url.find('openid.0.material=paper') != -1,
53+
'extension arg not found in %s' % (url,))
54+
55+
class TestAuthRequestOpenID2(TestAuthRequestBase):
56+
def test_setAnonymous(self):
57+
req = consumer.AuthRequest(self.endpoint, self.assoc)
58+
self.failUnless(req.message.isOpenID2())
59+
req.setAnonymous(True)
60+
req.setAnonymous(False)
61+
62+
def test_userAnonymous(self):
63+
self.authreq.setAnonymous(True)
64+
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
65+
self.failUnless(url.find('openid.identity') == -1,
66+
'unwanted openid.identity arg appeared in %s' % (url,))
67+
68+
def test_opAnonymous(self):
69+
self.endpoint.is_op_identifier = True
70+
self.authreq.setAnonymous(True)
71+
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
72+
self.failUnless(url.find('openid.identity') == -1,
73+
'unwanted openid.identity arg appeared in %s' % (url,))
74+
75+
76+
def test_idpEndpoint(self):
77+
self.endpoint.is_op_identifier = True
78+
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
79+
_, qstring = url.split('?')
80+
params = dict(cgi.parse_qsl(qstring))
81+
self.failUnlessEqual(params['openid.identity'],
82+
message.IDENTIFIER_SELECT)
83+
84+
class TestAuthRequestOpenID1(TestAuthRequestBase):
85+
def setUpEndpoint(self):
86+
self.endpoint = DummyEndpoint()
87+
self.endpoint.local_id = 'http://server.unittest/joe'
88+
self.endpoint.server_url = 'http://server.unittest/'
89+
self.endpoint.preferred_namespace = message.OPENID1_NS
90+
91+
def test_setAnonymous(self):
92+
req = consumer.AuthRequest(self.endpoint, self.assoc)
93+
self.failUnless(req.message.isOpenID1())
94+
self.failUnlessRaises(ValueError, req.setAnonymous, True)
95+
req.setAnonymous(False)
96+
97+
def test_idpEndpoint(self):
98+
self.endpoint.is_op_identifier = True
99+
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
100+
_, qstring = url.split('?')
101+
params = dict(cgi.parse_qsl(qstring))
102+
self.failUnlessEqual(params['openid.identity'],
103+
message.IDENTIFIER_SELECT)
104+
105+
106+
if __name__ == '__main__':
107+
unittest.main()

‎openid/test/test_consumer.py‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -955,52 +955,6 @@ def test_error_exception_wrapped(self):
955955
self.failIf(self.consumer._checkAuth(msg, 'some://url'))
956956

957957

958-
class TestAuthRequest(unittest.TestCase):
959-
def setUp(self):
960-
self.endpoint = OpenIDServiceEndpoint()
961-
self.endpoint.local_id = 'http://server.unittest/joe'
962-
self.endpoint.server_url = 'http://server.unittest/'
963-
self.assoc = self
964-
self.assoc.handle = 'assoc@handle'
965-
self.authreq = AuthRequest(self.endpoint, self.assoc)
966-
967-
def test_addExtensionArg(self):
968-
self.authreq.addExtensionArg('bag:', 'color', 'brown')
969-
self.authreq.addExtensionArg('bag:', 'material', 'paper')
970-
self.failUnless('bag:' in self.authreq.message.namespaces)
971-
self.failUnlessEqual(self.authreq.message.getArgs('bag:'),
972-
{'color': 'brown',
973-
'material': 'paper'})
974-
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
975-
self.failUnless(url.find('openid.ns.0=bag%3A') != -1,
976-
'extension bag namespace not found in %s' % (url,))
977-
self.failUnless(url.find('openid.0.color=brown') != -1,
978-
'extension arg not found in %s' % (url,))
979-
self.failUnless(url.find('openid.0.material=paper') != -1,
980-
'extension arg not found in %s' % (url,))
981-
982-
def test_idpEndpoint(self):
983-
self.endpoint.local_id = None
984-
self.endpoint.claimed_id = None
985-
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
986-
_, qstring = url.split('?')
987-
params = dict(cgi.parse_qsl(qstring))
988-
self.failUnlessEqual(params['openid.identity'], IDENTIFIER_SELECT)
989-
990-
def test_idpAnonymous(self):
991-
self.endpoint.local_id = None
992-
self.endpoint.claimed_id = None
993-
self.authreq.anonymous = True
994-
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
995-
self.failUnless(url.find('openid.identity') == -1,
996-
'unwanted openid.identity arg appeared in %s' % (url,))
997-
998-
def test_userAnonymous(self):
999-
self.authreq.anonymous = True
1000-
url = self.authreq.redirectURL('http://7.utest/', 'http://7.utest/r')
1001-
self.failUnless(url.find('openid.identity') == -1,
1002-
'unwanted openid.identity arg appeared in %s' % (url,))
1003-
1004958
class TestSuccessResponse(unittest.TestCase):
1005959
def setUp(self):
1006960
self.endpoint = OpenIDServiceEndpoint()

0 commit comments

Comments
 (0)