Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduced Safer SMTP Alternative: Added SMTP_SSL #702

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Introduced Safer SMTP Alternative: Added SMTP_SSL #702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions spyne/util/email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
from spyne.util import six


def email_exception(exception_address, message="", bcc=None):
def email_exception(exception_address, message="", bcc=None, hostname=None, username=None, password=None, secure=False):
# http://stackoverflow.com/questions/1095601/find-module-name-of-the-originating-exception-in-python
frm = inspect.trace()[-1]
mod = inspect.getmodule(frm[0])
Expand All @@ -63,7 +63,11 @@ def email_exception(exception_address, message="", bcc=None):
msg['Subject'] = "(%s@%s) %s" % (getpass.getuser(), gethostname(), module_name)

try:
smtp_object = smtplib.SMTP('localhost')
if secure:
smtp_object = smtplib.SMTP_SSL(hostname, smtplib.SMTP_SSL_PORT)
smtp_object.login(username, password)
else:
smtp_object = smtplib.SMTP('localhost')
smtp_object.sendmail(sender, recipients, msg.as_string())
logger.error("Error email sent")

Expand All @@ -73,7 +77,7 @@ def email_exception(exception_address, message="", bcc=None):


def email_text_smtp(addresses, sender=None, subject='', message="",
host='localhost', port=25):
host='localhost', port=25, username=None, password=None, secure=False):
if sender is None:
sender = 'Spyne <[email protected]>'

Expand All @@ -86,7 +90,11 @@ def email_text_smtp(addresses, sender=None, subject='', message="",
msg['Date'] = formatdate()
msg['Subject'] = subject

smtp_object = smtplib.SMTP(host, port)
if secure:
smtp_object = smtplib.SMTP_SSL(host, smtplib.SMTP_SSL_PORT)
smtp_object.login(username, password)
else:
smtp_object = smtplib.SMTP(host, port)
if six.PY2:
smtp_object.sendmail(sender, addresses, msg.as_string())
else:
Expand Down