From b3062d473c1ada417c2823156e8d8bde5c860262 Mon Sep 17 00:00:00 2001
From: Mark <mark@openappstack.net>
Date: Mon, 5 Aug 2019 12:29:03 +0200
Subject: [PATCH] Load config from environ
---
consent_provider/app.py | 4 ++--
login_provider/app.py | 12 ++++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/consent_provider/app.py b/consent_provider/app.py
index 111bdee..65b2903 100644
--- a/consent_provider/app.py
+++ b/consent_provider/app.py
@@ -1,6 +1,6 @@
from flask import abort, Flask, redirect, render_template, request
from flask.views import View
-from os import urandom
+from os import urandom, environ
from hydra_client import HydraAdmin
from flask_wtf import FlaskForm
from wtforms import SubmitField, HiddenField
@@ -8,7 +8,7 @@ from flask_wtf.csrf import CSRFProtect
from wtforms.validators import DataRequired
-HYDRA_ADMIN_URL = "http://127.0.0.1:4445"
+HYDRA_ADMIN_URL = environ['HYDRA_ADMIN_URL']
class ConsentForm(FlaskForm):
diff --git a/login_provider/app.py b/login_provider/app.py
index ae48497..ba2721e 100644
--- a/login_provider/app.py
+++ b/login_provider/app.py
@@ -1,19 +1,23 @@
from flask import abort, Flask, redirect, request
-from os import urandom
+from os import urandom, environ
from hydra_client import HydraAdmin
from flask_sqlalchemy import SQLAlchemy
from sqlalchemy.ext.hybrid import hybrid_property, hybrid_method
from flask_security import Security, SQLAlchemyUserDatastore, \
UserMixin, login_required, current_user
-HYDRA_ADMIN_URL = "http://127.0.0.1:4445"
+
+HYDRA_ADMIN_URL = environ['HYDRA_ADMIN_URL']
+if 'PASSWORD_SALT' in envidon:
+ DB_PASSWORD_SALT = environ['PASWORD_SALT']
+else:
+ DB_PASSWORD_SALT = urandom(16)
app = Flask(__name__)
-app.config['DEBUG'] = True
app.config['SECRET_KEY'] = urandom(16)
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite://'
-app.config["SECURITY_PASSWORD_SALT"] = "SuPeRrAnDoMpAsSwOrD"
+app.config["SECURITY_PASSWORD_SALT"] = DB_PASSWORD_SALT
db = SQLAlchemy(app)
--
GitLab