Removed use_ssl and use_tls and determine the connection type and TLS encryption from the encryption method

Author: muflone

README.md

@@ -58,9 +58,7 @@ message = Message(sender=Recipient('Muflone', '[email protected]'),
 connection = Connection(server='localhost',
                         port=587,
                         username='<username>',
-                        password='<smtp password>',
-                        use_tls=True,
-                        use_ssl=False)
+                        password='<smtp password>')
 connection.connect()
 connection.send(message)
 connection.disconnect()
@@ -124,8 +122,6 @@ SMTP:
   PORT: 465
   USERNAME: <username>
   PASSWORD: <password>
-  TLS: false
-  SSL: true
   TIMEOUT: 30
   ENCRYPTION: TLSv1_2
   CIPHERS:
@@ -141,9 +137,7 @@ profile_smtp = ProfileSmtp(filename='profile-smtp.yaml')
 connection = Connection(server=profile_smtp.server,
                         port=profile_smtp.port,
                         username=profile_smtp.username,
-                        password=profile_smtp.password,
-                        use_tls=profile_smtp.use_tls,
-                        use_ssl=profile_smtp.use_ssl)
+                        password=profile_smtp.password)
 ```
 
 ## Message Profiles

mumailer/connection.py

@@ -20,7 +20,9 @@
 
 import smtplib
 import ssl
+from typing import Optional
 
+from .encryption import ENCRYPTION_PROTOCOLS
 from .message import Message
 
 
@@ -29,30 +31,31 @@ def __init__(self,
                  server: str,
                  port: int = 25,
                  username: str = None,
-                 password: str = None,
-                 use_tls: bool = False,
-                 use_ssl: bool = False):
+                 password: str = None):
         self.server = server
         self.port = port
         self.username = username
         self.password = password
-        self.use_tls = use_tls
-        self.use_ssl = use_ssl
         self.connection = None
         self.context = None
+        self._use_ssl = False
+        self._use_tls = False
 
     def set_encryption(self,
-                       protocol: ssl._SSLMethod,
-                       ciphers: str = '') -> None:
+                       encryption: Optional[str],
+                       ciphers: Optional[str] = '') -> None:
         """
         Set the encryption protocol and ciphers
 
-        :param protocol: encryption protocol
+        :param encryption: encryption method from ENCRYPTION_PROTOCOLS
         :param ciphers: encryption ciphers for the selected protocol
         """
-        self.context = ssl.SSLContext(protocol=protocol)
-        if ciphers:
-            self.context.set_ciphers(ciphers)
+        self._use_ssl = encryption.startswith('SSL') if encryption else False
+        self._use_tls = encryption.startswith('TLS') if encryption else False
+        if protocol := ENCRYPTION_PROTOCOLS.get(encryption):
+            self.context = ssl.SSLContext(protocol=protocol)
+            if ciphers:
+                self.context.set_ciphers(ciphers)
 
     def connect(self,
                 timeout: int = 30) -> None:
@@ -61,7 +64,7 @@ def connect(self,
 
         :param timeout: timeout in seconds before aborting the connection
         """
-        if not self.use_ssl:
+        if not self._use_ssl:
             # Use plain text
             self.connection = smtplib.SMTP(host=self.server,
                                            port=self.port,
@@ -72,7 +75,7 @@ def connect(self,
                                                port=self.port,
                                                timeout=timeout,
                                                context=self.context)
-        if self.use_tls:
+        if self._use_tls:
             # Use TLS
             self.connection.starttls(context=self.context)
         if self.username:

mumailer/profile_smtp.py

@@ -27,8 +27,6 @@ class ProfileSmtp(YamlProfile):
     OPTION_PORT = 'PORT'
     OPTION_USERNAME = 'USERNAME'
     OPTION_PASSWORD = 'PASSWORD'
-    OPTION_USE_TLS = 'TLS'
-    OPTION_USE_SSL = 'SSL'
     OPTION_TIMEOUT = 'TIMEOUT'
     OPTION_ENCRYPTION = 'ENCRYPTION'
     OPTION_CIPHERS = 'CIPHERS'
@@ -42,9 +40,5 @@ def __init__(self, filename: str):
                                     default=25)
         self.username = self.get_option(option=self.OPTION_USERNAME)
         self.password = self.get_option(option=self.OPTION_PASSWORD)
-        self.use_tls = self.get_option(option=self.OPTION_USE_TLS,
-                                       default=False)
-        self.use_ssl = self.get_option(option=self.OPTION_USE_SSL,
-                                       default=False)
         self.encryption = self.get_option(option=self.OPTION_ENCRYPTION)
         self.ciphers = self.get_option(option=self.OPTION_CIPHERS)

mumailer/samples/profile_smtp.py

@@ -19,8 +19,7 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ##
 
-from mumailer import (ENCRYPTION_PROTOCOLS,
-                      Attachment,
+from mumailer import (Attachment,
                       CommandLineOptions,
                       Connection,
                       Header,
@@ -71,13 +70,10 @@ def main():
     mailer = Connection(server=options.server or profile_smtp.server,
                         port=options.port or profile_smtp.port,
                         username=options.username or profile_smtp.username,
-                        password=options.password or profile_smtp.password,
-                        use_tls=profile_smtp.use_tls,
-                        use_ssl=profile_smtp.use_ssl)
-    if encryption := ENCRYPTION_PROTOCOLS.get(options.encryption or
-                                              profile_smtp.encryption):
-        mailer.set_encryption(protocol=encryption,
-                              ciphers=options.ciphers or profile_smtp.ciphers)
+                        password=options.password or profile_smtp.password)
+    mailer.set_encryption(encryption=(options.encryption or
+                                      profile_smtp.encryption),
+                          ciphers=options.ciphers or profile_smtp.ciphers)
     mailer.connect()
     mailer.send(message)
     mailer.disconnect()

mumailer/samples/simple_ssl.py

@@ -19,8 +19,7 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ##
 
-from mumailer import (ENCRYPTION_PROTOCOLS,
-                      Attachment,
+from mumailer import (Attachment,
                       CommandLineOptions,
                       Connection,
                       Header,
@@ -61,12 +60,9 @@ def main():
     mailer = Connection(server=options.server,
                         port=options.port,
                         username=options.username,
-                        password=options.password,
-                        use_tls=False,
-                        use_ssl=True)
-    if encryption := ENCRYPTION_PROTOCOLS.get(options.encryption):
-        mailer.set_encryption(protocol=encryption,
-                              ciphers=options.ciphers)
+                        password=options.password)
+    mailer.set_encryption(encryption=options.encryption,
+                          ciphers=options.ciphers)
     mailer.connect()
     mailer.send(message)
     mailer.disconnect()

mumailer/samples/simple_tls.py

@@ -19,8 +19,7 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 ##
 
-from mumailer import (ENCRYPTION_PROTOCOLS,
-                      Attachment,
+from mumailer import (Attachment,
                       CommandLineOptions,
                       Connection,
                       Header,
@@ -61,12 +60,9 @@ def main():
     mailer = Connection(server=options.server,
                         port=options.port,
                         username=options.username,
-                        password=options.password,
-                        use_tls=True,
-                        use_ssl=False)
-    if encryption := ENCRYPTION_PROTOCOLS.get(options.encryption):
-        mailer.set_encryption(protocol=encryption,
-                              ciphers=options.ciphers)
+                        password=options.password)
+    mailer.set_encryption(encryption=options.encryption,
+                          ciphers=options.ciphers)
     mailer.connect()
     mailer.send(message)
     mailer.disconnect()