Renames around DVSNIServer

acme/acme/crypto_util.py

@@ -13,7 +13,7 @@ from acme import errors
 
 logger = logging.getLogger(__name__)
 
-# DVSNI certificate serving and probing is not affected by SSL
+# TLSSNI01 certificate serving and probing is not affected by SSL
 # vulnerabilities: prober needs to check certificate for expected
 # contents anyway. Working SNI is the only thing that's necessary for
 # the challenge and thus scoping down SSL/TLS method (version) would
@@ -23,7 +23,7 @@ logger = logging.getLogger(__name__)
 # https://www.openssl.org/docs/ssl/SSLv23_method.html). _serve_sni
 # should be changed to use "set_options" to disable SSLv2 and SSLv3,
 # in case it's used for things other than probing/serving!
-_DEFAULT_DVSNI_SSL_METHOD = OpenSSL.SSL.SSLv23_METHOD
+_DEFAULT_TLSSNI01_SSL_METHOD = OpenSSL.SSL.SSLv23_METHOD
 
 
 class SSLSocket(object):  # pylint: disable=too-few-public-methods
@@ -35,7 +35,7 @@ class SSLSocket(object):  # pylint: disable=too-few-public-methods
     :ivar method: See `OpenSSL.SSL.Context` for allowed values.
 
     """
-    def __init__(self, sock, certs, method=_DEFAULT_DVSNI_SSL_METHOD):
+    def __init__(self, sock, certs, method=_DEFAULT_TLSSNI01_SSL_METHOD):
         self.sock = sock
         self.certs = certs
         self.method = method
@@ -103,7 +103,7 @@ class SSLSocket(object):  # pylint: disable=too-few-public-methods
 
 
 def probe_sni(name, host, port=443, timeout=300,
-              method=_DEFAULT_DVSNI_SSL_METHOD, source_address=('0', 0)):
+              method=_DEFAULT_TLSSNI01_SSL_METHOD, source_address=('0', 0)):
     """Probe SNI server for SSL certificate.
 
     :param bytes name: Byte string to send as the server name in the

acme/acme/standalone.py

@@ -30,7 +30,7 @@ class TLSServer(socketserver.TCPServer):
         self.certs = kwargs.pop("certs", {})
         self.method = kwargs.pop(
             # pylint: disable=protected-access
-            "method", crypto_util._DEFAULT_DVSNI_SSL_METHOD)
+            "method", crypto_util._DEFAULT_TLSSNI01_SSL_METHOD)
         self.allow_reuse_address = kwargs.pop("allow_reuse_address", True)
         socketserver.TCPServer.__init__(self, *args, **kwargs)
 
@@ -50,8 +50,8 @@ class ACMEServerMixin:  # pylint: disable=old-style-class
     allow_reuse_address = True
 
 
-class DVSNIServer(TLSServer, ACMEServerMixin):
-    """DVSNI Server."""
+class TLSSNI01Server(TLSServer, ACMEServerMixin):
+    """TLSSNI01 Server."""
 
     def __init__(self, server_address, certs):
         TLSServer.__init__(
@@ -134,8 +134,8 @@ class HTTP01RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             cls, simple_http_resources=simple_http_resources)
 
 
-def simple_dvsni_server(cli_args, forever=True):
-    """Run simple standalone DVSNI server."""
+def simple_tls_sni_01_server(cli_args, forever=True):
+    """Run simple standalone TLSSNI01 server."""
     logging.basicConfig(level=logging.DEBUG)
 
     parser = argparse.ArgumentParser()
@@ -158,7 +158,7 @@ def simple_dvsni_server(cli_args, forever=True):
             OpenSSL.crypto.load_certificate(
                 OpenSSL.crypto.FILETYPE_PEM, cert_contents))
 
-    server = DVSNIServer(('', int(args.port)), certs=certs)
+    server = TLSSNI01Server(('', int(args.port)), certs=certs)
     six.print_("Serving at https://localhost:{0}...".format(
         server.socket.getsockname()[1]))
     if forever:  # pragma: no cover
@@ -168,4 +168,4 @@ def simple_dvsni_server(cli_args, forever=True):
 
 
 if __name__ == "__main__":
-    sys.exit(simple_dvsni_server(sys.argv))  # pragma: no cover
+    sys.exit(simple_tls_sni_01_server(sys.argv))  # pragma: no cover

acme/acme/standalone_test.py

@@ -28,8 +28,8 @@ class TLSServerTest(unittest.TestCase):
         server.server_close()  # pylint: disable=no-member
 
 
-class DVSNIServerTest(unittest.TestCase):
-    """Test for acme.standalone.DVSNIServer."""
+class TLSSNI01ServerTest(unittest.TestCase):
+    """Test for acme.standalone.TLSSNI01Server."""
 
     def setUp(self):
         self.certs = {
@@ -37,8 +37,8 @@ class DVSNIServerTest(unittest.TestCase):
                            # pylint: disable=protected-access
                            test_util.load_cert('cert.pem')._wrapped),
         }
-        from acme.standalone import DVSNIServer
-        self.server = DVSNIServer(("", 0), certs=self.certs)
+        from acme.standalone import TLSSNI01Server
+        self.server = TLSSNI01Server(("", 0), certs=self.certs)
         # pylint: disable=no-member
         self.thread = threading.Thread(target=self.server.serve_forever)
         self.thread.start()
@@ -106,8 +106,8 @@ class HTTP01ServerTest(unittest.TestCase):
         self.assertFalse(self._test_http01(add=False))
 
 
-class TestSimpleDVSNIServer(unittest.TestCase):
-    """Tests for acme.standalone.simple_dvsni_server."""
+class TestSimpleTLSSNI01Server(unittest.TestCase):
+    """Tests for acme.standalone.simple_tls_sni_01_server."""
 
     def setUp(self):
         # mirror ../examples/standalone
@@ -118,12 +118,14 @@ class TestSimpleDVSNIServer(unittest.TestCase):
         shutil.copy(test_util.vector_path('rsa512_key.pem'),
                     os.path.join(localhost_dir, 'key.pem'))
 
-        from acme.standalone import simple_dvsni_server
+        from acme.standalone import simple_tls_sni_01_server
         self.port = 1234
-        self.thread = threading.Thread(target=simple_dvsni_server, kwargs={
-            'cli_args': ('xxx', '--port', str(self.port)),
-            'forever': False,
-        })
+        self.thread = threading.Thread(
+            target=simple_tls_sni_01_server, kwargs={
+                'cli_args': ('xxx', '--port', str(self.port)),
+                'forever': False,
+            },
+        )
         self.old_cwd = os.getcwd()
         os.chdir(self.test_cwd)
         self.thread.start()

letsencrypt/plugins/standalone.py

@@ -63,7 +63,7 @@ class ServerManager(object):
         address = ("", port)
         try:
             if challenge_type is challenges.TLSSNI01:
-                server = acme_standalone.DVSNIServer(address, self.certs)
+                server = acme_standalone.TLSSNI01Server(address, self.certs)
             else:  # challenges.HTTP01
                 server = acme_standalone.HTTP01Server(
                     address, self.http_01_resources)