Skip to content

Commit a06f7c4

Browse files
author
Kevin Turner
committed
[project @ message.Message(): when constructed with an OpenID 1 namespace, mark namespace as implicit]
Message.setOpenIDNamespace: added an "implicit" argument
1 parent 9b3d165 commit a06f7c4

5 files changed

Lines changed: 56 additions & 51 deletions

File tree

‎openid/consumer/consumer.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,8 +1461,7 @@ def __init__(self, endpoint, assoc):
14611461
self.assoc = assoc
14621462
self.endpoint = endpoint
14631463
self.return_to_args = {}
1464-
self.message = Message()
1465-
self.message.setOpenIDNamespace(endpoint.preferredNamespace())
1464+
self.message = Message(endpoint.preferredNamespace())
14661465
self._anonymous = False
14671466

14681467
def setAnonymous(self, is_anonymous):

‎openid/message.py‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
OPENID1_NS = 'http://openid.net/signon/1.0'
2929
THE_OTHER_OPENID1_NS = 'http://openid.net/signon/1.1'
3030

31+
OPENID1_NAMESPACES = OPENID1_NS, THE_OTHER_OPENID1_NS
32+
3133
# The OpenID 2.0 namespace URI
3234
OPENID2_NS = 'http://specs.openid.net/auth/2.0'
3335

@@ -135,7 +137,8 @@ def __init__(self, openid_namespace=None):
135137
if openid_namespace is None:
136138
self._openid_ns_uri = None
137139
else:
138-
self.setOpenIDNamespace(openid_namespace)
140+
implicit = openid_namespace in OPENID1_NAMESPACES
141+
self.setOpenIDNamespace(openid_namespace, implicit)
139142

