Skip to content

Commit 8cf9938

Browse files
author
Kevin Turner
committed
[project @ server.OpenIDResponse.toFormMarkup: grab return_to from the request, not the response fields.]
Not all responses (i.e. cancel, setup_needed) include a return_to field.
1 parent 9283ced commit 8cf9938

3 files changed

Lines changed: 18 additions & 2 deletions

File tree

‎openid/message.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,8 @@ def toFormMarkup(self, action_url, form_tag_attrs=None,
322322
if ElementTree is None:
323323
raise RuntimeError('This function requires ElementTree.')
324324

325+
assert action_url is not None
326+
325327
form = ElementTree.Element('form')
326328

327329
if form_tag_attrs:

‎openid/server/server.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,8 +968,7 @@ def toFormMarkup(self):
968968
969969
@since: 2.1.0
970970
"""
971-
return self.fields.toFormMarkup(
972-
self.fields.getArg(OPENID_NS, 'return_to'))
971+
return self.fields.toFormMarkup(self.request.return_to)
973972

974973

975974
def renderAsForm(self):

‎openid/test/test_server.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,21 @@ def test_cancel(self):
641641
self.failUnlessEqual(webresponse.code, server.HTTP_REDIRECT)
642642
self.failUnless(webresponse.headers.has_key('location'))
643643

644+
def test_cancelToForm(self):
645+
request = server.CheckIDRequest(
646+
identity = 'http://bombom.unittest/',
647+
trust_root = 'http://burr.unittest/',
648+
return_to = 'http://burr.unittest/999',
649+
immediate = False,
650+
op_endpoint = self.server.op_endpoint,
651+
)
652+
response = server.OpenIDResponse(request)
653+
response.fields = Message.fromOpenIDArgs({
654+
'mode': 'cancel',
655+
})
656+
form = response.toFormMarkup()
657+
self.failUnless(form)
658+
644659
def test_assocReply(self):
645660
msg = Message(OPENID2_NS)
646661
msg.setArg(OPENID2_NS, 'session_type', 'no-encryption')

0 commit comments

Comments
 (0)