Merge pull request #128 from marianoleonardo/master

Merge branch 'release/v0.7.1' into 'master'

README.md

@@ -80,6 +80,7 @@ environment.
 | AUTH_EMAIL_PASSWD | SMTP password. | empty string | string
 | AUTH_EMAIL_PORT | SMTP server port. | 587 | number
 | AUTH_EMAIL_TLS | Whether to enable TLS or not for SMTP server. | True | boolean
+| AUTH_EMAIL_SERVER_AUTHENTICATION | Whether to enable authentication or not for SMTP server. | True | boolean
 | AUTH_EMAIL_USER | SMTP user. | empty string | string
 | AUTH_KONG_URL | Kong location (If set to `DISABLED` Auth won´t try to configure Kong and will generate secrets for the JWT tokens by itself). | http://kong:8001 | hostname/IP:port or DISABLE
 | AUTH_PASSWD_BLACKLIST | File of blacklisted passwords. | password_blacklist.txt | string

auth/conf.py

@@ -46,6 +46,9 @@
             ['true', 'True', 'TRUE'])
 emailUsername = os.environ.get("AUTH_EMAIL_USER", "")
 emailPasswd = os.environ.get("AUTH_EMAIL_PASSWD", "")
+# Whether to enable authentication or not for SMTP server
+emailServerAuth = (os.environ.get("AUTH_EMAIL_SERVER_AUTHENTICATION", "true") in
+                   ['true', 'True', 'TRUE'])
 
 # if you are using a front end with Auth,
 # define this link to point to the password reset view on you FE

auth/utils/emailUtils.py

@@ -1,12 +1,18 @@
 import smtplib
 from email.mime.text import MIMEText
+from dojot.module import Log
 
 import conf
 
+LOGGER = Log().color_log()
+
 
 def send_mail(to, subject, html_msg):
     if conf.emailHost == 'NOEMAIL':
         return
+
+    LOGGER.info("Starting service of sending email")
+
     # TODO: I think we should put this function in a worker thread
     msg = MIMEText(html_msg, 'html')
 
@@ -16,12 +22,14 @@ def send_mail(to, subject, html_msg):
 
     try:
         s = smtplib.SMTP(conf.emailHost, conf.emailPort)
-        if conf.emailTLS:
+        if conf.emailTLS and conf.emailServerAuth:
             s.starttls()
-        s.login(conf.emailUsername, conf.emailPasswd)
-        s.sendmail(conf.emailUsername, [to], msg.as_string())
+        if conf.emailServerAuth:
+            s.login(msg['From'], conf.emailPasswd)
+        s.sendmail(msg['From'], [msg['To']], msg.as_string())
         s.quit()
-    except OSError:
+    except OSError as error:
+        LOGGER.error(error)
         raise Exception('Failed to retrieve SMTP socket. Is the SMTP port closed?')
     except smtplib.SMTPAuthenticationError:
         raise Exception('SMTP authentication failed')