mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-16 09:34:03 +01:00
Added visibility rule, better labeling
This commit is contained in:
@@ -181,7 +181,7 @@ class AdminGlobalParametersSerializer(serializers.Serializer):
|
||||
enable_mx_checks = serializers.BooleanField(default=True)
|
||||
valid_mxs = serializers.CharField(allow_blank=True)
|
||||
domains_must_have_authorized_mx = serializers.BooleanField(default=False)
|
||||
enable_ipv6_checks = serializers.BooleanField(default=True)
|
||||
enable_ipv6_mx_checks = serializers.BooleanField(default=True)
|
||||
enable_spf_checks = serializers.BooleanField(default=True)
|
||||
enable_dkim_checks = serializers.BooleanField(default=True)
|
||||
enable_dmarc_checks = serializers.BooleanField(default=True)
|
||||
@@ -275,6 +275,8 @@ class AdminGlobalParametersSerializer(serializers.Serializer):
|
||||
raise serializers.ValidationError({
|
||||
"valid_mxs": _("Define at least one authorized network / address")
|
||||
})
|
||||
if not data.get("enable_mx_checks"):
|
||||
data["enable_ipv6_mx_checks"] = False
|
||||
return data
|
||||
|
||||
|
||||
|
||||
@@ -50,11 +50,11 @@ class AdminParametersForm(param_forms.AdminParametersForm):
|
||||
)
|
||||
)
|
||||
|
||||
enable_ipv6_checks = YesNoField(
|
||||
enable_ipv6_mx_checks = YesNoField(
|
||||
label=gettext_lazy("Enable IPV6 checks"),
|
||||
initial=True,
|
||||
help_text=gettext_lazy(
|
||||
"Check if every domain has a valid AAAA record"
|
||||
"Check if MX setup for ipv6 is valid"
|
||||
)
|
||||
)
|
||||
|
||||
@@ -202,7 +202,8 @@ class AdminParametersForm(param_forms.AdminParametersForm):
|
||||
# Visibility rules
|
||||
visibility_rules = {
|
||||
"valid_mxs": "enable_mx_checks=True",
|
||||
"domains_must_have_authorized_mx": "enable_mx_checks=True"
|
||||
"domains_must_have_authorized_mx": "enable_mx_checks=True",
|
||||
"enable_ipv6_mx_checks": "enable_mx_checks=True"
|
||||
}
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
@@ -300,6 +301,8 @@ class AdminParametersForm(param_forms.AdminParametersForm):
|
||||
"valid_mxs",
|
||||
_("Define at least one authorized network / address")
|
||||
)
|
||||
if not cleaned_data.get("enable_mx_checks"):
|
||||
cleaned_data["enable_ipv6_mx_checks"] = False
|
||||
return cleaned_data
|
||||
|
||||
|
||||
@@ -330,10 +333,11 @@ GLOBAL_PARAMETERS_STRUCT = collections.OrderedDict([
|
||||
"does not use one of the defined addresses."
|
||||
)
|
||||
}),
|
||||
("enable_ipv6_checks", {
|
||||
("enable_ipv6_mx_checks", {
|
||||
"label": gettext_lazy("Enable IPV6 checks"),
|
||||
"display": "enable_mx_checks=true",
|
||||
"help_text": gettext_lazy(
|
||||
"Check if every domain has a valid IPV6 record"
|
||||
"Check if MX setup for ipv6 is valid"
|
||||
)
|
||||
}),
|
||||
("enable_spf_checks", {
|
||||
|
||||
@@ -227,7 +227,7 @@ def get_domain_mx_list(domain):
|
||||
mx_domain = dns_answer.exchange.to_unicode(
|
||||
omit_final_dot=True, idna_codec=IDNA_2008_UTS_46)
|
||||
rtypes = ["A"]
|
||||
if param_tools.get_global_parameter("enable_ipv6_checks", app="admin"):
|
||||
if param_tools.get_global_parameter("enable_ipv6_mx_checks", app="admin"):
|
||||
rtypes.append("AAAA")
|
||||
for rtype in rtypes:
|
||||
ip_answers = get_dns_records(mx_domain, rtype, resolver)
|
||||
|
||||
@@ -179,7 +179,7 @@ class MXTestCase(ModoTestCase):
|
||||
mock_query.side_effect = utils.mock_dns_query_result
|
||||
mock_ip_address.side_effect = utils.mock_ip_address_result
|
||||
localconfig = core_models.LocalConfig.objects.first()
|
||||
localconfig.parameters.set_value("enable_ipv6_checks", True, "admin")
|
||||
localconfig.parameters.set_value("enable_ipv6_mx_checks", True, "admin")
|
||||
localconfig.save()
|
||||
with LogCapture("modoboa.admin") as log:
|
||||
get_domain_mx_list("test3.com")
|
||||
@@ -189,7 +189,7 @@ class MXTestCase(ModoTestCase):
|
||||
% "mx3.example.com")
|
||||
)
|
||||
localconfig = core_models.LocalConfig.objects.first()
|
||||
localconfig.parameters.set_value("enable_ipv6_checks", False, "admin")
|
||||
localconfig.parameters.set_value("enable_ipv6_mx_checks", False, "admin")
|
||||
localconfig.save()
|
||||
with LogCapture("modoboa.admin") as log2:
|
||||
get_domain_mx_list("test3.com")
|
||||
|
||||
Reference in New Issue
Block a user