diff --git a/Caddy/Caddyfile b/Caddy/Caddyfile index 3308e57..d1d440d 100644 --- a/Caddy/Caddyfile +++ b/Caddy/Caddyfile @@ -1,4 +1,3 @@ -expo.leggy.dev { - reverse_proxy highscore:8080 - encode gzip -} \ No newline at end of file +{$DOMAIN} +reverse_proxy highscore:8080 +encode gzip diff --git a/Highscore-Server/highscore/config.py b/Highscore-Server/highscore/config.py index 993c955..57cd158 100644 --- a/Highscore-Server/highscore/config.py +++ b/Highscore-Server/highscore/config.py @@ -1,4 +1,7 @@ -SECRET_KEY = 'dev' +import os + +SECRET_KEY = os.getenv('SECRET_KEY') +BEARER_TOKEN = os.getenv('BEARER_TOKEN') SQLALCHEMY_DATABASE_URI = 'sqlite:///db.sqlite' SQLALCHEMY_TRACK_MODIFICATIONS = False diff --git a/Highscore-Server/highscore/extensions.py b/Highscore-Server/highscore/extensions.py index 6cf080e..4ad6d0d 100644 --- a/Highscore-Server/highscore/extensions.py +++ b/Highscore-Server/highscore/extensions.py @@ -4,4 +4,4 @@ from flask_caching import Cache db = SQLAlchemy() migrate = Migrate() -cache = Cache() +cache = Cache(config={'CACHE_TYPE': 'simple'}) diff --git a/Highscore-Server/highscore/views.py b/Highscore-Server/highscore/views.py index 3bc22ba..0dbb625 100644 --- a/Highscore-Server/highscore/views.py +++ b/Highscore-Server/highscore/views.py @@ -5,6 +5,8 @@ from wtforms.validators import DataRequired from models import Scores, Users from extensions import db, cache +from config import BEARER_TOKEN + blueprint = Blueprint('views', __name__) @@ -63,7 +65,7 @@ def post(): if not form: return "Invalid form", 400 - if request.headers.get('Authentication') != 'Bearer 1234': + if request.headers.get('Authentication') != 'Bearer ' + BEARER_TOKEN: return "Invalid authentication", 401 if not isinstance(form.score.data, int): @@ -91,5 +93,3 @@ def post(): db.session.add(score) db.session.commit() return jsonify({'message': 'Success!'}) - - diff --git a/docker-compose.yml b/docker-compose.yml index e3753e4..da570df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,9 @@ services: - ./Caddy/Caddyfile:/etc/caddy/Caddyfile - ./Caddy/data:/data - ./Caddy/config:/config + environment: + - ACME_AGREE=true + - DOMAIN=expo.leggy.dev links: - highscore @@ -17,3 +20,6 @@ services: build: ./Highscore-Server volumes: - ./Highscore-Server/data:/data/storage + environment: + - FLASK_KEY=secret + - BEARER_TOKEN=1234