From fb0f005343a6996f08949439dee975e9b5caec67 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Wed, 27 Oct 2021 18:36:50 +0000 Subject: [PATCH] Get rid of complicated prefix logic. Further simplify /static handling and nginx config. --- core/admin/Dockerfile | 2 +- core/admin/mailu/__init__.py | 7 +++--- core/admin/mailu/sso/__init__.py | 2 +- core/admin/mailu/sso/templates/base_sso.html | 8 +++---- core/admin/mailu/ui/__init__.py | 2 +- core/admin/mailu/ui/templates/sidebar.html | 2 +- core/admin/mailu/utils.py | 20 ----------------- core/nginx/conf/nginx.conf | 23 +++++--------------- 8 files changed, 17 insertions(+), 49 deletions(-) diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile index ed0e7f3b..a4f28481 100644 --- a/core/admin/Dockerfile +++ b/core/admin/Dockerfile @@ -38,7 +38,7 @@ RUN set -eu \ && pip3 install -r requirements.txt \ && apk del --no-cache build-dep -COPY --from=assets static ./mailu/static_files/static +COPY --from=assets static ./mailu/static COPY mailu ./mailu COPY migrations ./migrations COPY start.py /start.py diff --git a/core/admin/mailu/__init__.py b/core/admin/mailu/__init__.py index 4413d68c..20acf360 100644 --- a/core/admin/mailu/__init__.py +++ b/core/admin/mailu/__init__.py @@ -11,7 +11,7 @@ import hmac def create_app_from_config(config): """ Create a new application based on the given configuration """ - app = flask.Flask(__name__, static_folder='static_files', static_url_path='') + app = flask.Flask(__name__, static_folder='static', static_url_path='/static') app.cli.add_command(manage.mailu) # Bootstrap is used for error display and flash messages @@ -25,7 +25,6 @@ def create_app_from_config(config): utils.babel.init_app(app) utils.login.init_app(app) utils.login.user_loader(models.User.get) - utils.proxy.init_app(app) utils.migrate.init_app(app, models.db) app.device_cookie_key = hmac.new(bytearray(app.secret_key, 'utf-8'), bytearray('DEVICE_COOKIE_KEY', 'utf-8'), 'sha256').digest() @@ -58,8 +57,8 @@ def create_app_from_config(config): ) # Import views - from mailu import ui, internal, sso, static_files - app.register_blueprint(ui.ui, url_prefix='/ui') + from mailu import ui, internal, sso + app.register_blueprint(ui.ui, url_prefix=app.config['WEB_ADMIN']) app.register_blueprint(internal.internal, url_prefix='/internal') app.register_blueprint(sso.sso, url_prefix='/sso') return app diff --git a/core/admin/mailu/sso/__init__.py b/core/admin/mailu/sso/__init__.py index 3f3cc39f..4b4c057b 100644 --- a/core/admin/mailu/sso/__init__.py +++ b/core/admin/mailu/sso/__init__.py @@ -1,5 +1,5 @@ from flask import Blueprint -sso = Blueprint('sso', __name__, template_folder='templates') +sso = Blueprint('sso', __name__, static_folder='None' ,template_folder='templates') from mailu.sso.views import * diff --git a/core/admin/mailu/sso/templates/base_sso.html b/core/admin/mailu/sso/templates/base_sso.html index 2d6446b2..17aedff7 100644 --- a/core/admin/mailu/sso/templates/base_sso.html +++ b/core/admin/mailu/sso/templates/base_sso.html @@ -8,8 +8,8 @@ Mailu-Admin | {{ config["SITENAME"] }} - - + +
@@ -80,7 +80,7 @@
- - + + diff --git a/core/admin/mailu/ui/__init__.py b/core/admin/mailu/ui/__init__.py index ec3601a1..0780896e 100644 --- a/core/admin/mailu/ui/__init__.py +++ b/core/admin/mailu/ui/__init__.py @@ -1,6 +1,6 @@ from flask import Blueprint -ui = Blueprint('ui', __name__, static_folder='static', template_folder='templates') +ui = Blueprint('ui', __name__, static_folder='None', template_folder='templates') from mailu.ui.views import * diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html index 62168ff1..239eee7e 100644 --- a/core/admin/mailu/ui/templates/sidebar.html +++ b/core/admin/mailu/ui/templates/sidebar.html @@ -75,7 +75,7 @@
  • - +

    {% trans %}Antispam{% endtrans %}

     diff --git a/core/admin/mailu/utils.py b/core/admin/mailu/utils.py index d7a57aaa..8d790d0c 100644 --- a/core/admin/mailu/utils.py +++ b/core/admin/mailu/utils.py @@ -95,26 +95,6 @@ def get_locale(): flask.session['language'] = language return language - -# Proxy fixer -class PrefixMiddleware(object): - """ fix proxy headers """ - def __init__(self): - self.app = None - - def __call__(self, environ, start_response): - prefix = environ.get('HTTP_X_FORWARDED_PREFIX', '') - if prefix: - environ['SCRIPT_NAME'] = prefix - return self.app(environ, start_response) - - def init_app(self, app): - self.app = fixers.ProxyFix(app.wsgi_app, x_for=1, x_proto=1) - app.wsgi_app = self - -proxy = PrefixMiddleware() - - # Data migrate migrate = flask_migrate.Migrate() diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf index fdd73e26..fd6cffd2 100644 --- a/core/nginx/conf/nginx.conf +++ b/core/nginx/conf/nginx.conf @@ -182,30 +182,19 @@ http { {% endif %} {% if ADMIN == 'true' %} - location {{ WEB_ADMIN }} { - return 301 {{ WEB_ADMIN }}/ui; - } + location {{ WEB_ADMIN }} { + include /etc/nginx/proxy.conf; + proxy_pass http://$admin; + expires $expires; + } - location ~ {{ WEB_ADMIN }}/ui { - rewrite ^{{ WEB_ADMIN }}/(.*) /$1 break; - include /etc/nginx/proxy.conf; - proxy_set_header X-Forwarded-Prefix {{ WEB_ADMIN }}; - proxy_pass http://$admin; - expires $expires; - } - - location {{ WEB_ADMIN }}/antispam { + location ~ {{ WEB_ADMIN }}/antispam/ { rewrite ^{{ WEB_ADMIN }}/antispam/(.*) /$1 break; auth_request /internal/auth/admin; proxy_set_header X-Real-IP ""; proxy_set_header X-Forwarded-For ""; proxy_pass http://$antispam; } - - location ^~ {{ WEB_ADMIN }}/sso { - include /etc/nginx/proxy.conf; - rewrite ^{{ WEB_ADMIN }}/(.*) /$1 redirect; - } {% endif %} {% if WEBDAV != 'none' %}