test env seems to work

This commit is contained in:
Adrian Amaglio 2021-01-14 00:27:26 +01:00
parent 416960ac6c
commit 6e821c6ee9
6 changed files with 22 additions and 27 deletions

View File

@ -46,10 +46,7 @@ var app = new Vue({
}) })
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
if (data.status != 'success') this.forms = data.data
console.error('getForms error: '+data.msg)
else
this.forms = data.data
}) })
.catch((error) => { .catch((error) => {
console.error(error) console.error(error)
@ -62,9 +59,6 @@ var app = new Vue({
}) })
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
if (data.status != 'success')
console.error('getForms error: '+data.msg)
else
this.users = data.data this.users = data.data
}) })
.catch((error) => { .catch((error) => {

View File

@ -75,6 +75,9 @@ mongodb_dbname = get_env('MONGODB_DBNAME', 'contact_mailer')
# Security # Security
admin_password = get_env('ADMIN_PASSWORD') admin_password = get_env('ADMIN_PASSWORD')
# Test purpose, do not send mail
do_not_send = get_env('do_not_send', 'false') == 'true'
if 'SMTP_SSL' in os.environ and os.environ['SMTP_SSL'] == 'true': if 'SMTP_SSL' in os.environ and os.environ['SMTP_SSL'] == 'true':
security = 'ssl' security = 'ssl'
elif 'SMTP_STARTTLS' in os.environ and os.onviron['SMTP_STARTTLS'] == 'true': elif 'SMTP_STARTTLS' in os.environ and os.onviron['SMTP_STARTTLS'] == 'true':
@ -189,6 +192,11 @@ def send_mail (from_address, to, subject, content):
msg.set_content(MIMEText(content, 'plain', "utf-8")) msg.set_content(MIMEText(content, 'plain', "utf-8"))
#or #or
#msg.set_content(content) #msg.set_content(content)
if do_not_send:
print('------------------------------------ Following message wont be sent ------------------------------------')
print(msg.as_string())
print('--------------------------------------------------------------------------------------------------------')
return True
# SMTP preambles # SMTP preambles
if security == 'ssl': if security == 'ssl':
@ -254,11 +262,9 @@ def create_form ():
if 'mail' in request.forms: if 'mail' in request.forms:
mail = request.forms.getunicode('mail') mail = request.forms.getunicode('mail')
else: else:
return resp(4000, 'Le champs « adresse » est requis') return resp(400, 'Le champs « adresse » est requis')
user = login(request) user = login(request)
print('post form')
print(user)
if user['_privilege'] > 1: if user['_privilege'] > 1:
return resp(400, 'Privilèges insufisants') return resp(400, 'Privilèges insufisants')

View File

@ -12,15 +12,16 @@ services:
- db - db
environment: environment:
MONGODB_HOST: db MONGODB_HOST: db
SMTP_SERVER_ADDRESS: 'lol' SMTP_SERVER_ADDRESS: toto.mail
SMTP_SERVER_PORT: 994 SMTP_SERVER_PORT: 994
SMTP_SERVER_USERNAME: toto SMTP_SERVER_USERNAME: toto@toto.mail
SMTP_SERVER_PASSWORD: lol SMTP_SERVER_PASSWORD: password
SMTP_SERVER_SENDER: moi SMTP_SERVER_SENDER: toto@toto.mail
ADMIN_PASSWORD: test ADMIN_PASSWORD: test
SMTP_SSL: 'true' SMTP_SSL: 'true'
UID: 101 UID: 101
MOUNT: /api MOUNT: /api
do_not_send: 'true'
proxy: proxy:

View File

@ -8,7 +8,10 @@
<div id="contact-mailer-message"></div> <div id="contact-mailer-message"></div>
<form action="/api/submit" method="POST" id="contact-mailer-form"> <form action="/api/submit" method="POST" id="contact-mailer-form">
<noscript>Les protections anti-spam, nécéssitent lutilisation de javascript. Rien dintrusif normalement.</noscript> <noscript>Les protections anti-spam, nécéssitent lutilisation de javascript. Rien dintrusif normalement.</noscript>
<input type="hidden" name="token" value="5NwE8KOzhinBLVloZrvfb71WJeQ6sXc4xgC0AqFPDHGMjIdmUk" /> <div>
<label for="token">Token&nbsp;:</label>
<input type="text" name="token"/>
</div>
<div> <div>
<label for="nom">Votre nom&nbsp;:</label> <label for="nom">Votre nom&nbsp;:</label>
<input type="text" name="nom" required="required"/> <input type="text" name="nom" required="required"/>
@ -31,6 +34,6 @@
</div> </div>
<input type="submit" /> <input type="submit" />
</form> </form>
<script class="contact-form-config" form-id="contact-mailer-form" notify-theme="plain" src="./client/index.js" integrity="sha384-PmKhlZlIlO1+jQGHGdfScCV2ksmoqXL04TOXOd1tn5q7VJJHLxAZUyZr7hzDLUOe"></script> <script class="contact-form-config" form-id="contact-mailer-form" notify-theme="plain" src="../client/index.js"></script>
</body> </body>
</html> </html>

View File

@ -23,13 +23,9 @@ http {
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, DELETE, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, DELETE, OPTIONS';
listen 8080; listen 8080;
location /admin {
alias /usr/app/adminer;
index index.html;
}
location / { location / {
root /usr/app/test; root /usr/app/;
index test.html; index index.html;
} }
location /api/ { location /api/ {
include uwsgi_params; include uwsgi_params;

View File

@ -1,5 +0,0 @@
#!/bin/sh
# docker run -it --rm --network host mongo
# nginx -c "$(pwd)"/nginx.conf -g "pid '$(pwd)/nginx.pid';"
# . venv/bin/activate ; python3 main.py