Sysdeploy/influx-smtp-gateway
2
0
Fork 1
Code Issues Pull Requests 2 Projects Releases Wiki Activity

Added Send mail functionality & Dockerized application #1

Merged
PeterSurda merged 11 commits from cis-kuldeep/influx-smtp-gateway:master into master 2022-02-21 07:41:14 +01:00
Conversation 1 Commits 11 Files Changed 7 +13 -12
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f4fc89c111 - Show all commits

25
main.py
View File

@ -26,8 +26,7 @@ class SMTPWebhookApp:
def _send_mail(self):
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-07 07:36:35 +01:00
Outdated
Review
Copy Link

debug we don't need

debug we don't need
if not cherrypy.request.headers.get('Content-Length'):
logging.error("To: {}, error: Invalid content length.".format(
TO_MAIL))
logging.error("error: Invalid content length.")
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-09 08:10:48 +01:00
Outdated
Review
Copy Link

port 587

port 587
return {"status": 400, "message": "Invalid content length."}
cl = cherrypy.request.headers['Content-Length']
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-07 07:35:59 +01:00
Outdated
Review
Copy Link

this whole class we don't need

this whole class we don't need
@ -35,30 +34,33 @@ class SMTPWebhookApp:
req_body = json.loads(rawbody)
if not req_body.get('subject') or req_body.get('subject') == '':
logging.error("To: {}, error: body field is required.".format(
TO_MAIL))
logging.error("error: body field is required.")
return {"status": 400, "message": "subject field is required."}
if not req_body.get('body') or req_body.get('body') == '':
logging.error("To: {}, error: body field is required.".format(
TO_MAIL))
logging.error("error: body field is required.")
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-15 07:54:51 +01:00
Outdated
Review
Copy Link

ideally an exception per line rather than together, then you can also use more specific exceptions.

ideally an exception per line rather than together, then you can also use more specific exceptions.
return {"status": 400, "message": "body field is required."}
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-15 08:01:17 +01:00
Outdated
Review
Copy Link
  • return an error code (in addition to error text) if there's an error
  • add a small delay if there's an error before returning, say 0.2s, and try to avoid sleep, instead look for a way to do this asynchronously
- return an error code (in addition to error text) if there's an error - add a small delay if there's an error before returning, say 0.2s, and try to avoid `sleep`, instead look for a way to do this asynchronously
if not req_body.get('to_mail') or req_body.get('to_mail') == '':
logging.error("error: to_mail field is required.")
return {"status": 400, "message": "to_mail field is required."}
subject = req_body['subject']
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-09 08:02:07 +01:00
Outdated
Review
Copy Link

docstring

docstring
body = req_body['body']
to_mail = req_body['to_mail']
try:
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-17 05:34:23 +01:00
Outdated
Review
Copy Link

except (SMTPConnectionError, TimeoutError) as e:

`except (SMTPConnectionError, TimeoutError) as e:`
client = smtplib.SMTP(host=SMTP_SERVER_HOST, port=SMTP_SERVER_PORT)
except (smtplib.SMTPConnectionError, TimeoutError) as e:
time.sleep(0.2)
logging.error("To: {}, error: {}".format(TO_MAIL, e))
logging.error("To: {}, error: {}".format(to_mail, e))
return {"status": 400, "message": "SMTP client error: {}.".format(
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-11 11:36:25 +01:00
Outdated
Review
Copy Link

SERVER_PORT should default to 587 and be an integer.

`SERVER_PORT` should default to `587` and be an integer.
e)}
msg = MIMEText(body, 'plain', 'utf-8')
msg['Subject'] = Header(subject, 'utf-8')
msg['From'] = FROM_MAIL
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-09 08:01:29 +01:00
Outdated
Review
Copy Link

except KeyError

`except KeyError`
msg['To'] = TO_MAIL
msg['To'] = to_mail
try:
client.ehlo()
client.starttls()
@ -66,10 +68,10 @@ class SMTPWebhookApp:
client.login(msg["From"], FROM_MAIL_PASSWORD)
client.sendmail(msg['From'], msg['To'], msg.as_string())
response = {"status": 200, "message": "mail sent successfully"}
logging.info("To: {}, mail sent successfully".format(TO_MAIL))
logging.info("To: {}, mail sent successfully".format(to_mail))
except smtplib.SMTPException as e:
time.sleep(0.2)
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-16 07:35:01 +01:00
Outdated
Review
Copy Link

merge with previous try/except

merge with previous `try`/`except`
logging.error("To: {}, error: {}".format(TO_MAIL, e))
logging.error("To: {}, error: {}".format(to_mail, e))
response = {"status": 500, "message": "some error: {}".format(e)}
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-16 07:35:17 +01:00
Outdated
Review
Copy Link

quit() should be in finally:

`quit()` should be in `finally:`
finally:
client.quit()
@ -95,12 +97,11 @@ CHERRYPY_SERVER_PORT = 8081
if __name__ == "__main__":
try:
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-07 07:35:45 +01:00
Outdated
Review
Copy Link

remove

remove
SMTP_SERVER_HOST = os.environ["SMTP_SERVER_HOST"]
TO_MAIL = os.environ["TO_MAIL"]
FROM_MAIL = os.environ["FROM_MAIL"]
FROM_MAIL_PASSWORD = os.environ["FROM_MAIL_PASSWORD"]
except KeyError:
raise KeyError("Please check missing environment variables: "
"SMTP_SERVER_HOST, TO_MAIL, FROM_MAIL, "
"SMTP_SERVER_HOST, FROM_MAIL, "
"FROM_MAIL_PASSWORD")
cherrypy.server.socket_host = CHERRYPY_SERVER_HOST