From a643289662fd90e029760788dd6916d360be178f Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 19 Oct 2015 19:13:48 -0700 Subject: [PATCH] Updated todos --- letsencrypt/auth_handler.py | 6 ++---- letsencrypt/client.py | 2 -- letsencrypt/renewer.py | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/letsencrypt/auth_handler.py b/letsencrypt/auth_handler.py index b27a569f6..2da053f8c 100644 --- a/letsencrypt/auth_handler.py +++ b/letsencrypt/auth_handler.py @@ -153,10 +153,8 @@ class AuthHandler(object): """ active_achalls = [] for achall, resp in itertools.izip(achalls, resps): - # XXX: make sure that all achalls, including those - # corresponding to None or False returned from - # Authenticator are removed from the queue and thus avoid - # infinite loop + # This line needs to be outside of the if block below to + # ensure failed challenges are cleaned up correctly active_achalls.append(achall) # Don't send challenges for None and False authenticator responses diff --git a/letsencrypt/client.py b/letsencrypt/client.py index 3e32ab015..732bdcf03 100644 --- a/letsencrypt/client.py +++ b/letsencrypt/client.py @@ -329,8 +329,6 @@ class Client(object): with error_handler.ErrorHandler(self.installer.recovery_routine): for dom in domains: - # TODO: Provide a fullchain reference for installers like - # nginx that want it self.installer.deploy_cert( domain=dom, cert_path=os.path.abspath(cert_path), key_path=os.path.abspath(privkey_path), diff --git a/letsencrypt/renewer.py b/letsencrypt/renewer.py index 1efc2920b..33492f344 100644 --- a/letsencrypt/renewer.py +++ b/letsencrypt/renewer.py @@ -95,7 +95,7 @@ def renew(cert, old_version): sans = crypto_util.get_sans_from_cert(f.read()) new_certr, new_chain, new_key, _ = le_client.obtain_certificate(sans) if new_chain: - # XXX: Assumes that there was no key change. We need logic + # XXX: Assumes that there was a key change. We need logic # for figuring out whether there was or not. Probably # best is to have obtain_certificate return None for # new_key if the old key is to be used (since save_successor @@ -180,7 +180,6 @@ def main(config=None, cli_args=sys.argv[1:]): rc_config = configobj.ConfigObj(cli_config.renewer_config_file) rc_config.merge(configobj.ConfigObj( os.path.join(cli_config.renewal_configs_dir, i))) - # TODO: this is a dirty hack! rc_config.filename = os.path.join(cli_config.renewal_configs_dir, i) try: # TODO: Before trying to initialize the RenewableCert object,