Merge pull request #3107 from modoboa/doveadm-caching

Doveadm caching
This commit is contained in:
Antoine Nguyen
2023-12-20 14:56:48 +01:00
committed by GitHub
49 changed files with 6403 additions and 4757 deletions
+2 -2
View File
@@ -75,6 +75,8 @@ class DomainAPITestCase(ModoAPITestCase):
@mock.patch("socket.getaddrinfo")
def test_create_domain_with_mx_check(self, mock_getaddrinfo, mock_query):
"""Check domain creation when MX check is activated."""
mock_query.side_effect = utils.mock_dns_query_result
mock_getaddrinfo.side_effect = utils.mock_ip_query_result
self.set_global_parameter("enable_admin_limits", False, app="limits")
self.set_global_parameter("valid_mxs", "192.0.2.1 2001:db8::1")
self.set_global_parameter("domains_must_have_authorized_mx", True)
@@ -84,8 +86,6 @@ class DomainAPITestCase(ModoAPITestCase):
self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
url = reverse("v1:domain-list")
mock_query.side_effect = utils.mock_dns_query_result
mock_getaddrinfo.side_effect = utils.mock_ip_query_result
response = self.client.post(
url, {"name": "no-mx.example.com", "quota": 0,
"default_mailbox_quota": 10}
+3 -2
View File
@@ -210,6 +210,9 @@ class DomainTestCase(ModoTestCase):
@mock.patch("socket.getaddrinfo")
def test_create_and_check_mx(self, mock_getaddrinfo, mock_query):
"""Check for authorized MX record."""
mock_query.side_effect = utils.mock_dns_query_result
mock_getaddrinfo.side_effect = utils.mock_ip_query_result
reseller = core_factories.UserFactory(
username="reseller", groups=("Resellers", ))
self.client.force_login(reseller)
@@ -218,8 +221,6 @@ class DomainTestCase(ModoTestCase):
self.set_global_parameter("valid_mxs", "192.0.2.1 2001:db8::1")
self.set_global_parameter("domains_must_have_authorized_mx", True)
mock_query.side_effect = utils.mock_dns_query_result
mock_getaddrinfo.side_effect = utils.mock_ip_query_result
values = {
"name": "no-mx.example.com", "quota": 0,
"default_mailbox_quota": 0,
+2 -2
View File
@@ -83,14 +83,14 @@ domainalias; domalias1.com; domain1.com; True
@mock.patch("socket.getaddrinfo")
def test_domain_import_with_mx_check(self, mock_getaddrinfo, mock_query):
"""Check domain import when MX check is enabled."""
mock_query.side_effect = utils.mock_dns_query_result
mock_getaddrinfo.side_effect = utils.mock_ip_query_result
reseller = core_factories.UserFactory(
username="reseller", groups=("Resellers", ))
self.client.force_login(reseller)
self.set_global_parameter("valid_mxs", "192.0.2.1 2001:db8::1")
self.set_global_parameter("domains_must_have_authorized_mx", True)
mock_query.side_effect = utils.mock_dns_query_result
mock_getaddrinfo.side_effect = utils.mock_ip_query_result
f = ContentFile(
b"domain; test3.com; 100; 1; True", name="domains.csv")
resp = self.client.post(
+2 -1
View File
@@ -36,6 +36,7 @@ _DNE_MX_RECORD = MX("IN", "MX", 10, Name(
_MX_RECORDS = [_MX_RECORD_1]
_IP_SET_RECORDS = [RRset()]
_IPV4_RECORD_REDIS = (socket.AF_INET, socket.SOCK_STREAM, 6, "", ("127.0.0.1", int(settings.REDIS_PORT)))
_IPV4_RECORD_1 = (socket.AF_INET, socket.SOCK_STREAM, 6, "", ("192.0.2.1", 25))
_IPV4_RECORD_2 = (socket.AF_INET, socket.SOCK_STREAM, 6, "", ("192.0.2.2", 25))
_IPV6_RECORD = (socket.AF_INET, socket.SOCK_STREAM, 6, "", ("2001:db8::1", 25))
@@ -69,7 +70,7 @@ _POSSIBLE_DNS_RESULTS_NO_MX = {
"mx3.example.com": [_A_RECORD]
}
_POSSIBLE_IP_RESULTS = {
settings.REDIS_HOST: socket.getaddrinfo(settings.REDIS_HOST, settings.REDIS_PORT),
settings.REDIS_HOST: [_IPV4_RECORD_REDIS],
"test3.com": [_IPV4_RECORD_2],
"mx2.example.com": [_IPV4_RECORD_2],
"bad-response.example.com": [_BAD_IP_RECORD],