Skip to content

Commit 8bad9e2

Browse files
author
tailor
committed
[project @ Added toHTML methods in consumer and server where toFormMarkup appears]
1 parent 3d3217c commit 8bad9e2

4 files changed

Lines changed: 65 additions & 1 deletion

File tree

‎openid/consumer/consumer.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,6 +1666,20 @@ def formMarkup(self, realm, return_to=None, immediate=False,
16661666
return message.toFormMarkup(self.endpoint.server_url,
16671667
form_tag_attrs)
16681668

1669+
def htmlMarkup(self, realm, return_to=None, immediate=False,
1670+
form_tag_attrs=None):
1671+
"""Get an autosubmitting HTML page that submits this request to the
1672+
IDP. This is just a wrapper for formMarkup.
1673+
1674+
@see: formMarkup
1675+
1676+
@returns: str
1677+
"""
1678+
return oidutil.autoSubmitHTML(self.formMarkup(realm,
1679+
return_to,
1680+
immediate,
1681+
form_tag_attrs))
1682+
16691683
def shouldSendRedirect(self):
16701684
"""Should this OpenID authentication request be sent as a HTTP
16711685
redirect or as a POST (form submission)?

‎openid/oidutil.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
interesting.
66
"""
77

8-
__all__ = ['log', 'appendArgs', 'toBase64', 'fromBase64']
8+
__all__ = ['log', 'appendArgs', 'toBase64', 'fromBase64', 'autoSubmitHTML']
99

1010
import binascii
1111
import sys
@@ -21,6 +21,15 @@
2121
'elementtree.ElementTree',
2222
]
2323

24+
def autoSubmitHTML(form):
25+
return """
26+
<html>
27+
<body onload="document.forms[0].submit();">
28+
%s
29+
</body>
30+
</html>
31+
"""%form
32+
2433
def importElementTree(module_names=None):
2534
"""Find a working ElementTree implementation, trying the standard
2635
places that such a thing might show up.

‎openid/server/server.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,17 @@ def toFormMarkup(self, form_tag_attrs=None):
982982
return self.fields.toFormMarkup(self.request.return_to,
983983
form_tag_attrs=form_tag_attrs)
984984

985+
def toHTML(self, form_tag_attrs=None):
986+
"""Returns an HTML document that auto-submits the form markup
987+
for this response.
988+
989+
@returntype: str
990+
991+
@see: toFormMarkup
992+
993+
@since: 2.1.?
994+
"""
995+
return oidutil.autoSubmitHTML(self.toFormMarkup(form_tag_attrs))
985996

986997
def renderAsForm(self):
987998
"""Returns True if this response's encoding is
@@ -1670,6 +1681,14 @@ def toFormMarkup(self):
16701681
"""
16711682
return self.toMessage().toFormMarkup(self.getReturnTo())
16721683

1684+
def toHTML(self):
1685+
"""Encode to a full HTML page, wrapping the form markup in a page
1686+
that will autosubmit the form.
1687+
1688+
@since: 2.1.?
1689+
"""
1690+
return oidutil.autoSubmitHTML(self.toFormMarkup())
1691+
16731692
def whichEncoding(self):
16741693
"""How should I be encoded?
16751694

‎openid/test/test_server.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,28 @@ def test_toFormMarkup(self):
604604
form_markup = response.toFormMarkup({'foo':'bar'})
605605
self.failUnless(' foo="bar"' in form_markup)
606606

607+
def test_toHTML(self):
608+
request = server.CheckIDRequest(
609+
identity = 'http://bombom.unittest/',
610+
trust_root = 'http://burr.unittest/',
611+
return_to = 'http://burr.unittest/999',
612+
immediate = False,
613+
op_endpoint = self.server.op_endpoint,
614+
)
615+
response = server.OpenIDResponse(request)
616+
response.fields = Message.fromOpenIDArgs({
617+
'ns': OPENID2_NS,
618+
'mode': 'id_res',
619+
'identity': request.identity,
620+
'claimed_id': request.identity,
621+
'return_to': 'x' * OPENID1_URL_LIMIT,
622+
})
623+
html = response.toHTML()
624+
self.failUnless('<html>' in html)
625+
self.failUnless('</html>' in html)
626+
self.failUnless('<body onload=' in html)
627+
self.failUnless('<form' in html)
628+
self.failUnless('http://bombom.unittest/' in html)
607629

608630
def test_id_res_OpenID1_exceeds_limit(self):
609631
"""

0 commit comments

Comments
 (0)