Stop being silly about ssl/tls

Author: jimi-c

receptor/config.py

@@ -3,7 +3,7 @@
 import importlib
 import logging
 import os
-import ssl as tls
+import ssl
 
 from .entrypoints import run_as_node, run_as_controller, run_as_ping, run_as_send
 from .exceptions import ReceptorRuntimeError, ReceptorConfigError
@@ -58,7 +58,6 @@ def __init__(self, args=None):
         self.add_config_option(
             section='default',
             key='node_id',
-            #long_option='--node-id',
             default_value='',
             value_type='str',
             hint='Set/override node identifier. If unspecified here or in a config file, one will be automatically generated.',
@@ -91,19 +90,19 @@ def __init__(self, args=None):
         # so all of these options use `subparse=False`.
         self.add_config_option(
             section='auth',
-            key='tls_cert',
+            key='ssl_cert',
             default_value='',
             value_type='str',
             subparse=False,
-            hint='Path to the TLS certificate chain file.',
+            hint='Path to the SSL/TLS certificate chain file.',
         )
         self.add_config_option(
             section='auth',
-            key='tls_key',
+            key='ssl_key',
             default_value='',
             value_type='str',
             subparse=False,
-            hint='Path to the TLS certificate key file.',
+            hint='Path to the SSL/TLS certificate key file.',
         )
         # Receptor node options
         self.add_config_option(
@@ -375,18 +374,18 @@ def go(self):
         self._parsed_args.func(self)
 
 
-    def get_client_tls_context(self):
-        if self.auth_tls_cert:
+    def get_client_ssl_context(self):
+        if self.auth_ssl_cert:
             logger.debug("Loading SSL Client Context")
-            return tls.create_default_context(tls.Purpose.SERVER_AUTH, cafile=self.auth_tls_cert)
+            return ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=self.auth_ssl_cert)
         else:
             return None
 
-    def get_server_tls_context(self):
-        if self.auth_tls_cert and self.auth_tls_key:
+    def get_server_ssl_context(self):
+        if self.auth_ssl_cert and self.auth_ssl_key:
             logger.debug("Loading SSL Server Context")
-            sc = tls.create_default_context(tls.Purpose.CLIENT_AUTH)
-            sc.load_cert_chain(self.auth_tls_cert, self.auth_tls_key)
+            sc = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+            sc.load_cert_chain(self.auth_ssl_cert, self.auth_ssl_key)
             return sc
         else:
             return None

receptor/controller.py

@@ -26,7 +26,7 @@ def mainloop(receptor, socket_path, loop=asyncio.get_event_loop()):
     config = receptor.config
     listener = loop.create_server(
         lambda: protocol.BasicProtocol(receptor, loop),
-        config.controller_listen_address, config.controller_listen_port, ssl=config.get_server_tls_context())
+        config.controller_listen_address, config.controller_listen_port, ssl=config.get_server_ssl_context())
     logger.info("Serving on %s:%s", config.controller_listen_address, config.controller_listen_port)
     loop.create_task(listener)
     control_listener = loop.create_unix_server(

receptor/node.py

@@ -12,7 +12,7 @@ def mainloop(receptor, ping_interval=None, loop=asyncio.get_event_loop(), skip_r
     if not config.node_server_disable:
         listener = loop.create_server(
             lambda: BasicProtocol(receptor, loop),
-            config.node_listen_address, config.node_listen_port, ssl=config.get_server_tls_context())
+            config.node_listen_address, config.node_listen_port, ssl=config.get_server_ssl_context())
         loop.create_task(listener)
         logger.info("Serving on %s:%s", config.node_listen_address, config.node_listen_port)
     for peer in config.node_peers:

receptor/protocol.py

@@ -125,7 +125,7 @@ async def create_peer(receptor, loop, host, port):
     while True:
         try:
             await loop.create_connection(
-                lambda: BasicClientProtocol(receptor, loop), host, port, ssl=receptor.config.get_client_tls_context())
+                lambda: BasicClientProtocol(receptor, loop), host, port, ssl=receptor.config.get_client_ssl_context())
             break
         except Exception:
             logger.exception("Connection Refused: {}:{}".format(host, port))