Skip to content

Commit 4496b37

Browse files
author
Kevin Turner
committed
[project @ message: more testing of OpenID 1.x messages that include openid.ns.]
This fixes a KeyError triggered by some Drupal messages.
1 parent d7e57b4 commit 4496b37

2 files changed

Lines changed: 22 additions & 3 deletions

File tree

‎openid/message.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ def _fromOpenIDArgs(self, openid_args):
190190
self.namespaces.addAlias(value, ns_key)
191191
elif ns_alias == NULL_NAMESPACE and ns_key == 'ns':
192192
# null namespace
193-
self.namespaces.addAlias(value, NULL_NAMESPACE)
193+
self.setOpenIDNamespace(value)
194194
else:
195195
ns_args.append((ns_alias, ns_key, value))
196196

197197
# Ensure that there is an OpenID namespace definition
198-
self.setOpenIDNamespace(
199-
self.namespaces.getNamespaceURI(NULL_NAMESPACE) or OPENID1_NS)
198+
if not self.getOpenIDNamespace():
199+
self.setOpenIDNamespace(OPENID1_NS)
200200

201201
# Actually put the pairs into the appropriate namespaces
202202
for (ns_alias, ns_key, value) in ns_args:

‎openid/test/test_message.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,25 @@ def test_setOpenIDNamespace_20(self):
799799
self.failUnless(m.isOpenID2())
800800

801801

802+
def test_fromPostArgs_ns11(self):
803+
# An example of the stuff that some Drupal installations send us,
804+
# which includes openid.ns but is 1.1.
805+
query = {
806+
u'openid.assoc_handle': u'',
807+
u'openid.claimed_id': u'http://foobar.invalid/',
808+
u'openid.identity': u'http://foobar.myopenid.com',
809+
u'openid.mode': u'checkid_setup',
810+
u'openid.ns': u'http://openid.net/signon/1.1',
811+
u'openid.ns.sreg': u'http://openid.net/extensions/sreg/1.1',
812+
u'openid.return_to': u'http://drupal.invalid/return_to',
813+
u'openid.sreg.required': u'nickname,email',
814+
u'openid.trust_root': u'http://drupal.invalid',
815+
}
816+
m = message.Message.fromPostArgs(query)
817+
self.failUnless(m.isOpenID1())
818+
819+
820+
802821
class NamespaceMapTest(unittest.TestCase):
803822
def test_onealias(self):
804823
nsm = message.NamespaceMap()

0 commit comments

Comments
 (0)