Move admin token warning into app start

This commit is contained in:
Bluenix 2022-10-19 23:10:28 +02:00
parent 610b7e9811
commit 210f1ab1d5
No known key found for this signature in database
GPG Key ID: 1C1ED07E6FC8AA48
2 changed files with 23 additions and 20 deletions

View File

@ -18,10 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
import os import os
from logbook import Logger
log = Logger(__name__)
MODE = "Development" MODE = "Development"
@ -76,22 +72,8 @@ class Config:
#: Shared secret for LVSP #: Shared secret for LVSP
LVSP_SECRET = "" LVSP_SECRET = ""
#: Admin credentials for automated testing ADMIN_ID = None
# The token is the value to pass in the Authorization header, and the ID ADMIN_TOKEN = None
# is the user ID to use when it is passed.
ADMIN_ID = os.getenv("ADMIN_ID")
ADMIN_TOKEN = os.getenv("ADMIN_TOKEN")
if None in {ADMIN_ID, ADMIN_TOKEN} and not ADMIN_ID == ADMIN_TOKEN:
log.warning(
"Not both admin ID ({}) and token ({}) configured; ignoring",
ADMIN_ID,
ADMIN_TOKEN,
)
ADMIN_ID = ADMIN_TOKEN = None
if ADMIN_ID is not None:
ADMIN_ID = int(ADMIN_ID)
class Development(Config): class Development(Config):
@ -104,6 +86,12 @@ class Development(Config):
"database": "litecord", "database": "litecord",
} }
ADMIN_ID = os.getenv("ADMIN_ID")
ADMIN_TOKEN = os.getenv("ADMIN_TOKEN")
if ADMIN_ID is not None:
ADMIN_ID = int(ADMIN_ID)
class Production(Config): class Production(Config):
DEBUG = False DEBUG = False

15
run.py
View File

@ -122,7 +122,22 @@ redirect_logging()
def make_app(): def make_app():
app = Quart(__name__) app = Quart(__name__)
app.config.from_object(f"config.{config.MODE}") app.config.from_object(f"config.{config.MODE}")
admin_id, admin_token = app.config["ADMIN_ID"], app.config["ADMIN_TOKEN"]
if None in {admin_id, admin_token} and not admin_id == admin_token:
log.warning(
"Not both admin ID ({}) and token ({}) configured; ignoring",
admin_id,
admin_token,
)
admin_id = admin_token = None
# update config if the variables were updated
app.config["ADMIN_ID"] = admin_id
app.config["ADMIN_TOKEN"] = admin_token
is_debug = app.config.get("DEBUG", False) is_debug = app.config.get("DEBUG", False)
app.debug = is_debug app.debug = is_debug