Adding support for SMTP emails

lemur/common/services/aws/ses.py

@@ -1,28 +0,0 @@
-"""
-.. module: lemur.common.services.aws
-    :platform: Unix
-    :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more
-    :license: Apache, see LICENSE for more details.
-
-.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
-"""
-import boto.ses
-from flask import current_app
-
-from lemur.templates.config import env
-
-
-def send(subject, data, email_type, recipients):
-    """
-    Configures all Lemur email messaging
-
-    :param subject:
-    :param data:
-    :param email_type:
-    :param recipients:
-    """
-    conn = boto.connect_ses()
-    # jinja template depending on type
-    template = env.get_template('{}.html'.format(email_type))
-    body = template.render(**data)
-    conn.send_email(current_app.config.get("LEMUR_EMAIL"), subject, body, recipients, format='html')

lemur/extensions.py

@@ -14,3 +14,6 @@ bcrypt = Bcrypt()
 
 from flask.ext.principal import Principal
 principal = Principal()
+
+from flask_mail import Mail
+smtp_mail = Mail()

lemur/factory.py

@@ -19,7 +19,7 @@ from logging.handlers import RotatingFileHandler
 
 from flask import Flask
 from lemur.common.health import mod as health
-from lemur.extensions import db, migrate, principal
+from lemur.extensions import db, migrate, principal, smtp_mail
 
 
 DEFAULT_BLUEPRINTS = (
@@ -111,6 +111,7 @@ def configure_extensions(app):
     db.init_app(app)
     migrate.init_app(app, db)
     principal.init_app(app)
+    smtp_mail.init_app(app)
 
 
 def configure_blueprints(app, blueprints):

lemur/manage.py

@@ -72,8 +72,6 @@ LEMUR_RESTRICTED_DOMAINS = []
 
 # Mail Server
 
-# Lemur currently only supports SES for sending email, this address
-# needs to be verified
 LEMUR_EMAIL = ''
 LEMUR_SECURITY_TEAM_EMAIL = []
 
@@ -92,34 +90,32 @@ SQLALCHEMY_DATABASE_URI = 'postgresql://lemur:lemur@localhost:5432/lemur'
 # AWS
 
 # Lemur will need STS assume role access to every destination you want to monitor
-#AWS_ACCOUNT_MAPPINGS = {{
+# AWS_ACCOUNT_MAPPINGS = {{
 #    '1111111111': 'myawsacount'
-#}}
+# }}
 
 ## This is useful if you know you only want to monitor one destination
 #AWS_REGIONS = ['us-east-1']
 
 #LEMUR_INSTANCE_PROFILE = 'Lemur'
 
-#############
-## Issuers ##
-#############
+# Issuers
 
 # These will be dependent on which 3rd party that Lemur is
 # configured to use.
 
-#CLOUDCA_URL = ''
-#CLOUDCA_PEM_PATH = ''
-#CLOUDCA_BUNDLE = ''
+# CLOUDCA_URL = ''
+# CLOUDCA_PEM_PATH = ''
+# CLOUDCA_BUNDLE = ''
 
 # number of years to issue if not specified
-#CLOUDCA_DEFAULT_VALIDITY = 2
+# CLOUDCA_DEFAULT_VALIDITY = 2
 
-#VERISIGN_URL = ''
-#VERISIGN_PEM_PATH = ''
-#VERISIGN_FIRST_NAME = ''
-#VERISIGN_LAST_NAME = ''
-#VERSIGN_EMAIL = ''
+# VERISIGN_URL = ''
+# VERISIGN_PEM_PATH = ''
+# VERISIGN_FIRST_NAME = ''
+# VERISIGN_LAST_NAME = ''
+# VERSIGN_EMAIL = ''
 """
 
 

lemur/notifications.py

@@ -12,13 +12,19 @@ import ssl
 import socket
 
 import arrow
+import boto.ses
+
 from flask import current_app
+from flask_mail import Message
 
 from lemur import database
-from lemur.common.services.aws import ses
 from lemur.certificates.models import Certificate
 from lemur.domains.models import Domain
 
+from lemur.templates.config import env
+from lemur.extensions import smtp_mail
+
+
 NOTIFICATION_INTERVALS = [30, 15, 5, 2]
 
 
@@ -84,7 +90,7 @@ def send_expiration_notifications():
 
     for messages, recipients in roll_ups:
         notifications += 1
-        ses.send("Certificate Expiration", dict(messages=messages), 'event', recipients)
+        send("Certificate Expiration", dict(messages=messages), 'event', recipients)
 
     print notifications
     current_app.logger.info("Lemur has sent {0} certification notifications".format(notifications))
@@ -182,3 +188,31 @@ def _create_roll_ups(messages):
         else:
             roll_ups.append(([message_data], recipients))
     return roll_ups
+
+
+def send(subject, data, email_type, recipients):
+    """
+    Configures all Lemur email messaging
+
+    :param subject:
+    :param data:
+    :param email_type:
+    :param recipients:
+    """
+    # jinja template depending on type
+    template = env.get_template('{}.html'.format(email_type))
+    body = template.render(**data)
+
+    s_type = current_app.config.get("LEMUR_EMAIL_SENDER").lower()
+    if s_type == 'ses':
+        conn = boto.connect_ses()
+        conn.send_email(current_app.config.get("LEMUR_EMAIL"), subject, body, recipients, format='html')
+
+    elif s_type == 'smtp':
+        msg = Message(subject, recipients=recipients)
+        msg.body = ""  # kinda a weird api for sending html emails
+        msg.html = body
+        smtp_mail.send(msg)
+
+    else:
+        current_app.logger.error("No mail carrier specified, notification emails were not able to be sent!")