From 6ba55ee37765c85da6130ea0d00d6e90b0fb70fb Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Thu, 27 Sep 2018 14:10:53 +0200
Subject: [PATCH] Implement the sieve script name resolution pattern

---
 core/admin/mailu/internal/views.py | 9 +++++++--
 core/dovecot/conf/dovecot.conf     | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/admin/mailu/internal/views.py b/core/admin/mailu/internal/views.py
index 6ba1115e..7e0a71e2 100644
--- a/core/admin/mailu/internal/views.py
+++ b/core/admin/mailu/internal/views.py
@@ -118,8 +118,13 @@ def dovecot_quota(ns, user_email):
     return flask.jsonify(None)
 
 
-@internal.route("/dovecot/sieve/name/default/<user_email>")
-def dovecot_sieve(script, user_email):
+@internal.route("/dovecot/sieve/name/<script>/<user_email>")
+def dovecot_sieve_name(script, user_email):
+    return flask.jsonify(script)
+
+
+@internal.route("/dovecot/sieve/data/default/<user_email>")
+def dovecot_sieve_data(user_email):
     user = models.User.query.get(user_email) or flask.abort(404)
     return flask.jsonify(flask.render_template("default.sieve", user=user))
 
diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index 4d3302ba..aaf4f36e 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -138,7 +138,8 @@ service managesieve {
 plugin {
   sieve = dict:proxy:/tmp/podop.socket:sieve
   sieve_plugins = sieve_imapsieve sieve_extprograms
-  sieve_global_extensions = +spamtest +spamtestplus +vnd.dovecot.execute +editheader
+  sieve_extensions = +spamtest +spamtestplus +editheader
+  sieve_global_extensions = +vnd.dovecot.execute
 
   # Sieve execute
   sieve_execute_bin_dir = /var/lib/dovecot/bin