Fixed issue with attachments storage dir.

see #196

Author: tonioo

README.rst

@@ -1,7 +1,7 @@
 modoboa-webmail
 ===============
 
-|travis| |codecov| |landscape| |rtfd|
+|gha| |codecov| |rtfd|
 
 The webmail of Modoboa.
 
@@ -38,12 +38,8 @@ Run the following commands to setup the database tables and collect static files
 Finally, restart the python process running modoboa (uwsgi, gunicorn,
 apache, whatever).
 
-.. |travis| image:: https://travis-ci.org/modoboa/modoboa-webmail.svg?branch=master
-   :target: https://travis-ci.org/modoboa/modoboa-webmail
-
-.. |landscape| image:: https://landscape.io/github/modoboa/modoboa-webmail/master/landscape.svg?style=flat
-   :target: https://landscape.io/github/modoboa/modoboa-webmail/master
-   :alt: Code Health
+.. |gha| image:: https://github.com/modoboa/modoboa-webmail/actions/workflows/plugin.yml/badge.svg
+   :target: https://github.com/modoboa/modoboa-webmail/actions/workflows/plugin.yml
 
 .. |codecov| image:: https://codecov.io/gh/modoboa/modoboa-webmail/branch/master/graph/badge.svg
    :target: https://codecov.io/gh/modoboa/modoboa-webmail

modoboa_webmail/constants.py

@@ -1,5 +1,8 @@
 """Webmail constants."""
 
+import os
+
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -9,3 +12,5 @@
     ("size", _("Size")),
     ("subject", _("Subject")),
 ]
+
+WEBMAIL_STORAGE_DIR = os.path.join(settings.MEDIA_ROOT, "webmail")

modoboa_webmail/lib/attachments.py

@@ -1,17 +1,18 @@
 from email import encoders
 from email.mime.base import MIMEBase
 import os
+import uuid
 
 import six
 
-from django.conf import settings
 from django.core.files.uploadhandler import FileUploadHandler, SkipFile
 from django.utils.encoding import smart_bytes
 
 from modoboa.lib.exceptions import InternalError
 from modoboa.lib.web_utils import size2integer
 from modoboa.parameters import tools as param_tools
 
+from .. import constants
 from .rfc6266 import build_header
 
 
@@ -25,7 +26,6 @@ def set_compose_session(request):
     :param request: a Request object.
     :return: the new unique ID.
     """
-    import uuid
     randid = str(uuid.uuid4()).replace("-", "")
     request.session["compose_mail"] = {"id": randid, "attachments": []}
     return randid
@@ -43,9 +43,9 @@ def save_attachment(f):
     """
     from tempfile import NamedTemporaryFile
 
-    dstdir = os.path.join(settings.MEDIA_ROOT, "webmail")
     try:
-        fp = NamedTemporaryFile(dir=dstdir, delete=False)
+        fp = NamedTemporaryFile(
+            dir=constants.WEBMAIL_STORAGE_DIR, delete=False)
     except Exception as e:
         raise InternalError(str(e))
     if isinstance(f, (six.binary_type, six.text_type)):
@@ -64,8 +64,7 @@ def clean_attachments(attlist):
                     following information : (random name, real name).
     """
     for att in attlist:
-        fullpath = os.path.join(
-            settings.MEDIA_ROOT, "modoboa_webmail", att["tmpname"])
+        fullpath = os.path.join(constants.WEBMAIL_STORAGE_DIR, att["tmpname"])
         try:
             os.remove(fullpath)
         except OSError:
@@ -88,9 +87,8 @@ def create_mail_attachment(attdef, payload=None):
         return None
     res = MIMEBase(maintype, subtype)
     if payload is None:
-        with open(os.path.join(
-                settings.MEDIA_ROOT, "modoboa_webmail", attdef["tmpname"]),
-                  "rb") as fp:
+        path = os.path.join(constants.WEBMAIL_STORAGE_DIR, attdef["tmpname"])
+        with open(path, "rb") as fp:
             res.set_payload(fp.read())
     else:
         res.set_payload(payload)

modoboa_webmail/lib/imapemail.py

@@ -20,6 +20,7 @@
 from modoboa.lib import u2u_decode
 from modoboa.lib.email_utils import Email, EmailAddress
 
+from .. import constants
 from . import imapheader
 from .imaputils import (
     get_imapconnector, BodyStructure
@@ -213,9 +214,13 @@ def _fetch_inlines(self):
         for cid, params in list(self.bs.inlines.items()):
             if re.search(r"\.\.", cid):
                 continue
-            fname = "modoboa_webmail/%s_%s" % (self.mailid, cid)
-            path = os.path.join(settings.MEDIA_ROOT, fname)
-            params["fname"] = os.path.join(settings.MEDIA_URL, fname)
+            fname = "{}_{}".format(self.mailid, cid)
+            path = os.path.join(constants.WEBMAIL_STORAGE_DIR, fname)
+            params["fname"] = os.path.join(
+                settings.MEDIA_URL,
+                os.path.basename(constants.WEBMAIL_STORAGE_DIR),
+                fname
+            )
             if default_storage.exists(path):
                 continue
             pdef, content = self.imapc.fetchpart(

modoboa_webmail/lib/sendmail.py

@@ -1,10 +1,11 @@
+import smtplib
+
 from django.core import mail
 from django.template.loader import render_to_string
 
 from modoboa.lib.cryptutils import get_password
 from modoboa.parameters import tools as param_tools
 
-from ..exceptions import WebmailInternalError
 from . import get_imapconnector, clean_attachments
 
 
@@ -48,8 +49,12 @@ def send_mail(request, form, posturl=None):
         with mail.get_connection(**options) as connection:
             msg.connection = connection
             msg.send()
-    except Exception as inst:
-        raise WebmailInternalError(str(inst))
+    except smtplib.SMTPResponseException as inst:
+        return False, {"status": "ko", "error": inst.smtp_error}
+    except smtplib.SMTPRecipientsRefused as inst:
+        error = ", ".join(["{}: {}".format(rcpt, error)
+                           for rcpt, error in inst.recipients.items()])
+        return False, {"status": "ko", "error": error}
 
     # Copy message to sent folder
     sentfolder = request.user.parameters.get_value("sent_folder")

setup.py

@@ -43,6 +43,11 @@ def get_requirements(requirements_file):
     with io.open(path.join(HERE, "README.rst"), encoding="utf-8") as readme:
         LONG_DESCRIPTION = readme.read()
 
+    def local_scheme(version):
+        """Skip the local version (eg. +xyz of 0.6.1.dev4+gdf99fe2)
+            to be able to upload to Test PyPI"""
+        return ""
+
     setup(
         name="modoboa-webmail",
         description="The webmail of Modoboa",
@@ -62,6 +67,7 @@ def get_requirements(requirements_file):
             "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
+            "Programming Language :: Python :: 3.8",
             "Topic :: Communications :: Email",
             "Topic :: Internet :: WWW/HTTP",
         ],
@@ -70,6 +76,6 @@ def get_requirements(requirements_file):
         include_package_data=True,
         zip_safe=False,
         install_requires=INSTALL_REQUIRES,
-        use_scm_version=True,
+        use_scm_version={"local_scheme": local_scheme},
         setup_requires=["setuptools_scm"],
     )