From 7c3fac227f871fab863afc1424794f3bb1f48c71 Mon Sep 17 00:00:00 2001
From: Alexandre CHAZAL <alexandre.chazal@epita.fr>
Date: Mon, 29 Nov 2021 15:26:28 +0100
Subject: [PATCH] fix(config): now loading config from env correctly

---
 app/__init__.py | 12 ++++--------
 app/config.py   | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 app/config.py

diff --git a/app/__init__.py b/app/__init__.py
index 2409ddb..ebedb5f 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,14 +1,10 @@
 from flask import Flask
-from . import reset
+from . import reset, config
 
 def create_app():
-    app = Flask(__name__, instance_relative_config=True, template_folder="ui/templates", static_folder="ui/static")
-    #app.config.from_object("instance.config.DebugConfig")
-    app.config.from_envvar("LDAP_ADDR")
-    app.config.from_envvar("LDAP_PORT")
-    app.config.from_envvar("LDAP_TLS")
-    app.config.from_envvar("BASE_DN")
+    app = Flask(__name__, template_folder="ui/templates", static_folder="ui/static")
+    app.config.from_object(config.ProductionConfig())
 
     app.register_blueprint(reset.bp)
 
-    return app
\ No newline at end of file
+    return app
diff --git a/app/config.py b/app/config.py
new file mode 100644
index 0000000..d1601cd
--- /dev/null
+++ b/app/config.py
@@ -0,0 +1,31 @@
+import os
+
+class Config(object):
+    SECRET_KEY = os.environ.get("SECRET_KEY")
+    if SECRET_KEY is None:
+        raise Exception("[!!] No secret key was given")
+
+    LDAP_ADDRESS = os.environ.get("LDAP_ADDRESS")
+    if LDAP_ADDRESS is None:
+        raise Exception("[!!] No LDAP_ADDRESS was given")
+
+    LDAP_PORT = os.environ.get("LDAP_PORT", default=389)
+    _ldap_tls = os.environ.get("LDAP_TLS", default=False)
+    LDAP_TLS = _ldap_tls.lower() in {"1", "t", "true"}
+    BASE_DN = os.environ.get("BASE_DN")
+    if BASE_DN is None:
+        raise Exception("[!!] No BASE_DN was given")
+
+    CSRF_ENABLED = True
+    SESSION_COOKIE_SECURE = True
+    SESSION_COOKIE_HTTPONLY = True
+    SESSION_COOKIE_SAMESITE = 'None'
+
+class DevelopmentConfig(Config):
+    TESTING = True
+    DEBUG = True
+    DEVELOPMENT = True
+
+class ProductionConfig(Config):
+    TESTING = False
+    DEBUG = False