Improved 'empty attachment handling' when feature is disabled (#236)

Author: caronc

apprise_api/api/tests/test_attachment.py

@@ -28,7 +28,10 @@
 from unittest.mock import mock_open
 from ..utils import Attachment, HTTPAttachment
 from ..utils import parse_attachments
+from ..urlfilter import AppriseURLFilter
+from .. import utils
 from django.test.utils import override_settings
+from django.conf import settings
 from tempfile import TemporaryDirectory
 from shutil import rmtree
 import base64
@@ -92,8 +95,25 @@ def test_form_file_attachment_parsing(self):
         """
         Test the parsing of file attachments
         """
-        # Get ourselves a file to work with
+        # Variation tests without any data
+        result = parse_attachments(None, None)
+        assert isinstance(result, list)
+        assert len(result) == 0
+
+        result = parse_attachments([], [])
+        assert isinstance(result, list)
+        assert len(result) == 0
+
+        with override_settings(APPRISE_ATTACH_SIZE=0):
+            result = parse_attachments(None, None)
+            assert isinstance(result, list)
+            assert len(result) == 0
 
+            result = parse_attachments([], [])
+            assert isinstance(result, list)
+            assert len(result) == 0
+
+        # Get ourselves a file to work with
         files_request = {
             'file1': SimpleUploadedFile(
                 "attach.txt", b"content here", content_type="text/plain")
@@ -229,6 +249,20 @@ def test(*args, **kwargs):
         assert isinstance(result, list)
         assert len(result) == 3
 
+        with override_settings(APPRISE_ATTACH_DENY_URLS='*'):
+            utils.ATTACH_URL_FILTER = AppriseURLFilter(
+                settings.APPRISE_ATTACH_ALLOW_URLS,
+                settings.APPRISE_ATTACH_DENY_URLS)
+
+            # We will fail to parse our URL based attachment
+            with self.assertRaises(ValueError):
+                parse_attachments(attachment_payload, {})
+
+        # Reload our configuration to default values
+        utils.ATTACH_URL_FILTER = AppriseURLFilter(
+            settings.APPRISE_ATTACH_ALLOW_URLS,
+            settings.APPRISE_ATTACH_DENY_URLS)
+
         # Garbage handling (integer, float, object, etc is invalid)
         attachment_payload = 5
         result = parse_attachments(attachment_payload, {})

apprise_api/api/utils.py

@@ -257,6 +257,14 @@ def parse_attachments(attachment_payload, files_request):
     """
     attachments = []
 
+    if settings.APPRISE_ATTACH_SIZE <= 0:
+        if not (attachment_payload or files_request):
+            # No further processing required
+            return []
+
+        # Otherwise we need to raise an error
+        raise ValueError("Attachment support has been disabled")
+
     # Attachment Count
     count = sum([
         0 if not isinstance(attachment_payload, (set, tuple, list))
@@ -269,9 +277,6 @@ def parse_attachments(attachment_payload, files_request):
         attachment_payload = (attachment_payload, )
         count += 1
 
-    if settings.APPRISE_ATTACH_SIZE <= 0:
-        raise ValueError("Attachment support has been disabled")
-
     if settings.APPRISE_MAX_ATTACHMENTS > 0 and count > settings.APPRISE_MAX_ATTACHMENTS:
         raise ValueError(
             "There is a maximum of %d attachments" %