Start TLS before login on SMTP server

And do not send not encrypted credentials over network
camptocamp · Nov 21, 2019 · f41241a · f41241a
1 parent 8dbe9ab
commit f41241a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/commons/c2cgeoportal_commons/lib/email_.py b/commons/c2cgeoportal_commons/lib/email_.py
@@ -77,10 +77,10 @@ def send_email(
         smtp = smtplib.SMTP_SSL(smtp_config['host'])  # type: smtplib.SMTP
     else:
         smtp = smtplib.SMTP(smtp_config['host'])
-    if smtp_config.get('user', False):
-        smtp.login(smtp_config['user'], smtp_config['password'])
     if smtp_config.get('starttls', False):
         smtp.starttls()
+    if smtp_config.get('user', False):
+        smtp.login(smtp_config['user'], smtp_config['password'])
 
     smtp.sendmail(from_addr, to_addrs, msg.as_string())
     smtp.close()