From 4c474efb3dd07785d6375b27cf1bff101088a46f Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 6 Mar 2020 18:19:03 +0100 Subject: [PATCH] plugin attachment: remove "path" from attachment once used: "path" refers to a local path of a file, we don't want to store it in database as the file may be in a temporary location, or even be a temporary file. So once the file has been uploaded, we remove it. --- sat/plugins/plugin_misc_attach.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sat/plugins/plugin_misc_attach.py b/sat/plugins/plugin_misc_attach.py index 8314e695..7512bfc4 100644 --- a/sat/plugins/plugin_misc_attach.py +++ b/sat/plugins/plugin_misc_attach.py @@ -59,15 +59,19 @@ class AttachPlugin: for attachment in attachments: try: - path = Path(attachment["path"]) + # we pop path because we don't want it to be stored, as the image can be + # only in a temporary location + path = Path(attachment.pop("path")) except KeyError: log.warning("no path in attachment: {attachment}") to_delete.append(attachment) continue if "url" in attachment: - log.warning("invalid attachment: unknown URL") - to_delete.append(attachment) + url = attachment.pop('url') + log.warning( + f"unexpected URL in attachment: {url!r}\nattachment: {attachment}" + ) try: name = attachment["name"]