From 0dddcd1ffa64f5679d86d61a0df3288812c6dc6e Mon Sep 17 00:00:00 2001 From: James Kasten Date: Tue, 13 Jan 2015 01:03:21 -0800 Subject: [PATCH] cleanup branch --- letsencrypt/client/auth_handler.py | 4 +- letsencrypt/client/challenge_util.py | 2 +- letsencrypt/client/client.py | 2 - letsencrypt/client/client_authenticator.py | 6 ++- letsencrypt/client/le_util.py | 4 +- .../client/tests/apache/parser_test.py | 3 +- letsencrypt/client/tests/auth_handler_test.py | 43 ++++++------------- 7 files changed, 22 insertions(+), 42 deletions(-) diff --git a/letsencrypt/client/auth_handler.py b/letsencrypt/client/auth_handler.py index 9ecb868ce..b5153842d 100644 --- a/letsencrypt/client/auth_handler.py +++ b/letsencrypt/client/auth_handler.py @@ -2,8 +2,6 @@ import logging import sys -import zope.component - from letsencrypt.client import acme from letsencrypt.client import CONFIG from letsencrypt.client import challenge_util @@ -404,7 +402,7 @@ def _find_dumb_path(challenges, preferences): # Add logic for a crappy server # Choose a DV path = [] - assert(len(preferences) == len(set(preferences))) + assert len(preferences) == len(set(preferences)) for pref_c in preferences: for i, offered_challenge in enumerate(challenges): if (pref_c == offered_challenge["type"] and diff --git a/letsencrypt/client/challenge_util.py b/letsencrypt/client/challenge_util.py index 2341270cd..aef0d27e8 100644 --- a/letsencrypt/client/challenge_util.py +++ b/letsencrypt/client/challenge_util.py @@ -20,7 +20,7 @@ RecContactChall = collections.namedtuple( RecTokenChall = collections.namedtuple("RecTokenChall", "domain") PopChall = collections.namedtuple("PopChall", "domain, alg, nonce, hints") -# Helper Challenge Wrapper - Can be used to maintain the proper position of +# Helper Challenge Wrapper - Can be used to maintain the proper position of # the response within a larger challenge list IndexedChall = collections.namedtuple("IndexedChall", "chall, index") diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py index bba729d35..ac3745f2f 100644 --- a/letsencrypt/client/client.py +++ b/letsencrypt/client/client.py @@ -13,7 +13,6 @@ import zope.component from letsencrypt.client import acme from letsencrypt.client import auth_handler -from letsencrypt.client import challenge_util from letsencrypt.client import client_authenticator from letsencrypt.client import CONFIG from letsencrypt.client import crypto_util @@ -21,7 +20,6 @@ from letsencrypt.client import errors from letsencrypt.client import interfaces from letsencrypt.client import le_util from letsencrypt.client import network -from letsencrypt.client import recovery_token # it's weird to point to chocolate servers via raw IPv6 addresses, and diff --git a/letsencrypt/client/client_authenticator.py b/letsencrypt/client/client_authenticator.py index fcccb99dc..ac4406b28 100644 --- a/letsencrypt/client/client_authenticator.py +++ b/letsencrypt/client/client_authenticator.py @@ -1,3 +1,4 @@ +"""Client Authenticator""" import zope.interface from letsencrypt.client import challenge_util @@ -6,7 +7,7 @@ from letsencrypt.client import interfaces from letsencrypt.client import recovery_token class ClientAuthenticator(object): - """Authenticator for CONFIG.CLIENT_CHALLENGES. + """IAuthenticator for CONFIG.CLIENT_CHALLENGES. :ivar rec_token: Performs "recoveryToken" challenges :type rec_token: :class:`letsencrypt.client.recovery_token.RecoveryToken` @@ -23,7 +24,8 @@ class ClientAuthenticator(object): """ self.rec_token = recovery_token.RecoveryToken(server) - def get_chall_pref(self, domain): # pylint: disable=no-member-use + # pylint: disable=unused-argument,no-self-use + def get_chall_pref(self, domain): """Return list of challenge preferences.""" return ["recoveryToken"] diff --git a/letsencrypt/client/le_util.py b/letsencrypt/client/le_util.py index d96dc8c09..08b0f6114 100644 --- a/letsencrypt/client/le_util.py +++ b/letsencrypt/client/le_util.py @@ -62,9 +62,9 @@ def unique_file(default_name, mode=0o777): f_parsed = os.path.splitext(default_name) while 1: try: - fd = os.open( + file_d = os.open( default_name, os.O_CREAT | os.O_EXCL | os.O_RDWR, mode) - return os.fdopen(fd, 'w'), default_name + return os.fdopen(file_d, 'w'), default_name except OSError: pass default_name = f_parsed[0] + '_' + str(count) + f_parsed[1] diff --git a/letsencrypt/client/tests/apache/parser_test.py b/letsencrypt/client/tests/apache/parser_test.py index b7f1f6aa2..2acf6533e 100644 --- a/letsencrypt/client/tests/apache/parser_test.py +++ b/letsencrypt/client/tests/apache/parser_test.py @@ -1,3 +1,4 @@ +"""Tests the ApacheParser class.""" import os import shutil import sys @@ -14,7 +15,7 @@ from letsencrypt.client.tests.apache import config_util class ApacheParserTest(unittest.TestCase): - + """Apache Parser Test.""" def setUp(self): zope.component.provideUtility(display.FileDisplay(sys.stdout)) diff --git a/letsencrypt/client/tests/auth_handler_test.py b/letsencrypt/client/tests/auth_handler_test.py index 1581f22e0..ee0a79895 100644 --- a/letsencrypt/client/tests/auth_handler_test.py +++ b/letsencrypt/client/tests/auth_handler_test.py @@ -1,11 +1,18 @@ """Test auth_handler.py.""" import unittest import mock -import pkg_resources from letsencrypt.client.tests import acme_util +TRANSLATE = {"dvsni": "DvsniChall", + "simpleHttps": "SimpleHttpsChall", + "dns": "DnsChall", + "recoveryToken": "RecTokenChall", + "recoveryContact": "RecContactChall", + "proofOfPossession": "PopChall"} + + # pylint: disable=protected-access class SatisfyChallengesTest(unittest.TestCase): """verify_identities test.""" @@ -129,7 +136,6 @@ class SatisfyChallengesTest(unittest.TestCase): def test_name5_all(self, mock_chall_path): challenges = acme_util.get_challenges() combos = acme_util.gen_combos(challenges) - msgs = [] for i in range(5): self.handler.add_chall_msg( str(i), @@ -166,7 +172,6 @@ class SatisfyChallengesTest(unittest.TestCase): @mock.patch("letsencrypt.client.auth_handler.gen_challenge_path") def test_name5_mix(self, mock_chall_path): paths = [] - msgs = [] chosen_chall = [["dns"], ["dvsni"], ["simpleHttps", "proofOfPossession"], @@ -201,7 +206,8 @@ class SatisfyChallengesTest(unittest.TestCase): resp = self._get_exp_response(i, paths[i], challenge_list[i]) self.assertEqual(self.handler.responses[dom], resp) self.assertEqual(len(self.handler.dv_c[dom]), 1) - self.assertEqual(len(self.handler.client_c[dom]), len(chosen_chall[i]) - 1) + self.assertEqual( + len(self.handler.client_c[dom]), len(chosen_chall[i]) - 1) self.assertEqual( type(self.handler.dv_c["0"][0].chall).__name__, "DnsChall") @@ -222,29 +228,12 @@ class SatisfyChallengesTest(unittest.TestCase): def _get_exp_response(self, domain, path, challenges): exp_resp = ["null"] * len(challenges) for i in path: - exp_resp[i] = translate[challenges[i]["type"]] + str(domain) + exp_resp[i] = TRANSLATE[challenges[i]["type"]] + str(domain) return exp_resp - def printout_handler(self): - print "***** Test Printout *****" - for dom in self.handler.domains: - print "Domain:", dom - print "***Challenge Messages***" - print self.handler.msgs[dom] - print "**responses**" - print self.handler.responses[dom] - print "**path**" - print self.handler.paths[dom] - print "**dv_c**" - for item in self.handler.dv_c[dom]: - print item - print "**client_c**" - for item in self.handler.client_c[dom]: - print item - -# pylint: diable=protected-access +# pylint: disable=protected-access class GetAuthorizationsTest(unittest.TestCase): def setUp(self): from letsencrypt.client.auth_handler import AuthHandler @@ -418,14 +407,6 @@ class PathSatisfiedTest(unittest.TestCase): self.assertFalse(self.handler._path_satisfied(dom[i])) -translate = {"dvsni": "DvsniChall", - "simpleHttps": "SimpleHttpsChall", - "dns": "DnsChall", - "recoveryToken": "RecTokenChall", - "recoveryContact": "RecContactChall", - "proofOfPossession": "PopChall"} - - def gen_auth_resp(chall_list): return ["%s%s" % (type(chall).__name__, chall.domain) for chall in chall_list]