tls-sni-01 in apache and nginx plugins

letsencrypt/plugins/common.py

@@ -135,22 +135,22 @@ class Addr(object):
         return self.__class__((self.tup[0], port))
 
 
-class Dvsni(object):
-    """Class that perform DVSNI challenges."""
+class TLSSNI01(object):
+    """Class that performs tls-sni-01 challenges."""
 
     def __init__(self, configurator):
         self.configurator = configurator
         self.achalls = []
         self.indices = []
         self.challenge_conf = os.path.join(
-            configurator.config.config_dir, "le_dvsni_cert_challenge.conf")
+            configurator.config.config_dir, "le_tls_sni_01_cert_challenge.conf")
         # self.completed = 0
 
     def add_chall(self, achall, idx=None):
-        """Add challenge to DVSNI object to perform at once.
+        """Add challenge to TLSSNI01 object to perform at once.
 
-        :param achall: Annotated DVSNI challenge.
-        :type achall: :class:`letsencrypt.achallenges.DVSNI`
+        :param .KeyAuthorizationAnnotatedChallenge achall: Annotated
+            TLSSNI01 challenge.
 
         :param int idx: index to challenge in a larger array
 
@@ -162,8 +162,8 @@ class Dvsni(object):
     def get_cert_path(self, achall):
         """Returns standardized name for challenge certificate.
 
-        :param achall: Annotated DVSNI challenge.
-        :type achall: :class:`letsencrypt.achallenges.DVSNI`
+        :param .KeyAuthorizationAnnotatedChallenge achall: Annotated
+            tls-sni-01 challenge.
 
         :returns: certificate file name
         :rtype: str
@@ -177,7 +177,7 @@ class Dvsni(object):
         return os.path.join(self.configurator.config.work_dir,
                             achall.chall.encode("token") + '.pem')
 
-    def _setup_challenge_cert(self, achall, s=None):
+    def _setup_challenge_cert(self, achall, cert_key=None):
 
         """Generate and write out challenge certificate."""
         cert_path = self.get_cert_path(achall)
@@ -186,7 +186,8 @@ class Dvsni(object):
         self.configurator.reverter.register_file_creation(True, key_path)
         self.configurator.reverter.register_file_creation(True, cert_path)
 
-        response, cert, key = achall.gen_cert_and_response(s)
+        response, (cert, key) = achall.response_and_validation(
+            cert_key=cert_key)
         cert_pem = OpenSSL.crypto.dump_certificate(
             OpenSSL.crypto.FILETYPE_PEM, cert)
         key_pem = OpenSSL.crypto.dump_privatekey(

letsencrypt/plugins/common_test.py

@@ -115,24 +115,24 @@ class AddrTest(unittest.TestCase):
         self.assertEqual(set_a, set_b)
 
 
-class DvsniTest(unittest.TestCase):
-    """Tests for letsencrypt.plugins.common.DvsniTest."""
+class TLSSNI01Test(unittest.TestCase):
+    """Tests for letsencrypt.plugins.common.TLSSNI01."""
 
     auth_key = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
     achalls = [
-        achallenges.DVSNI(
+        achallenges.KeyAuthorizationAnnotatedChallenge(
             challb=acme_util.chall_to_challb(
-                challenges.DVSNI(token=b'dvsni1'), "pending"),
+                challenges.TLSSNI01(token=b'token1'), "pending"),
             domain="encryption-example.demo", account_key=auth_key),
-        achallenges.DVSNI(
+        achallenges.KeyAuthorizationAnnotatedChallenge(
             challb=acme_util.chall_to_challb(
-                challenges.DVSNI(token=b'dvsni2'), "pending"),
+                challenges.TLSSNI01(token=b'token2'), "pending"),
             domain="letsencrypt.demo", account_key=auth_key),
     ]
 
     def setUp(self):
-        from letsencrypt.plugins.common import Dvsni
-        self.sni = Dvsni(configurator=mock.MagicMock())
+        from letsencrypt.plugins.common import TLSSNI01
+        self.sni = TLSSNI01(configurator=mock.MagicMock())
 
     def test_add_chall(self):
         self.sni.add_chall(self.achalls[0], 0)
@@ -146,11 +146,11 @@ class DvsniTest(unittest.TestCase):
         # http://www.voidspace.org.uk/python/mock/helpers.html#mock.mock_open
         mock_open, mock_safe_open = mock.mock_open(), mock.mock_open()
 
-        response = challenges.DVSNIResponse(validation=mock.Mock())
+        response = challenges.TLSSNI01Response()
         achall = mock.MagicMock()
         key = test_util.load_pyopenssl_private_key("rsa512_key.pem")
-        achall.gen_cert_and_response.return_value = (
-            response, test_util.load_cert("cert.pem"), key)
+        achall.response_and_validation.return_value = (
+            response, (test_util.load_cert("cert.pem"), key))
 
         with mock.patch("letsencrypt.plugins.common.open",
                         mock_open, create=True):