Move sieve script generation to the admin container

This commit is contained in:
kaiyou
2018-09-27 08:11:26 +02:00
parent cfeaa189f9
commit 4d25083847
7 changed files with 9 additions and 15 deletions

View File

@@ -6,7 +6,7 @@ import socket
import flask
internal = flask.Blueprint('internal', __name__)
internal = flask.Blueprint('internal', __name__, template_folder='templates')
@internal.app_errorhandler(RateLimitExceeded)
def rate_limit_handler(e):

View File

@@ -0,0 +1,40 @@
require "variables";
require "vacation";
require "fileinto";
require "envelope";
require "mailbox";
require "imap4flags";
require "regex";
require "relational";
require "date";
require "comparator-i;ascii-numeric";
require "spamtestplus";
require "editheader";
require "index";
if header :index 2 :matches "Received" "from * by * for <*>; *"
{
deleteheader "Delivered-To";
addheader "Delivered-To" "<${3}>";
}
{% if user.spam_enabled %}
if spamtest :percent :value "gt" :comparator "i;ascii-numeric" "{{ user.spam_threshold }}"
{
setflag "\\seen";
fileinto :create "Junk";
stop;
}
{% endif %}
if exists "X-Virus" {
discard;
stop;
}
{% if user.reply_enabled %}
if currentdate :value "le" "date" "{{ user.reply_enddate }}"
{
vacation :days 1 :subject "{{ user.reply_subject }}" "{{ user.reply_body }}";
}
{% endif %}

View File

@@ -122,7 +122,7 @@ def dovecot_quota(ns, user_email):
def dovecot_sieve(script, user_email):
user = models.User.query.get(user_email) or flask.abort(404)
if script == "default":
pass
return flask.jsonify(flask.render_template("default.sieve"))
else:
flask.abort(404)