6b1afc3ae3
Fix the following test failures: FAIL: TestMessageInfoHandledError (0.00s) parse_test.go:53: could not parse envelope: date parsing failed: unrecognized date format: FAIL: TestReader (0.07s) gpg_test.go:27: using GNUPGHOME = /tmp/TestReader2384941142/001 reader_test.go:108: Test case: Invalid Signature reader_test.go:112: gpg.Read() = gpgmail: failed to read PGP message: gpg: failed to run verification: exit status 1 Fixes:5ca6022d00("lint: ensure errors are at least logged (errcheck)") Fixes:70bfcfef42("lint: work nicely with wrapped errors (errorlint)") Signed-off-by: Robin Jarry <robin@jarry.cc> Signed-off-by: Moritz Poldrack <moritz@poldrack.dev>
40 lines
900 B
Go
40 lines
900 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: %w. check public key(s)", err)
|
|
}
|
|
var buf bytes.Buffer
|
|
_, _ = io.Copy(&buf, md.Body)
|
|
|
|
return buf.Bytes(), nil
|
|
}
|