holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-21 15:33:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable email attachment processing and email saving if attachments are not enabled.

Browse Source 
Caution: untested
This commit is contained in:
Georg Lehner 2024-06-06 15:58:27 +02:00
parent dd4c04945a
commit cc1b125d53
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
helpdesk/email.py
View File

@ -595,16 +595,17 @@ def create_object_from_email_message(message, ticket_id, payload, files, logger)
logger.info("[%s-%s] %s" % (ticket.queue.slug, ticket.id, ticket.title,)) logger.info("[%s-%s] %s" % (ticket.queue.slug, ticket.id, ticket.title,))
try: if helpdesk.settings.HELPDESK_ENABLE_ATTACHMENTS:
attached = process_attachments(f, files) try:
except ValidationError as e: attached = process_attachments(f, files)
logger.error(str(e)) except ValidationError as e:
else: logger.error(str(e))
for att_file in attached: else:
logger.info( for att_file in attached:
"Attachment '%s' (with size %s) successfully added to ticket from email.", logger.info(
att_file[0], att_file[1].size "Attachment '%s' (with size %s) successfully added to ticket from email.",
) att_file[0], att_file[1].size
)
context = safe_template_context(ticket) context = safe_template_context(ticket)
@ -984,7 +985,7 @@ def extract_email_metadata(message: str,
filtered_body, full_body = extract_email_message_content(message_obj, files, include_chained_msgs) filtered_body, full_body = extract_email_message_content(message_obj, files, include_chained_msgs)
# If the base part is not a multipart then it will have already been processed as the vbody content so # If the base part is not a multipart then it will have already been processed as the vbody content so
# no need to process attachments # no need to process attachments
if "multipart" == message_obj.get_content_maintype(): if "multipart" == message_obj.get_content_maintype() and helpdesk.settings.HELPDESK_ENABLE_ATTACHMENTS:
# Find and attach all other parts or part contents as attachments # Find and attach all other parts or part contents as attachments
counter, content_parts_excluded = extract_attachments(message_obj, files, logger) counter, content_parts_excluded = extract_attachments(message_obj, files, logger)
if not content_parts_excluded: if not content_parts_excluded:
@ -994,7 +995,8 @@ def extract_email_metadata(message: str,
Verify that there were no text/* parts containing message content.") Verify that there were no text/* parts containing message content.")
if logger.isEnabledFor(logging.DEBUG): if logger.isEnabledFor(logging.DEBUG):
logger.debug("Email parsed and %s attachments were found and attached.", counter) logger.debug("Email parsed and %s attachments were found and attached.", counter)
add_file_if_always_save_incoming_email_message(files, message) if helpdesk.settings.HELPDESK_ENABLE_ATTACHMENTS:
add_file_if_always_save_incoming_email_message(files, message)
smtp_priority = message_obj.get('priority', '') smtp_priority = message_obj.get('priority', '')
smtp_importance = message_obj.get('importance', '') smtp_importance = message_obj.get('importance', '')