140143
def fromPostArgs(cls, args):
141144
"""Construct a Message containing a set of POST arguments.
@@ -194,13 +197,13 @@ def _fromOpenIDArgs(self, openid_args):
194197
self.namespaces.addAlias(value, ns_key)
195198
elif ns_alias == NULL_NAMESPACE and ns_key == 'ns':
196199
# null namespace
197-
self.setOpenIDNamespace(value)
200+
self.setOpenIDNamespace(value, False)
198201
else:
199202
ns_args.append((ns_alias, ns_key, value))
200203

201204
# Implicitly set an OpenID namespace definition (OpenID 1)
202205
if not self.getOpenIDNamespace():
203-
self.setOpenIDNamespace()
206+
self.setOpenIDNamespace(OPENID1_NS, True)
204207

205208
# Actually put the pairs into the appropriate namespaces
206209
for (ns_alias, ns_key, value) in ns_args:
@@ -228,18 +231,12 @@ def _getDefaultNamespace(self, mystery_alias):
228231
return uri
229232
return None
230233

231-
def setOpenIDNamespace(self, openid_ns_uri=None):
234+
def setOpenIDNamespace(self, openid_ns_uri, implicit):
232235
"""Set the OpenID namespace URI used in this message.
233236
234237
@raises InvalidOpenIDNamespace: if the namespace is not in
235238
L{Message.allowed_openid_namespaces}
236239
"""
237-
if openid_ns_uri is None:
238-
openid_ns_uri = OPENID1_NS
239-
implicit = True
240-
else:
241-
implicit = False
242-
243240
if openid_ns_uri not in self.allowed_openid_namespaces:
244241
raise InvalidOpenIDNamespace(openid_ns_uri)
245242

@@ -250,7 +247,7 @@ def getOpenIDNamespace(self):
250247
return self._openid_ns_uri
251248

252249
def isOpenID1(self):
253-
return self.getOpenIDNamespace() in [OPENID1_NS, THE_OTHER_OPENID1_NS]
250+
return self.getOpenIDNamespace() in OPENID1_NAMESPACES
254251

255252
def isOpenID2(self):
256253
return self.getOpenIDNamespace() == OPENID2_NS

‎openid/test/test_consumer.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ def run():
168168
'openid.identity':delegate_url,
169169
'openid.trust_root':trust_root,
170170
'openid.assoc_handle':fetcher.assoc_handle,
171-
'openid.ns':OPENID1_NS,
172171
}, (q, user_url, delegate_url, mode)
173172

174173
assert new_return_to.startswith(return_to)

‎openid/test/test_message.py‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -890,10 +890,10 @@ def test_setOpenIDNamespace_invalid(self):
890890

891891
for x in invalid_things:
892892
self.failUnlessRaises(message.InvalidOpenIDNamespace,
893-
m.setOpenIDNamespace, x)
893+
m.setOpenIDNamespace, x, False)
894894

895895

896-
def test_setOpenIDNamespace_1x(self):
896+
def test_isOpenID1(self):
897897
v1_namespaces = [
898898
# Yes, there are two of them.
899899
'http://openid.net/signon/1.1',
@@ -905,17 +905,30 @@ def test_setOpenIDNamespace_1x(self):
905905
self.failUnless(m.isOpenID1(), "%r not recognized as OpenID 1" %
906906
(ns,))
907907
self.failUnlessEqual(ns, m.getOpenIDNamespace())
908+
self.failUnless(m.namespaces.isImplicit(ns),
909+
m.namespaces.getNamespaceURI(message.NULL_NAMESPACE))
908910

909-
def test_setOpenIDNamespace_20(self):
910-
m = message.Message()
911-
m.setOpenIDNamespace('http://specs.openid.net/auth/2.0')
911+
def test_isOpenID2(self):
912+
ns = 'http://specs.openid.net/auth/2.0'
913+
m = message.Message(ns)
912914
self.failUnless(m.isOpenID2())
915+
self.failIf(m.namespaces.isImplicit(message.NULL_NAMESPACE))
916+
self.failUnlessEqual(ns, m.getOpenIDNamespace())
917+
918+
def test_setOpenIDNamespace_explicit(self):
919+
m = message.Message()
920+
m.setOpenIDNamespace(message.THE_OTHER_OPENID1_NS, False)
921+
self.failIf(m.namespaces.isImplicit(message.THE_OTHER_OPENID1_NS))
922+
923+
def test_setOpenIDNamespace_implicit(self):
924+
m = message.Message()
925+
m.setOpenIDNamespace(message.THE_OTHER_OPENID1_NS, True)
926+
self.failUnless(m.namespaces.isImplicit(message.THE_OTHER_OPENID1_NS))
913927

914928

915929
def test_explicitOpenID11NSSerialzation(self):
916930
m = message.Message()
917-
m.setOpenIDNamespace(message.THE_OTHER_OPENID1_NS)
918-
self.failIf(m.namespaces.isImplicit(message.THE_OTHER_OPENID1_NS))
931+
m.setOpenIDNamespace(message.THE_OTHER_OPENID1_NS, implicit=False)
919932

920933
post_args = m.toPostArgs()
921934
self.failUnlessEqual(post_args,

‎openid/test/test_server.py‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def test_browserWithReturnTo(self):
4747
expected_args = {
4848
'openid.mode': ['error'],
4949
'openid.error': ['plucky'],
50-
'openid.ns': [OPENID1_NS],
5150
}
5251

5352
rt_base, result_args = e.encodeToURL().split('?', 1)
@@ -111,7 +110,6 @@ def test_browserWithReturnTo_OpenID1_exceeds_limit(self):
111110
expected_args = {
112111
'openid.mode': ['error'],
113112
'openid.error': ['plucky'],
114-
'openid.ns': [OPENID1_NS],
115113
}
116114

117115
self.failUnless(e.whichEncoding() == server.ENCODE_URL)
@@ -130,8 +128,7 @@ def test_noReturnTo(self):
130128
self.failIf(e.hasReturnTo())
131129
expected = """error:waffles
132130
mode:error
133-
ns:%s
134-
"""%OPENID1_NS
131+
"""
135132
self.failUnlessEqual(e.encodeToKVForm(), expected)
136133

137134

@@ -763,7 +760,7 @@ def test_encodableError(self):
763760
'openid.mode': 'associate',
764761
'openid.identity': 'http://limu.unittest/',
765762
})
766-
body="error:snoot\nmode:error\nns:%s\n"%OPENID1_NS
763+
body="error:snoot\nmode:error\n"
767764
webresponse = self.encode(server.ProtocolError(args, "snoot"))
768765
self.failUnlessEqual(webresponse.code, server.HTTP_ERROR)
769766
self.failUnlessEqual(webresponse.headers, {})
@@ -973,27 +970,6 @@ def _expectAnswer(self, answer, identity=None, claimed_id=None):
973970
len(expected_list) + 2,
974971
answer.fields.toPostArgs())
975972

