Skip to content

Commit a86e635

Browse files
author
Kevin Turner
committed
[project @ message.Message.setArg: assert value is not None. Fixes openid#24.]
server.Server.CheckIDRequest.answer: do not add empty op_endpoint param to v1 messages. Fixes openid#25.
1 parent e74124d commit a86e635

5 files changed

Lines changed: 45 additions & 5 deletions

File tree

‎openid/message.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,8 @@ def updateArgs(self, namespace, updates):
448448

449449
def setArg(self, namespace, key, value):
450450
"""Set a single argument in this namespace"""
451+
assert key is not None
452+
assert value is not None
451453
namespace = self._fixNS(namespace)
452454
self.args[(namespace, key)] = value
453455
if not (namespace is BARE_NS):

‎openid/server/server.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,11 +793,13 @@ def answer(self, allow, server_url=None, identity=None, claimed_id=None):
793793

794794
response.fields.updateArgs(OPENID_NS, {
795795
'mode': mode,
796-
'op_endpoint': server_url,
797796
'return_to': self.return_to,
798797
'response_nonce': mkNonce(),
799798
})
800799

800+
if server_url:
801+
response.fields.setArg(OPENID_NS, 'op_endpoint', server_url)
802+
801803
if response_identity is not None:
802804
response.fields.setArg(
803805
OPENID_NS, 'identity', response_identity)

‎openid/test/test_message.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ def test_setArgNS2(self):
172172
def test_setArgNS3(self):
173173
self._test_setArgNS('urn:nothing-significant')
174174

175+
def test_setArgToNone(self):
176+
self.failUnlessRaises(AssertionError, self.msg.setArg,
177+
message.OPENID1_NS, 'op_endpoint', None)
178+
175179
def test_delArg(self):
176180
# Could reasonably raise KeyError instead of raising
177181
# UndefinedOpenIDNamespace. I'm not sure which one is more

‎openid/test/test_negotiation.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def testEmptyAssocType(self):
5757
msg = Message(self.endpoint.preferredNamespace())
5858
msg.setArg(OPENID_NS, 'error', 'Unsupported type')
5959
msg.setArg(OPENID_NS, 'error_code', 'unsupported-type')
60-
msg.setArg(OPENID_NS, 'assoc_type', None)
60+
# not set: msg.delArg(OPENID_NS, 'assoc_type')
6161
msg.setArg(OPENID_NS, 'session_type', 'new-session-type')
6262

6363
self.consumer.return_messages = [msg]
@@ -76,7 +76,7 @@ def testEmptySessionType(self):
7676
msg.setArg(OPENID_NS, 'error', 'Unsupported type')
7777
msg.setArg(OPENID_NS, 'error_code', 'unsupported-type')
7878
msg.setArg(OPENID_NS, 'assoc_type', 'new-assoc-type')
79-
msg.setArg(OPENID_NS, 'session_type', None)
79+
# not set: msg.setArg(OPENID_NS, 'session_type', None)
8080

8181
self.consumer.return_messages = [msg]
8282
self.assertEqual(self.consumer._negotiateAssociation(self.endpoint), None)
@@ -185,7 +185,7 @@ def testEmptyAssocType(self):
185185
msg = Message(self.endpoint.preferredNamespace())
186186
msg.setArg(OPENID_NS, 'error', 'Unsupported type')
187187
msg.setArg(OPENID_NS, 'error_code', 'unsupported-type')
188-
msg.setArg(OPENID_NS, 'assoc_type', None)
188+
# not set: msg.setArg(OPENID_NS, 'assoc_type', None)
189189
msg.setArg(OPENID_NS, 'session_type', 'new-session-type')
190190

191191
self.consumer.return_messages = [msg]
@@ -198,7 +198,7 @@ def testEmptySessionType(self):
198198
msg.setArg(OPENID_NS, 'error', 'Unsupported type')
199199
msg.setArg(OPENID_NS, 'error_code', 'unsupported-type')
200200
msg.setArg(OPENID_NS, 'assoc_type', 'new-assoc-type')
201-
msg.setArg(OPENID_NS, 'session_type', None)
201+
# not set: msg.setArg(OPENID_NS, 'session_type', None)
202202

203203
self.consumer.return_messages = [msg]
204204
self.assertEqual(self.consumer._negotiateAssociation(self.endpoint), None)

‎openid/test/test_server.py‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,25 @@ def _expectAnswer(self, answer, identity=None, claimed_id=None):
869869
len(expected_list) + 2,
870870
answer.fields.toPostArgs())
871871

872+
def _expectAnswerv1(self, answer, identity=None):
873+
expected_list = [
874+
('mode', 'id_res'),
875+
('return_to', self.request.return_to),
876+
('identity', identity),
877+
]
878+
879+
for k, expected in expected_list:
880+
actual = answer.fields.getArg(OPENID_NS, k)
881+
self.failUnlessEqual(actual, expected, "%s: expected %s, got %s" % (k, expected, actual))
882+
883+
self.failUnless(answer.fields.hasKey(OPENID_NS, 'response_nonce'))
884+
self.failUnlessEqual(answer.fields.getOpenIDNamespace(), OPENID1_NS)
885+
886+
# One for nonce
887+
self.failUnlessEqual(len(answer.fields.toPostArgs()),
888+
len(expected_list) + 1,
889+
answer.fields.toPostArgs())
890+
872891

873892
def test_answerAllow(self):
874893
"""Check the fields specified by "Positive Assertions"
@@ -988,6 +1007,19 @@ def test_answerAllowNoTrustRoot(self):
9881007
self.failUnlessEqual(answer.request, self.request)
9891008
self._expectAnswer(answer, self.request.identity)
9901009

1010+
def test_answerAllowNoEndpointOpenID1(self):
1011+
"""Test .allow() with an OpenID 1.x Message on a CheckIDRequest
1012+
built without an op_endpoint parameter.
1013+
"""
1014+
reqmessage = Message.fromOpenIDArgs({
1015+
'identity': 'http://bambam.unittest/',
1016+
'trust_root': 'http://bar.unittest/',
1017+
'return_to': 'http://bar.unittest/999',
1018+
})
1019+
self.request = server.CheckIDRequest.fromMessage(reqmessage, None)
1020+
answer = self.request.answer(True)
1021+
self._expectAnswerv1(answer, 'http://bambam.unittest/')
1022+
9911023
def test_answerImmediateDenyOpenID2(self):
9921024
"""Look for mode=setup_needed in checkid_immediate negative
9931025
response in OpenID 2 case.

0 commit comments

Comments
 (0)