automatic: allow use of STARTTLS/TLS

AUTHORS

@@ -68,6 +68,7 @@ DNF CONTRIBUTORS
  Christopher Meng <[email protected]>
  Daniel Mach <[email protected]>
  Dave Johansen <[email protected]>
+ Dominik Mierzejewski <[email protected]>
  Dylan Pindur <[email protected]>
  Eduard Cuba <[email protected]>
  Evan Goode <[email protected]>

dnf/automatic/emitter.py

@@ -96,6 +96,7 @@ def commit(self):
  email_from = self._conf.email_from
  email_to = self._conf.email_to
  email_port = self._conf.email_port
+ email_tls = self._conf.email_tls
  message['Date'] = email.utils.formatdate()
  message['From'] = email_from
  message['Subject'] = subj
@@ -104,7 +105,12 @@ def commit(self):
 
  # Send the email
  try:
- smtp = smtplib.SMTP(self._conf.email_host, self._conf.email_port, timeout=300)
+ if self._conf.email_tls == 'yes':
+ smtp = smtplib.SMTP_SSL(self._conf.email_host, self._conf.email_port, timeout=300)
+ else:
+ smtp = smtplib.SMTP(self._conf.email_host, self._conf.email_port, timeout=300)
+ if self._conf.email_tls == 'starttls':
+ smtp.starttls()
  smtp.sendmail(email_from, email_to, message.as_string())
  smtp.close()
  except OSError as exc:

dnf/automatic/main.py

@@ -198,6 +198,7 @@ def __init__(self):
  self.add_option('email_from', libdnf.conf.OptionString("root"))
  self.add_option('email_host', libdnf.conf.OptionString("localhost"))
  self.add_option('email_port', libdnf.conf.OptionNumberInt32(25))
+ self.add_option('email_tls', libdnf.conf.OptionString("no"))
 
 
 class CommandConfig(Config):

doc/automatic.rst

@@ -183,6 +183,11 @@ The email emitter configuration.
 
  Port number to connect to at the SMTP server.
 
+``email_tls``
+ either one of ``no``, ``yes``, ``starttls``, default: ``no``
+
+ Whether to use TLS, STARTTLS or no encryption to connect to the SMTP server.
+
 ``email_to``
  list, default: ``root``
 

etc/dnf/automatic.conf

@@ -61,6 +61,10 @@ email_host = localhost
 # Port number to connect to at the email host.
 email_port = 25
 
+# Use TLS or STARTTLS to connect to the email host.
+email_tls = no
+
+
 [command]
 # The shell command to execute. This is a Python format string, as used in
 # str.format(). The format function will pass a shell-quoted argument called