976-
def _expectAnswerv1(self, answer, identity=None):
977-
expected_list = [
978-
('mode', 'id_res'),
979-
('return_to', self.request.return_to),
980-
('identity', identity),
981-
]
982-
983-
for k, expected in expected_list:
984-
actual = answer.fields.getArg(OPENID_NS, k)
985-
self.failUnlessEqual(actual, expected, "%s: expected %s, got %s" % (k, expected, actual))
986-
987-
self.failUnless(answer.fields.hasKey(OPENID_NS, 'response_nonce'))
988-
self.failUnlessEqual(answer.fields.getOpenIDNamespace(), OPENID1_NS)
989-
self.failIf(answer.fields.namespaces.isImplicit(OPENID1_NS))
990-
991-
# One for nonce, one for namespace
992-
self.failUnlessEqual(len(answer.fields.toPostArgs()),
993-
len(expected_list) + 2,
994-
answer.fields.toPostArgs())
995-
996-
997973
def test_answerAllow(self):
998974
"""Check the fields specified by "Positive Assertions"
999975
@@ -1178,14 +1154,35 @@ def test_answerAllowNoEndpointOpenID1(self):
11781154
"""Test .allow() with an OpenID 1.x Message on a CheckIDRequest
11791155
built without an op_endpoint parameter.
11801156
"""
1157+
identity = 'http://bambam.unittest/'
11811158
reqmessage = Message.fromOpenIDArgs({
1182-
'identity': 'http://bambam.unittest/',
1159+
'identity': identity,
11831160
'trust_root': 'http://bar.unittest/',
11841161
'return_to': 'http://bar.unittest/999',
11851162
})
11861163
self.request = server.CheckIDRequest.fromMessage(reqmessage, None)
11871164
answer = self.request.answer(True)
1188-
self._expectAnswerv1(answer, 'http://bambam.unittest/')
1165+
1166+
expected_list = [
1167+
('mode', 'id_res'),
1168+
('return_to', self.request.return_to),
1169+
('identity', identity),
1170+
]
1171+
1172+
for k, expected in expected_list:
1173+
actual = answer.fields.getArg(OPENID_NS, k)
1174+
self.failUnlessEqual(
1175+
expected, actual,
1176+
"%s: expected %s, got %s" % (k, expected, actual))
1177+
1178+
self.failUnless(answer.fields.hasKey(OPENID_NS, 'response_nonce'))
1179+
self.failUnlessEqual(answer.fields.getOpenIDNamespace(), OPENID1_NS)
1180+
self.failUnless(answer.fields.namespaces.isImplicit(OPENID1_NS))
1181+
1182+
# One for nonce (OpenID v1 namespace is implicit)
1183+
self.failUnlessEqual(len(answer.fields.toPostArgs()),
1184+
len(expected_list) + 1,
1185+
answer.fields.toPostArgs())
11891186

11901187
def test_answerImmediateDenyOpenID2(self):
11911188
"""Look for mode=setup_needed in checkid_immediate negative
@@ -1216,9 +1213,9 @@ def test_answerImmediateDenyOpenID1(self):
12161213
# crappiting setup_url, you dirty my interface with your presence!
12171214
answer = self.request.answer(False, server_url=server_url)
12181215
self.failUnlessEqual(answer.request, self.request)
1219-
self.failUnlessEqual(len(answer.fields.toPostArgs()), 3, answer.fields)
1216+
self.failUnlessEqual(len(answer.fields.toPostArgs()), 2, answer.fields)
12201217
self.failUnlessEqual(answer.fields.getOpenIDNamespace(), OPENID1_NS)
1221-
self.failIf(answer.fields.namespaces.isImplicit(OPENID1_NS))
1218+
self.failUnless(answer.fields.namespaces.isImplicit(OPENID1_NS))
12221219
self.failUnlessEqual(answer.fields.getArg(OPENID_NS, 'mode'), 'id_res')
12231220
self.failUnless(answer.fields.getArg(
12241221
OPENID_NS, 'user_setup_url', '').startswith(server_url))

0 commit comments

Comments
 (0)