From e75dc965596bfd8b52019bbfef6cdd681978fc89 Mon Sep 17 00:00:00 2001
From: Erik Rose <erik@mozilla.com>
Date: Wed, 25 Nov 2015 12:44:17 -0500
Subject: [PATCH] Stop calling things that don't implement IAuthenticator
 authenticators.

---
 .../letsencrypt_apache/configurator.py             | 14 +++++++-------
 .../letsencrypt_apache/tls_sni_01.py               |  2 +-
 .../letsencrypt_nginx/configurator.py              | 14 +++++++-------
 letsencrypt-nginx/letsencrypt_nginx/tls_sni_01.py  |  2 +-
 letsencrypt/plugins/common.py                      |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py
index ef7ff03c6..c7c9a98b5 100644
--- a/letsencrypt-apache/letsencrypt_apache/configurator.py
+++ b/letsencrypt-apache/letsencrypt_apache/configurator.py
@@ -1152,15 +1152,15 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """
         self._chall_out.update(achalls)
         responses = [None] * len(achalls)
-        authenticator = tls_sni_01.ApacheTlsSni01(self)
+        chall_doer = tls_sni_01.ApacheTlsSni01(self)
 
         for i, achall in enumerate(achalls):
-            # Currently also have authenticator hold associated index
-            # of the challenge. This helps to put all of the responses back
-            # together when they are all complete.
-            authenticator.add_chall(achall, i)
+            # Currently also have chall_doer hold associated index of the
+            # challenge. This helps to put all of the responses back together
+            # when they are all complete.
+            chall_doer.add_chall(achall, i)
 
-        sni_response = authenticator.perform()
+        sni_response = chall_doer.perform()
         if sni_response:
             # Must restart in order to activate the challenges.
             # Handled here because we may be able to load up other challenge
@@ -1171,7 +1171,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             # place in the responses return value. All responses must be in the
             # same order as the original challenges.
             for i, resp in enumerate(sni_response):
-                responses[authenticator.indices[i]] = resp
+                responses[chall_doer.indices[i]] = resp
 
         return responses
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py b/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
index 38ca1d390..e1a7d2d53 100644
--- a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
+++ b/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
@@ -1,4 +1,4 @@
-"""A TLS-SNI-01 authenticator for Apache"""
+"""A class that performs TLS-SNI-01 challenges for Apache"""
 
 import os
 
diff --git a/letsencrypt-nginx/letsencrypt_nginx/configurator.py b/letsencrypt-nginx/letsencrypt_nginx/configurator.py
index c1ac9db66..aaaf43c5f 100644
--- a/letsencrypt-nginx/letsencrypt_nginx/configurator.py
+++ b/letsencrypt-nginx/letsencrypt_nginx/configurator.py
@@ -574,15 +574,15 @@ class NginxConfigurator(common.Plugin):
         """
         self._chall_out += len(achalls)
         responses = [None] * len(achalls)
-        authenticator = tls_sni_01.NginxTlsSni01(self)
+        chall_doer = tls_sni_01.NginxTlsSni01(self)
 
         for i, achall in enumerate(achalls):
-            # Currently also have authenticator hold associated index
-            # of the challenge. This helps to put all of the responses back
-            # together when they are all complete.
-            authenticator.add_chall(achall, i)
+            # Currently also have chall_doer hold associated index of the
+            # challenge. This helps to put all of the responses back together
+            # when they are all complete.
+            chall_doer.add_chall(achall, i)
 
-        sni_response = authenticator.perform()
+        sni_response = chall_doer.perform()
         # Must restart in order to activate the challenges.
         # Handled here because we may be able to load up other challenge types
         self.restart()
@@ -591,7 +591,7 @@ class NginxConfigurator(common.Plugin):
         # in the responses return value. All responses must be in the same order
         # as the original challenges.
         for i, resp in enumerate(sni_response):
-            responses[authenticator.indices[i]] = resp
+            responses[chall_doer.indices[i]] = resp
 
         return responses
 
diff --git a/letsencrypt-nginx/letsencrypt_nginx/tls_sni_01.py b/letsencrypt-nginx/letsencrypt_nginx/tls_sni_01.py
index c1bd434f6..e59281c4c 100644
--- a/letsencrypt-nginx/letsencrypt_nginx/tls_sni_01.py
+++ b/letsencrypt-nginx/letsencrypt_nginx/tls_sni_01.py
@@ -1,4 +1,4 @@
-"""A TLS-SNI-01 authenticator for Nginx"""
+"""A class that performs TLS-SNI-01 challenges for Nginx"""
 
 import itertools
 import logging
diff --git a/letsencrypt/plugins/common.py b/letsencrypt/plugins/common.py
index d414dd146..f18b1fb3b 100644
--- a/letsencrypt/plugins/common.py
+++ b/letsencrypt/plugins/common.py
@@ -136,7 +136,7 @@ class Addr(object):
 
 
 class TLSSNI01(object):
-    """Abstract base for TLS-SNI-01 authenticators"""
+    """Abstract base for TLS-SNI-01 challenge performers"""
 
     def __init__(self, configurator):
         self.configurator = configurator