6a10123f4a
Add error handling for messages that were unable to be encrypted. Previously, messages that failed encryption would be sent with no content. This patch adds error handling - when encryption fails, the user is returned to the Review screen and instructed to check the public keys for their recipients. Reported-by: Moritz Poldrack <moritz@poldrack.dev> Signed-off-by: Tim Culverhouse <tim@timculverhouse.com> Acked-by: Moritz Poldrack <moritz@poldrack.dev>
40 lines
888 B
Go
40 lines
888 B
Go
package gpgbin
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
|
|
"git.sr.ht/~rjarry/aerc/models"
|
|
)
|
|
|
|
// Encrypt runs gpg --encrypt [--sign] -r [recipient]. The default is to have
|
|
// --trust-model always set
|
|
func Encrypt(r io.Reader, to []string, from string) ([]byte, error) {
|
|
//TODO probably shouldn't have --trust-model always a default
|
|
args := []string{
|
|
"--armor",
|
|
"--trust-model", "always",
|
|
}
|
|
if from != "" {
|
|
args = append(args, "--sign", "--default-key", from)
|
|
}
|
|
for _, rcpt := range to {
|
|
args = append(args, "--recipient", rcpt)
|
|
}
|
|
args = append(args, "--encrypt", "-")
|
|
|
|
g := newGpg(r, args)
|
|
g.cmd.Run()
|
|
outRdr := bytes.NewReader(g.stdout.Bytes())
|
|
var md models.MessageDetails
|
|
err := parse(outRdr, &md)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("gpg: failure to encrypt: %v. check public key(s)", err)
|
|
}
|
|
var buf bytes.Buffer
|
|
io.Copy(&buf, md.Body)
|
|
|
|
return buf.Bytes(), nil
|
|
}
|