starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 16:12:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #286 from letsencrypt/fix_272

Browse Source 
Fix 272
This commit is contained in:
James Kasten
2015-03-24 22:52:16 -07:00
parent 57bb4513c3 8e3a496b8b
commit 80cdf13f6c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/client/auth_handler.py
+2 -1
View File
@@ -203,7 +203,8 @@ class AuthHandler(object): # pylint: disable=too-many-instance-attributes
def _path_satisfied(self, dom): def _path_satisfied(self, dom):
"""Returns whether a path has been completely satisfied.""" """Returns whether a path has been completely satisfied."""
return all(self.responses[dom][i] is not None for i in self.paths[dom]) # Make sure that there are no 'None' or 'False' entries along path.
return all(self.responses[dom][i] for i in self.paths[dom])
def _get_chall_pref(self, domain): def _get_chall_pref(self, domain):
"""Return list of challenge preferences. """Return list of challenge preferences.
letsencrypt/client/tests/auth_handler_test.py
+5 -2
View File
@@ -481,7 +481,7 @@ class PathSatisfiedTest(unittest.TestCase):
self.handler.responses[dom[0]] = [None, "sat", "sat2", None] self.handler.responses[dom[0]] = [None, "sat", "sat2", None]
self.handler.paths[dom[1]] = [0] self.handler.paths[dom[1]] = [0]
self.handler.responses[dom[1]] = ["sat", None, None, None] self.handler.responses[dom[1]] = ["sat", None, None, False]
self.handler.paths[dom[2]] = [0] self.handler.paths[dom[2]] = [0]
self.handler.responses[dom[2]] = ["sat"] self.handler.responses[dom[2]] = ["sat"]
@@ -496,7 +496,7 @@ class PathSatisfiedTest(unittest.TestCase):
self.assertTrue(self.handler._path_satisfied(dom[i])) self.assertTrue(self.handler._path_satisfied(dom[i]))
def test_not_satisfied(self): def test_not_satisfied(self):
dom = ["0", "1", "2"] dom = ["0", "1", "2", "3"]
self.handler.paths[dom[0]] = [1, 2] self.handler.paths[dom[0]] = [1, 2]
self.handler.responses[dom[0]] = ["sat1", None, "sat2", None] self.handler.responses[dom[0]] = ["sat1", None, "sat2", None]
@@ -506,6 +506,9 @@ class PathSatisfiedTest(unittest.TestCase):
self.handler.paths[dom[2]] = [0] self.handler.paths[dom[2]] = [0]
self.handler.responses[dom[2]] = [None] self.handler.responses[dom[2]] = [None]
self.handler.paths[dom[3]] = [0]
self.handler.responses[dom[3]] = [False]
for i in xrange(3): for i in xrange(3):
self.assertFalse(self.handler._path_satisfied(dom[i])) self.assertFalse(self.handler._path_satisfied(dom[i]))