Added test, fixed dkim management command

Thank you test
This commit is contained in:
Spitap
2023-06-25 17:36:27 +02:00
parent f05478bccd
commit c671b2526d
2 changed files with 13 additions and 3 deletions
@@ -65,6 +65,9 @@ class ManageDKIMKeys(BaseCommand):
def handle(self, *args, **options):
"""Entry point."""
self.default_key_length = param_tools.get_global_parameter(
"dkim_default_key_length")
if options["domain"] != "":
domain = models.Domain.objects.filter(name=options["domain"],
enable_dkim=True,
@@ -75,8 +78,6 @@ class ManageDKIMKeys(BaseCommand):
domains=domain)
return
self.default_key_length = param_tools.get_global_parameter(
"dkim_default_key_length")
qset = models.Domain.objects.filter(
enable_dkim=True, dkim_private_key_path="")
for domain in qset:
+10 -1
View File
@@ -470,12 +470,21 @@ class DKIMTestCase(ModoTestCase):
constants.ALARM_CLOSED)
key_path = os.path.join(self.workdir, "{}.pem".format(values["name"]))
self.assertTrue(os.path.exists(key_path))
domain = Domain.objects.get(name=values["name"])
domain.refresh_from_db()
url = reverse("admin:domain_detail", args=[domain.pk])
response = self.client.get(url)
self.assertContains(
response, escape(domain.bind_format_dkim_public_key))
# Try generating DKIM key for a targetted domain
domain.dkim_private_key_path = ""
domain.save()
call_command("modo", "manage_dkim_keys", f"--domain={domain.name}")
domain.refresh_from_db()
self.assertNotEqual(domain.dkim_private_key_path, "")
def test_dkim_key_length_modification(self):
""" """
self.set_global_parameter("dkim_keys_storage_dir", self.workdir)