modoboa 2.4.9__py3-none-any.whl → 2.4.11__py3-none-any.whl

modoboa/maillog/management/commands/logparser.py

@@ -78,6 +78,7 @@ class LogParser:
         # set up regular expression
         self._date_expressions = [
             r"(?P<month>\w+)\s+(?P<day>\d+)\s+(?P<hour>\d+):(?P<min>\d+):(?P<sec>\d+)(?P<eol>.*)",  # noqa
+            r"(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+)T(?P<hour>\d+):(?P<min>\d+):(?P<sec>\d+)[\+\-]\d+:\d+(?P<eol>.*)",  # noqa
             r"(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+)T(?P<hour>\d+):(?P<min>\d+):(?P<sec>\d+)\.\d+[\+\-]\d+:\d+(?P<eol>.*)",  # noqa
         ]
         self._date_expressions = [re.compile(v) for v in self._date_expressions]

modoboa/pdfcredentials/api/v2/serializers.py

@@ -38,12 +38,16 @@ class PDFCredentialsSettingsSerializer(serializers.Serializer):
         required=False, allow_blank=True, allow_null=True
     )
     include_connection_settings = serializers.BooleanField(default=False)
-    smtp_server_address = serializers.CharField()
+    smtp_server_address = serializers.CharField(
+        required=False, allow_blank=True, allow_null=True
+    )
     smtp_server_port = serializers.IntegerField(default=587)
     smtp_connection_security = serializers.ChoiceField(
         choices=CONNECTION_SECURITY_MODES, default="starttls"
     )
-    imap_server_address = serializers.CharField()
+    imap_server_address = serializers.CharField(
+        required=False, allow_blank=True, allow_null=True
+    )
     imap_server_port = serializers.IntegerField(default=143)
     imap_connection_security = serializers.ChoiceField(
         choices=CONNECTION_SECURITY_MODES, default="starttls"
@@ -72,13 +76,21 @@ class PDFCredentialsSettingsSerializer(serializers.Serializer):
             enabled_pdfcredentials is None
             and param_tools.get_global_parameter("enabled_pdfcredentials")
         )
+        errors = {}
         if condition:
             storage_dir = data.get("storage_dir", None)
             if storage_dir is not None:
                 if not os.path.isdir(storage_dir):
-                    raise serializers.ValidationError(_("Directory not found."))
-                if not os.access(storage_dir, os.W_OK):
-                    raise serializers.ValidationError(_("Directory is not writable"))
+                    errors["storage_dir"] = _("Directory not found.")
+                elif not os.access(storage_dir, os.W_OK):
+                    errors["storage_dir"] = _("Directory is not writable")
+            include_connection_settings = data.get("include_connection_settings")
+            if include_connection_settings:
+                for field in ["smtp_server_address", "imap_server_address"]:
+                    if not data.get(field):
+                        errors[field] = _("This field is required.")
+        if errors:
+            raise serializers.ValidationError(errors)
         return data
 
 

modoboa/pdfcredentials/api/v2/tests.py

@@ -190,3 +190,31 @@ class PDFCredentialViewTestCase(ModoAPITestCase):
         data["enabled_pdfcredentials"] = False
         resp = self.client.put(url, data, format="json")
         self.assertEqual(resp.status_code, 200)
+
+    def test_optional_settings(self):
+        url = reverse("v2:parameter-global-detail", args=["pdfcredentials"])
+        path = f"{self.workdir}/credentials"
+        os.makedirs(path)
+        data = {
+            "enabled_pdfcredentials": True,
+            "storage_dir": path,
+            "webpanel_url": "http://localhost",
+        }
+        resp = self.client.put(url, data, format="json")
+        self.assertEqual(resp.status_code, 200)
+
+        data["include_connection_settings"] = True
+        resp = self.client.put(url, data, format="json")
+        self.assertEqual(resp.status_code, 400)
+        errors = resp.json()
+        self.assertEqual(errors["smtp_server_address"][0], "This field is required.")
+        self.assertEqual(errors["imap_server_address"][0], "This field is required.")
+
+        data.update(
+            {
+                "smtp_server_address": "mail.localhost",
+                "imap_server_address": "mail.localhost",
+            }
+        )
+        resp = self.client.put(url, data, format="json")
+        self.assertEqual(resp.status_code, 200)

modoboa/pdfcredentials/app_settings.py

@@ -121,7 +121,7 @@ PDF_CREDENTIALS_PARAMETERS_STRUCT = collections.OrderedDict(
                             "smtp_server_address",
                             {
                                 "label": _("SMTP server address"),
-                                "display": "include_connection_settings=True",
+                                "display": "include_connection_settings=true",
                                 "help_text": _(
                                     "Address of the SMTP server (hostname or IP)"
                                 ),

{modoboa-2.4.9.dist-info → modoboa-2.4.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modoboa
-Version: 2.4.9
+Version: 2.4.11
 Summary: Mail hosting made simple
 Author-email: Antoine Nguyen <tonio@ngyn.org>
 License: ISC License
@@ -40,7 +40,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: django==5.2.4
+Requires-Dist: django==5.2.5
 Requires-Dist: django-phonenumber-field[phonenumbers]==8.1.0
 Requires-Dist: django-reversion==5.1.0
 Requires-Dist: django-xforwardedfor-middleware==2.0