diff options
| author | Tim Culverhouse <tim@timculverhouse.com> | 2022-04-25 08:30:44 -0500 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2022-04-27 09:46:25 +0200 |
| commit | 57699b1fa6367a42d5877afcfdb1504e52835ed9 (patch) | |
| tree | b5000bfad3d62f01127f5831d64d27aac07872e1 /widgets | |
| parent | d09636ee0b9957ed60fc01224ddfbb03c4f4b7fa (diff) | |
| download | aerc-57699b1fa6367a42d5877afcfdb1504e52835ed9.tar.gz | |
feat: add gpg integration
This commit adds gpg system integration. This is done through two new
packages: gpgbin, which handles the system calls and parsing; and gpg
which is mostly a copy of emersion/go-pgpmail with modifications to
interface with package gpgbin. gpg includes tests for many cases, and
by it's nature also tests package gpgbin. I separated these in case an
external dependency is ever used for the gpg sys-calls/parsing (IE we
mirror how go-pgpmail+openpgp currently are dependencies)
Two new config options are introduced:
* pgp-provider. If it is not explicitly set to "gpg", aerc will default to
it's internal pgp provider
* pgp-key-id: (Optionally) specify a key by short or long keyId
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Koni Marti <koni.marti@gmail.com>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/compose.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/widgets/compose.go b/widgets/compose.go index 6298be3a..13c56a59 100644 --- a/widgets/compose.go +++ b/widgets/compose.go @@ -452,14 +452,16 @@ func (c *Composer) WriteMessage(header *mail.Header, writer io.Writer) error { var cleartext io.WriteCloser var err error - var signerEmail string + signer := "" if c.sign { - signerEmail, err = getSenderEmail(c) - if err != nil { - return err + if c.acctConfig.PgpKeyId != "" { + signer = c.acctConfig.PgpKeyId + } else { + signer, err = getSenderEmail(c) + if err != nil { + return err + } } - } else { - signerEmail = "" } if c.encrypt { @@ -467,12 +469,12 @@ func (c *Composer) WriteMessage(header *mail.Header, writer io.Writer) error { if err != nil { return err } - cleartext, err = c.aerc.Crypto.Encrypt(&buf, rcpts, signerEmail, c.aerc.DecryptKeys, header) + cleartext, err = c.aerc.Crypto.Encrypt(&buf, rcpts, signer, c.aerc.DecryptKeys, header) if err != nil { return err } } else { - cleartext, err = c.aerc.Crypto.Sign(&buf, signerEmail, c.aerc.DecryptKeys, header) + cleartext, err = c.aerc.Crypto.Sign(&buf, signer, c.aerc.DecryptKeys, header) if err != nil { return err } |