From 65332c233880c9609ea39af22ee677e98f4cba1b Mon Sep 17 00:00:00 2001 From: Vitaly Ovchinnikov Date: Wed, 3 Apr 2024 12:25:05 +0000 Subject: send: prevent sending if multipart conversion failed Given the following configuration: binds.conf: [compose::review] y = :multipart text/html:send aerc.conf: [multipart-converters] text/html = /path/to/some/script.sh /path/to/some/script.sh: #!/bin/sh exit 10 # falls for some reason When you press `y` aerc runs `:multipart` command and although it gets an error from the converter script, the error is ignored and then the `:send` command actually sends a broken message. Add ConversionError field to Composer.Part to track multipart conversion errors. Check for conversion errors in :send, block sending if the errors are found. There is no way to skip this like missing attachment or empty subject. This is done intentionally. The user needs to update or delete the problematic part before actually sending a message. Signed-off-by: Vitaly Ovchinnikov Acked-by: Robin Jarry --- lib/attachment.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/attachment.go b/lib/attachment.go index aa3cd108..6f29da55 100644 --- a/lib/attachment.go +++ b/lib/attachment.go @@ -16,9 +16,10 @@ import ( ) type Part struct { - MimeType string - Params map[string]string - Data []byte + MimeType string + Params map[string]string + Data []byte + ConversionError error } func NewPart(mimetype string, params map[string]string, body io.Reader, -- cgit