django-codenerix-email 4.0.40__py2.py3-none-any.whl → 4.0.42__py2.py3-none-any.whl

codenerix_email/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.40"
+__version__ = "4.0.42"
 
 __authors__ = [
     "Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>",

codenerix_email/management/commands/emails_recv.py

@@ -1,4 +1,5 @@
 import re
+import codecs
 from textwrap import dedent
 from argparse import RawTextHelpFormatter
 
@@ -144,6 +145,24 @@ class Command(BaseCommand):
             "--rewrite", action="store_true", help="Rewrite existing"
         )
 
+    def validate_encoding(self, encoding: str | None) -> str:
+        """
+        Validates and returns a safe encoding name.
+        """
+        # If an encoding is specified, verify it's valid
+        if encoding:
+            try:
+                # Attempt to look up the encoding to see if it's known
+                codecs.lookup(encoding)
+            except LookupError:
+                # If the lookup fails, the encoding is unknown
+                # Fall back to a safe default like 'latin-1'
+                encoding = "latin-1"
+        else:
+            # If no encoding is specified, use a default
+            encoding = "utf-8"
+        return encoding
+
     def handle(self, *args, **options):
         # Get configuration
         self.silent = options["silent"]
@@ -328,10 +347,15 @@ class Command(BaseCommand):
                 # Parse the email
                 msg = message_from_bytes(raw_email)
 
-                # Extract subject, efrom, eto & eid
+                # Extract subject
                 subject, encoding = decode_header(msg["Subject"])[0]
+
+                # Decode subject if it's bytes
                 if isinstance(subject, bytes):
-                    subject = subject.decode(encoding or "utf-8")
+                    charset = self.validate_encoding(encoding)
+                    subject = subject.decode(charset, errors="ignore")
+
+                # Extract other headers
                 efrom = msg.get("From")
                 eto = msg.get("To")
                 eid = msg.get("Message-ID")
@@ -353,23 +377,25 @@ class Command(BaseCommand):
                         for part in msg.walk():
                             content_type = part.get_content_type()
                             if content_type == "text/plain" and not body_plain:
+                                charset = self.validate_encoding(
+                                    part.get_content_charset()
+                                )
                                 body_plain = part.get_payload(
                                     decode=True
-                                ).decode(
-                                    part.get_content_charset() or "utf-8",
-                                    "ignore",
-                                )
+                                ).decode(charset, errors="ignore")
                             elif content_type == "text/html" and not body_html:
+                                charset = self.validate_encoding(
+                                    part.get_content_charset()
+                                )
                                 body_html = part.get_payload(
                                     decode=True
-                                ).decode(
-                                    part.get_content_charset() or "utf-8",
-                                    "ignore",
-                                )
+                                ).decode(charset, errors="ignore")
                     else:
+                        charset = self.validate_encoding(
+                            msg.get_content_charset()
+                        )
                         body_plain = msg.get_payload(decode=True).decode(
-                            msg.get_content_charset() or "utf-8",
-                            "ignore",
+                            charset, errors="ignore"
                         )
 
                     # Logic to associate replies/bounces with sent emails
@@ -416,9 +442,10 @@ class Command(BaseCommand):
                     headers = {}
                     for header, value in msg.items():
                         decoded_value, encoding = decode_header(value)[0]
+                        charset = self.validate_encoding(encoding)
                         if isinstance(decoded_value, bytes):
                             decoded_value = decoded_value.decode(
-                                encoding or "utf-8", "ignore"
+                                charset, errors="ignore"
                             )
                         headers[header] = decoded_value
 
@@ -596,7 +623,9 @@ class Command(BaseCommand):
                         headers_payload = part.get_payload(decode=True)
                         if isinstance(headers_payload, bytes):
                             # Decode using the specified charset
-                            charset = part.get_content_charset() or "utf-8"
+                            charset = self.validate_encoding(
+                                part.get_content_charset()
+                            )
                             headers_text = headers_payload.decode(
                                 charset, errors="ignore"
                             )
@@ -620,7 +649,9 @@ class Command(BaseCommand):
                             payload = part.get_payload(decode=True)
                             if isinstance(payload, bytes):
                                 # Decode using the specified charset
-                                charset = part.get_content_charset() or "utf-8"
+                                charset = self.validate_encoding(
+                                    part.get_content_charset()
+                                )
                                 body_text += payload.decode(
                                     charset, errors="ignore"
                                 )
@@ -631,7 +662,9 @@ class Command(BaseCommand):
                         payload = msg.get_payload(decode=True)
                         if isinstance(payload, bytes):
                             # Decode using the specified charset
-                            charset = msg.get_content_charset() or "utf-8"
+                            charset = self.validate_encoding(
+                                msg.get_content_charset()
+                            )
                             body_text = payload.decode(
                                 charset, errors="ignore"
                             )

{django_codenerix_email-4.0.40.dist-info → django_codenerix_email-4.0.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.40
+Version: 4.0.42
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.40.dist-info → django_codenerix_email-4.0.42.dist-info}/RECORD

@@ -1,5 +1,4 @@
-codenerix_email/.models.py.swp,sha256=sktik9iVIMa7EutN3nhqiJvvO3pAA4ZPGkD4cFvMxp0,40960
-codenerix_email/__init__.py,sha256=iu8TZi-9JIsQubz2hdtLDE1F9L-XrdUGhgRaDCNilME,149
+codenerix_email/__init__.py,sha256=zUdeNRRlJihOcJjhw5Q9V7lfEz0fapMDZg6sDEI2688,149
 codenerix_email/admin.py,sha256=w259UKFk_opGEl6PJjYHXWAHQ_8emgqmiixKT5Rid4A,1180
 codenerix_email/apps.py,sha256=WXqu1XQibDDyCvvQYt2JbTK4GIpW8BNv5DCbRJS2mmk,149
 codenerix_email/forms.py,sha256=P5w-ebxLR1V10RFDqO_R5vvZV-vY6SLTzVb1OLdFZE0,5710
