Skip to content

Commit 70c2b39

Browse files
author
tailor
committed
[project @ Fix SessionNegotiator: unavailable session types properly handled]
1 parent cf0cca2 commit 70c2b39

2 files changed

Lines changed: 28 additions & 3 deletions

File tree

‎openid/association.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,14 @@ def addAllowedType(self, assoc_type, session_type=None):
8181
self.allowed_types = []
8282

8383
if session_type is None:
84-
for session_type in getSessionTypes(assoc_type):
85-
self.addAllowedType(assoc_type, session_type)
86-
else:
84+
available = getSessionTypes(assoc_type)
85+
86+
if not available:
8787
raise ValueError('No session available for association type %r'
8888
% (assoc_type,))
89+
90+
for session_type in getSessionTypes(assoc_type):
91+
self.addAllowedType(assoc_type, session_type)
8992
else:
9093
checkSessionType(assoc_type, session_type)
9194
self.allowed_types.append((assoc_type, session_type))

‎openid/test/test_negotiation.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,5 +249,27 @@ def testValid(self):
249249
self.failUnless(self.consumer._negotiateAssociation(self.endpoint) is assoc)
250250
self.failUnlessLogEmpty()
251251

252+
class TestNegotiatorBehaviors(unittest.TestCase, CatchLogs):
253+
def setUp(self):
254+
self.allowed_types = [
255+
('assoc1', 'session1'),
256+
('assoc2', 'session2'),
257+
]
258+
259+
self.n = association.SessionNegotiator(self.allowed_types)
260+
261+
def testAddAllowedTypeNoSessionTypes(self):
262+
self.assertRaises(ValueError, self.n.addAllowedType, 'invalid')
263+
264+
def testAddAllowedTypeBadSessionType(self):
265+
self.assertRaises(ValueError, self.n.addAllowedType, 'assoc1', 'invalid')
266+
267+
def testAddAllowedTypeContents(self):
268+
assoc_type = 'HMAC-SHA1'
269+
self.failUnless(self.n.addAllowedType(assoc_type) is None)
270+
271+
for typ in association.getSessionTypes(assoc_type):
272+
self.failUnless((assoc_type, typ) in self.n.allowed_types)
273+
252274
if __name__ == '__main__':
253275
unittest.main()

0 commit comments

Comments
 (0)