Skip to content

Commit 7a87aeb

Browse files
author
Kevin Turner
committed
[project @ consumer.GenericConsumer._idResCheckSignature: generated signed_list for sign-all sigs]
1 parent 6789143 commit 7a87aeb

2 files changed

Lines changed: 59 additions & 3 deletions

File tree

‎openid/consumer/consumer.py‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,11 @@ def _idResCheckSignature(self, message, server_url):
572572
if not assoc.checkMessageSignature(message):
573573
raise ValueError('Bad signature')
574574

575+
if assoc.sign_all:
576+
signed_list = message.toPostArgs().keys()
577+
else:
578+
signed_list = message.getArg(OPENID_NS, 'signed').split(',')
579+
575580
else:
576581
# It's not an association we know about. Stateless mode is our
577582
# only possible path for recovery.
@@ -580,9 +585,17 @@ def _idResCheckSignature(self, message, server_url):
580585
if not self._checkAuth(message, server_url):
581586
raise ValueError('Server denied check_authentication')
582587

583-
# XXX: association-type specific
584-
signed = message.getArg(OPENID_NS, 'signed')
585-
return signed.split(',')
588+
# XXX: Danger! We don't know what the server's signing algorithm
589+
# is. We assume that if there is no signed list, the server
590+
# is not so brain-dead as to return is_valid=true unless it is
591+
# using sign-all.
592+
signed_list = message.getArg(OPENID_NS, 'signed')
593+
if not signed_list:
594+
signed_list = message.toPostArgs().keys()
595+
else:
596+
signed_list = signed_list.split(',')
597+
598+
return signed_list
586599

587600

588601
def _idResCheckForFields(self, message, signed_list):

‎openid/test/test_consumer.py‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def associate(qs, assoc_secret, assoc_handle):
7373
class GoodAssociation:
7474
expiresIn = 3600
7575
handle = "-blah-"
76+
sign_all = False
7677

7778
def getExpiresIn(self):
7879
return self.expiresIn
@@ -272,6 +273,48 @@ def setUp(self):
272273
self.endpoint.delegate = self.server_id = "sirod"
273274

274275

276+
277+
class TestIdResCheckSignature(TestIdRes):
278+
def setUp(self):
279+
TestIdRes.setUp(self)
280+
self.assoc = GoodAssociation()
281+
self.assoc.handle = "{not_dumb}"
282+
self.assoc.sign_all = True
283+
self.store.storeAssociation(self.endpoint.server_url, self.assoc)
284+
285+
self.message = Message.fromPostArgs({
286+
'openid.mode': 'id_res',
287+
'openid.identity': '=example',
288+
'openid.sig': GOODSIG,
289+
'openid.assoc_handle': self.assoc.handle,
290+
'frobboz': 'banzit',
291+
})
292+
self.expected_signed = ['openid.mode','openid.identity','openid.sig',
293+
'openid.assoc_handle','frobboz']
294+
self.expected_signed.sort()
295+
296+
297+
def test_signall(self):
298+
# assoc_handle to assoc with good sig and sign_all = True
299+
signed = self.consumer._idResCheckSignature(self.message,
300+
self.endpoint.server_url)
301+
signed.sort()
302+
self.failUnlessEqual(self.expected_signed, signed)
303+
304+
305+
def test_signall_stateless(self):
306+
# assoc_handle missing assoc, consumer._checkAuth returns goodthings
307+
self.message.setArg(OPENID_NS, "assoc_handle", "dumbHandle")
308+
self.consumer._processCheckAuthResponse = (
309+
lambda response, server_url: True)
310+
self.consumer._makeKVPost = lambda args, server_url: {}
311+
signed = self.consumer._idResCheckSignature(self.message,
312+
self.endpoint.server_url)
313+
signed.sort()
314+
self.failUnlessEqual(self.expected_signed, signed)
315+
316+
317+
275318
class TestQueryFormat(TestIdRes):
276319
def test_notAList(self):
277320
# XXX: should be a Message object test, not a consumer test

0 commit comments

Comments
 (0)