@@ -828,8 +827,8 @@ codenerix_email/.mypy_cache/3.10/zoneinfo/_common.data.json,sha256=e4xbNKL_yQ5h5
 codenerix_email/.mypy_cache/3.10/zoneinfo/_common.meta.json,sha256=5K19XWobpSjKwiv7bZFZRcxsEfoh7b-FhYcmqB-2Iic,1737
 codenerix_email/.mypy_cache/3.10/zoneinfo/_tzpath.data.json,sha256=CFx7Q1XfUhhuNX69prkxyirG8rfvEDCNgEHWQigKC_A,5632
 codenerix_email/.mypy_cache/3.10/zoneinfo/_tzpath.meta.json,sha256=d1HJ_xFBI1orlZSVhH0gHWLI-dJG3zY-ZOlctOl62yU,1765
-codenerix_email/__pycache__/__init__.cpython-310.pyc,sha256=eWWSyDve9FPvyJlFakWAx-ukvTzE6-yzrdbtlV30aaE,313
-codenerix_email/__pycache__/__init__.cpython-311.pyc,sha256=TXTEa1LmC28a-J-IxfH9kCJ0ZXggGZexMZDC4yPBvdM,337
+codenerix_email/__pycache__/__init__.cpython-310.pyc,sha256=l9GJtMt8iO4CEAQw7GF-VKHRSXKp1LM0u3anmv8DTNo,313
+codenerix_email/__pycache__/__init__.cpython-311.pyc,sha256=JdakKHcPF2vqH90_mlw7sAfIVJgpl_o6PgPOmfKFPnY,337
 codenerix_email/__pycache__/__init__.cpython-35.pyc,sha256=dl9lYAgrokJptUj3JAhiqTlX7d_CbncOxZeTc1USc88,308
 codenerix_email/__pycache__/__init__.cpython-37.pyc,sha256=5d1CeFU5DrfnwrRpvSw1bHvLN9hoHXjUA3ln3rXCDo8,306
 codenerix_email/__pycache__/__init__.cpython-39.pyc,sha256=0c6KWU_eOTlF5l9fNWv8l41b0LcfVQNUsqDvJTv2YyU,300
@@ -869,7 +868,7 @@ codenerix_email/management/__pycache__/__init__.cpython-35.pyc,sha256=sBoEWs6zdI
 codenerix_email/management/__pycache__/__init__.cpython-39.pyc,sha256=uPXklfliVd3b8pLOJQT9ZeKcqmJMrGychvt68BsPulY,168
 codenerix_email/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codenerix_email/management/commands/email_test.py,sha256=SPsiq0s48sEX_G3piNHq-c1gDOH800H2zTvM19ei2LY,5605
-codenerix_email/management/commands/emails_recv.py,sha256=iksLQQKh-oXWBe5PAg16KsdjZQfdVFfO5y_sI4BBf84,36089
+codenerix_email/management/commands/emails_recv.py,sha256=C6DYD9WIT9vDDmSvxRf6Ms_SjoHMQYKZB49Bt7yr7cg,37354
 codenerix_email/management/commands/emails_send.py,sha256=scCFklro4WVMYm-1ataSjUMsPT-Ie5u_DdA55CQcTCQ,7944
 codenerix_email/management/commands/recv_emails.py,sha256=aXmhdXlamiNxRpMIDSKBXUBhkOcwi5l_Pme7jSQUCME,273
 codenerix_email/management/commands/send_emails.py,sha256=a1MnpvZKAEFdXNfmI5oFUkVxy4PZ1AjaJS6GH90zeD0,273
@@ -1690,8 +1689,8 @@ codenerix_email/migrations/__pycache__/__init__.cpython-35.pyc,sha256=2g70xiMW6o
 codenerix_email/migrations/__pycache__/__init__.cpython-39.pyc,sha256=qNj2NH0YvoWPnCKxkVZPsEFsbM05y7t1njMskNISdVQ,168
 codenerix_email/static/codenerix_email/emailmessages_rows.html,sha256=cA2ru5ti9WnPhhvFNEpI2tTR7gZzUYXWdzngRKU6a7k,2196
 codenerix_email/static/codenerix_email/emailreceiveds_rows.html,sha256=u9DXVdzKhx9WlJgcK_cT2DfGp9bGIKTBn3LDQplB4g4,2032
-django_codenerix_email-4.0.40.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
-django_codenerix_email-4.0.40.dist-info/METADATA,sha256=n1dhoEWbAVnuKJfC3Xy9uyoITL0owxv6hKaRLeRQEB8,2676
-django_codenerix_email-4.0.40.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-django_codenerix_email-4.0.40.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
-django_codenerix_email-4.0.40.dist-info/RECORD,,
+django_codenerix_email-4.0.42.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
+django_codenerix_email-4.0.42.dist-info/METADATA,sha256=eATIXaTRThHDlWhFC90e3Ungre5mgBrglNznAm4rxhc,2676
+django_codenerix_email-4.0.42.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+django_codenerix_email-4.0.42.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
+django_codenerix_email-4.0.42.dist-info/RECORD,,