From d8365bfbcf35b56920428cd8bc6ed830716d2cdb Mon Sep 17 00:00:00 2001 From: kaiyou Date: Thu, 27 Sep 2018 07:55:54 +0200 Subject: [PATCH] Use simpler routes for Dovecot --- core/admin/mailu/internal/views.py | 7 ++++--- core/dovecot/start.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/admin/mailu/internal/views.py b/core/admin/mailu/internal/views.py index fff9b481..78d1528a 100644 --- a/core/admin/mailu/internal/views.py +++ b/core/admin/mailu/internal/views.py @@ -93,7 +93,7 @@ def postfix_transport(email): return flask.abort(404) -@internal.route("/dovecot/auth/passdb/") +@internal.route("/dovecot/passdb/") def dovecot_passdb_dict(user_email): user = models.User.query.get(user_email) or flask.abort(403) return flask.jsonify({ @@ -101,7 +101,7 @@ def dovecot_passdb_dict(user_email): }) -@internal.route("/dovecot/auth/userdb/") +@internal.route("/dovecot/userdb/") def dovecot_userdb_dict(user_email): user = models.User.query.get(user_email) or flask.abort(403) return flask.jsonify({ @@ -109,10 +109,11 @@ def dovecot_userdb_dict(user_email): }) -@internal.route("/dovecot/quota/quota//", methods=["POST"]) +@internal.route("/dovecot/quota//", methods=["POST"]) def dovecot_quota(ns, user_email): user = models.User.query.get(user_email) or flask.abort(403) if ns == "storage": user.quota_bytes_used = flask.request.get_json() db.session.commit() return flask.jsonify(None) + diff --git a/core/dovecot/start.py b/core/dovecot/start.py index 48e9377c..d2163e56 100755 --- a/core/dovecot/start.py +++ b/core/dovecot/start.py @@ -12,9 +12,9 @@ from podop import run_server def start_podop(): os.setuid(8) run_server(40, "dovecot", "/tmp/podop.socket", [ - ("quota", "url", "http://admin/internal/dovecot/quota/§"), - ("auth", "url", "http://admin/internal/dovecot/auth/§"), - ("sieve", "url", "http://admin/internal/dovecot/sieve/§"), + ("quota", "url", "http://admin/internal/dovecot/§"), + ("auth", "url", "http://admin/internal/dovecot/§"), + ("sieve", "url", "http://admin/internal/dovecot/§"), ]) convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()).render(**os.environ))