From 27e37577c61067fb9dec77a895238ee6d05d616e Mon Sep 17 00:00:00 2001
From: Philip Rosenberg-Watt
Date: Mon, 3 Feb 2020 14:53:04 -0700
Subject: [PATCH] Add IPv6 to allow_nets
Roundcube was not connecting to sieve with IPv6 enabled.
Fixes #1336
---
core/admin/mailu/configuration.py | 1 +
core/admin/mailu/internal/views/dovecot.py | 2 ++
2 files changed, 3 insertions(+)
diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py
index 7dcd7c3a..66b0b832 100644
--- a/core/admin/mailu/configuration.py
+++ b/core/admin/mailu/configuration.py
@@ -67,6 +67,7 @@ DEFAULT_CONFIG = {
'HOST_REDIS': 'redis',
'HOST_FRONT': 'front',
'SUBNET': '192.168.203.0/24',
+ 'SUBNET6': None,
'POD_ADDRESS_RANGE': None
}
diff --git a/core/admin/mailu/internal/views/dovecot.py b/core/admin/mailu/internal/views/dovecot.py
index f44f59bc..9c665977 100644
--- a/core/admin/mailu/internal/views/dovecot.py
+++ b/core/admin/mailu/internal/views/dovecot.py
@@ -11,6 +11,8 @@ def dovecot_passdb_dict(user_email):
user = models.User.query.get(user_email) or flask.abort(404)
allow_nets = []
allow_nets.append(app.config["SUBNET"])
+ if app.config["SUBNET6"]:
+ allow_nets.append(app.config["SUBNET6"])
if app.config["POD_ADDRESS_RANGE"]:
allow_nets.append(app.config["POD_ADDRESS_RANGE"])
return flask.jsonify({