Skip to content

Commit b5bbebe

Browse files
author
tailor
committed
[project @ Fail return_to verification if bare args in response are absent from return_to]
1 parent 660e8be commit b5bbebe

2 files changed

Lines changed: 19 additions & 1 deletion

File tree

‎openid/consumer/consumer.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,9 @@ def _verifyReturnToArgs(query):
836836
raise ProtocolError("no openid.return_to in query %r" % (query,))
837837
parsed_url = urlparse(return_to)
838838
rt_query = parsed_url[4]
839-
for rt_key, rt_value in cgi.parse_qsl(rt_query):
839+
parsed_args = cgi.parse_qsl(rt_query)
840+
841+
for rt_key, rt_value in parsed_args:
840842
try:
841843
value = query[rt_key]
842844
if rt_value != value:
@@ -847,6 +849,13 @@ def _verifyReturnToArgs(query):
847849
format = "return_to parameter %s absent from query %r"
848850
raise ProtocolError(format % (rt_key, query))
849851

852+
# Make sure all non-OpenID arguments in the response are also
853+
# in the signed return_to.
854+
bare_args = message.getArgs(BARE_NS)
855+
for pair in bare_args.iteritems():
856+
if pair not in parsed_args:
857+
raise ProtocolError("Parameter %s not in return_to URL" % (pair[0],))
858+
850859
_verifyReturnToArgs = staticmethod(_verifyReturnToArgs)
851860

852861
def _verifyDiscoveryResults(self, resp_msg, endpoint=None):

‎openid/test/test_consumer.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,15 @@ def test_returnToArgsOkay(self):
10351035
# no return value, success is assumed if there are no exceptions.
10361036
self.consumer._verifyReturnToArgs(query)
10371037

1038+
def test_returnToArgsUnexpectedArg(self):
1039+
query = {
1040+
'openid.mode': 'id_res',
1041+
'openid.return_to': 'http://example.com/',
1042+
'foo': 'bar',
1043+
}
1044+
# no return value, success is assumed if there are no exceptions.
1045+
self.failUnlessRaises(ProtocolError,
1046+
self.consumer._verifyReturnToArgs, query)
10381047

10391048
def test_returnToMismatch(self):
10401049
query = {

0 commit comments

Comments
 (0)