[pages] use flask_config dict for remaining fields

anthonygego · anthonygego · commit 3ece2fbe5ccd · 2026-04-02T09:25:55.000+02:00
diff --git a/inginious/frontend/app.py b/inginious/frontend/app.py
@@ -41,10 +41,12 @@ def _put_configuration_defaults(config):
     :param config: the basic configuration as a dict
     :return: the same dict, but with defaults for some unfilled parameters
     """
-    if 'allowed_file_extensions' not in config:
-        config['allowed_file_extensions'] = [".c", ".cpp", ".java", ".oz", ".zip", ".tar.gz", ".tar.bz2", ".txt"]
-    if 'max_file_size' not in config:
-        config['max_file_size'] = 1024 * 1024
+    config["ALLOWED_FILE_EXTENSIONS"] = config.get(
+        'allowed_file_extensions',
+        [".c", ".cpp", ".java", ".oz", ".zip", ".tar.gz", ".tar.bz2", ".txt"]
+    )
+
+    config["MAX_FILE_SIZE"] = config.get('max_file_size', 1024 * 1024)
 
     if 'session_parameters' not in config or 'secret_key' not in config['session_parameters']:
         print("Please define a secret_key in the session_parameters part of the configuration.", file=sys.stderr)
@@ -61,6 +63,7 @@ def _put_configuration_defaults(config):
 
     if 'session_parameters' not in config:
         config['session_parameters'] = {}
+
     default_session_parameters = {
         "cookie_name": "inginious_session_id",
         "cookie_domain": None,
@@ -93,6 +96,7 @@ def _put_configuration_defaults(config):
         config["MAIL_PASSWORD"] = smtp_conf.get("password", None)
         config["MAIL_DEFAULT_SENDER"] = smtp_conf.get("sendername", "no-reply@ingnious.org")
 
+    config["STATIC_DIRECTORY"] = config.get("static_directory", "./static")
     config["SUPERADMINS"] = config.get("superadmins", [])
     config["ALLOW_DELETION"] = config.get("allow_deletion", True)
     config["ALLOW_REGISTRATION"] = config.get("allow_registration", True)
@@ -195,7 +199,6 @@ def get_app(config):
     flask_app.jinja_env.globals["get_homepath"] = get_homepath
     flask_app.jinja_env.globals["get_path"] = get_path
     flask_app.jinja_env.globals["pkg_version"] = __version__
-    flask_app.jinja_env.globals["sentry_io_url"] = config.get("SENTRY_IO_URL")
     flask_app.jinja_env.globals["user_manager"] = user_manager
     flask_app.jinja_env.globals["is_tos_defined"] = flask_app.is_tos_defined
 
@@ -229,8 +232,6 @@ def flask_internalerror(e):
     flask_app.client = client
     flask_app.available_languages = available_languages
     flask_app.available_indentation_types = available_indentation_types
-    flask_app.welcome_page = config.get("WELCOME_PAGE", None)
-    flask_app.static_directory = config.get("STATIC_DIRECTORY", "./static")
 
     # Init the mapping of the app
     if config.get("MAINTENANCE", False):
diff --git a/inginious/frontend/pages/index.py b/inginious/frontend/pages/index.py
@@ -4,7 +4,7 @@
 # more information about the licensing of this file.
 
 """ Index page """
-from flask import redirect, url_for
+from flask import current_app, redirect, url_for
 from inginious.frontend.pages.utils import INGIniousStaticPage
 
 
@@ -13,12 +13,11 @@ class IndexPage(INGIniousStaticPage):
 
     def GET(self):  # pylint: disable=arguments-differ
         """ Display main course list page """
-        if not self.app.welcome_page:
-            return redirect(self.app.get_path("courselist"))
-        return self.show_page(self.app.welcome_page)
+        if "WELCOME_PAGE" in current_app.config:
+            return self.show_page(current_app.config["WELCOME_PAGE"])
+        return redirect(self.app.get_path("courselist"))
+
 
     def POST(self):  # pylint: disable=arguments-differ
         """ Display main course list page """
-        if not self.app.welcome_page:
-            return redirect(self.app.get_path("courselist"))
-        return self.show_page(self.app.welcome_page)
+        return self.GET()
diff --git a/inginious/frontend/pages/utils.py b/inginious/frontend/pages/utils.py
@@ -9,11 +9,10 @@
 from typing import List, Dict
 
 import flask
-from flask import redirect, render_template, session
+from flask import current_app, redirect, render_template, session
 from flask.views import MethodView
 from werkzeug.exceptions import NotFound, NotAcceptable, MethodNotAllowed
 
-from inginious.common.filesystems import FileSystemProvider
 from inginious.client.client import Client
 from inginious.common import custom_yaml
 from inginious.frontend.environment_types import get_all_env_types
@@ -233,7 +232,7 @@ def POST(self, pageid):
         return self.show_page(pageid)
 
     def show_page(self, page):
-        static_directory = self.app.static_directory
+        static_directory = current_app.config["STATIC_DIRECTORY"]
         language = session.language
 
         # Check for the file
diff --git a/inginious/frontend/templates/layout.html b/inginious/frontend/templates/layout.html
@@ -61,10 +61,10 @@
     <meta name="msapplication-TileImage" content="{{get_homepath()}}/static/icons/mstile-144x144.png">
     <meta name="msapplication-config" content="{{get_homepath()}}/static/icons/browserconfig.xml">
 
-    {% if sentry_io_url %}
+    {% if config.SENTRY_IO_URL %}
     <script src="{{get_homepath()}}/static/js/libs/sentry-io-bundle.min.js?version=5.4.3" type="text/javascript" charset="utf-8"></script>
     <script>
-        Sentry.init({ dsn: "{{sentry_io_url}}" });
+        Sentry.init({ dsn: "{{config.SENTRY_IO_URL}}" });
         {% if user_manager is defined and session.loggedin %}
             Sentry.configureScope(function(scope) {
                 scope.setUser({
