github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed serializer check for dkim dir, added alarms on gen

Browse Source
This commit is contained in:
Spitfireap
2024-07-17 12:01:14 +02:00
committed by Antoine Nguyen
parent 176369b6f0
commit 418f350b11
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/api/v2/serializers.py
-4
View File
@@ -228,10 +228,6 @@ class AdminGlobalParametersSerializer(serializers.Serializer):
def validate_dkim_keys_storage_dir(self, value):
"""Check that directory exists."""
if value:
if not os.path.isdir(value):
raise serializers.ValidationError(_("Directory not found."))
if not os.access(value, os.W_OK):
raise serializers.ValidationError(_("Directory non-writable"))
code, output = exec_cmd("which openssl")
if code:
raise serializers.ValidationError(
modoboa/admin/constants.py
+2
View File
@@ -29,6 +29,8 @@ DKIM_KEY_LENGTHS = [
]
DKIM_WRITE_ERROR = "DKIM path error"
DKIM_DIR_NOT_FOUND = "DKIM directory not found"
DKIM_ERROR = "general DKIM generation error"
ALARM_OPENED = 1
ALARM_CLOSED = 2
modoboa/admin/management/commands/subcommands/_manage_dkim_keys.py
+15 -3
View File
@@ -10,8 +10,7 @@ from modoboa.lib import sysutils
from modoboa.parameters import tools as param_tools
from .... import models
from .... import signals
from ....constants import DKIM_WRITE_ERROR, ALARM_OPENED
from ....constants import DKIM_WRITE_ERROR, ALARM_OPENED, DKIM_DIR_NOT_FOUND, DKIM_ERROR
class ManageDKIMKeys(BaseCommand):
@@ -21,11 +20,16 @@ class ManageDKIMKeys(BaseCommand):
"""Create a new DKIM key."""
storage_dir = param_tools.get_global_parameter("dkim_keys_storage_dir")
pkey_path = os.path.join(storage_dir, "{}.pem".format(domain.name))
alarm_qset = domain.alarms.filter(internal_name=DKIM_WRITE_ERROR)
if not os.access(storage_dir, os.W_OK):
if not alarm_qset.exists():
domain.alarms.create(
title=_("DKIM path non-writable"), internal_name=DKIM_WRITE_ERROR
title=_(
"DKIM path non-writable "
"(either a permission issue or the directory does not exist)"
),
internal_name=DKIM_WRITE_ERROR,
)
else:
alarm = alarm_qset.first()
@@ -48,6 +52,10 @@ class ManageDKIMKeys(BaseCommand):
domain.name, smart_str(output)
)
)
domain.alarms.create(
title=_("Failed to generate DKIM private key"), internal_name=DKIM_ERROR
)
return
domain.dkim_private_key_path = pkey_path
code, output = sysutils.exec_cmd("openssl rsa -in {} -pubout".format(pkey_path))
if code:
@@ -56,6 +64,10 @@ class ManageDKIMKeys(BaseCommand):
domain.name, smart_str(output)
)
)
domain.alarms.create(
title=_("Failed to generate DKIM public key"), internal_name=DKIM_ERROR
)
return
public_key = ""
for cpt, line in enumerate(smart_str(output).splitlines()):
if cpt == 0 or line.startswith("-----"):