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 +7 -9
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44df0eed25 - Show all commits

2
Dockerfile
View File

@ -15,4 +15,4 @@ RUN pip install -r requirements.txt
# copy project # copy project
COPY . . COPY . .
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-14 11:25:31 +01:00
Outdated
Review
Copy Link

let's call it something else

let's call it something else
ENTRYPOINT ["/usr/src/app/entrypoint.sh"] ENTRYPOINT ["/usr/src/app/entrypoint.sh", "--user"]
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-10 07:59:35 +01:00
Outdated
Review
Copy Link

run as non-root

run as non-root
PeterSurda commented 2022-02-11 11:37:47 +01:00
Outdated
Review
Copy Link

this doesn't do anything. The Dockerfile should create a non-privileged user and then just before ENTRYPOINT have a corresponding USER instruction.

this doesn't do anything. The `Dockerfile` should create a non-privileged user and then just before `ENTRYPOINT` have a corresponding `USER` instruction.

2
docker-compose.yml
View File

@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
web: smtp-gateway:
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-10 08:00:20 +01:00
Outdated
Review
Copy Link

smtp-gateway:

`smtp-gateway:`
build: . build: .
expose: expose:
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-04 08:27:56 +01:00
Outdated
Review
Copy Link

perhaps this should be inside the Dockerfile

perhaps this should be inside the `Dockerfile`
- "8081" - "8081"
PeterSurda marked this conversation as resolved Outdated
PeterSurda commented 2022-02-09 07:57:55 +01:00
Outdated
Review
Copy Link

If we only use this internally inside a docker service, we should use expose, not port.

If we only use this internally inside a docker service, we should use `expose`, not `port`.

12
main.py
View File

@ -25,7 +25,7 @@ class SMTPWebhookApp:
req_body = json.loads(rawbody) req_body = json.loads(rawbody)
subject = req_body['subject'] subject = req_body['subject']
body = req_body['body'] body = req_body['body']
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
client = smtplib.SMTP(SERVER_NAME) client = smtplib.SMTP(host=SERVER_HOST, port=SERVER_PORT)
msg = MIMEText(body, 'plain', 'utf-8') msg = MIMEText(body, 'plain', 'utf-8')
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
msg['Subject'] = Header(subject, 'utf-8') msg['Subject'] = Header(subject, 'utf-8')
msg['From'] = FROM_MAIL msg['From'] = FROM_MAIL
@ -53,16 +53,14 @@ ROOT = SMTPWebhookApp()
if __name__ == "__main__": if __name__ == "__main__":
try: try:
SERVER_NAME = os.environ["server_name"] SERVER_HOST = os.environ["server_host"]
SERVER_PORT = os.environ["server_port"]
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.
TO_MAIL = os.environ["to_mail"] TO_MAIL = os.environ["to_mail"]
FROM_MAIL = os.environ["from_mail"] FROM_MAIL = os.environ["from_mail"]
FROM_MAIL_PASSWORD = os.environ["from_mail_password"] FROM_MAIL_PASSWORD = os.environ["from_mail_password"]
# to_mail = "test111@mailinator.com"
# from_mail = "test@gmail.com"
# from_mail_password = "test@123"
except KeyError: except KeyError:
raise "Please check missing environment variables: to_mail, from_mail, \ raise KeyError("Please check missing environment variables: to_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`
from_mail_password" "from_mail, from_mail_password")
cherrypy.server.socket_host = "0.0.0.0" cherrypy.server.socket_host = "0.0.0.0"
cherrypy.server.socket_port = 8081 cherrypy.server.socket_port = 8081