aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/accounts.go18
-rw-r--r--doc/aerc-accounts.5.scd24
-rw-r--r--worker/imap/cache.go9
-rw-r--r--worker/imap/configure.go2
-rw-r--r--worker/imap/fetch.go16
-rw-r--r--worker/imap/worker.go2
-rw-r--r--worker/lib/parse.go24
-rw-r--r--worker/maildir/worker.go10
-rw-r--r--worker/mbox/worker.go12
-rw-r--r--worker/notmuch/worker.go10
10 files changed, 122 insertions, 5 deletions
diff --git a/config/accounts.go b/config/accounts.go
index 57ae2e66..eec6ca44 100644
--- a/config/accounts.go
+++ b/config/accounts.go
@@ -82,6 +82,8 @@ type AccountConfig struct {
Source string `ini:"source" parse:"ParseSource"`
Folders []string `ini:"folders" delim:","`
FoldersExclude []string `ini:"folders-exclude" delim:","`
+ Headers []string `ini:"headers" delim:","`
+ HeadersExclude []string `ini:"headers-exclude" delim:","`
Outgoing RemoteConfig `ini:"outgoing" parse:"ParseOutgoing"`
SignatureFile string `ini:"signature-file"`
SignatureCmd string `ini:"signature-cmd"`
@@ -182,6 +184,22 @@ If you want to disable STARTTLS, append +insecure to the schema.
if account.From == nil {
return fmt.Errorf("Expected from for account %s", _sec)
}
+ if len(account.Headers) > 0 {
+ defaults := []string{
+ "date",
+ "subject",
+ "from",
+ "sender",
+ "reply-to",
+ "to",
+ "cc",
+ "bcc",
+ "in-reply-to",
+ "message-id",
+ "references",
+ }
+ account.Headers = append(account.Headers, defaults...)
+ }
log.Debugf("accounts.conf: [%s] from = %s", account.Name, account.From)
Accounts = append(Accounts, &account)
diff --git a/doc/aerc-accounts.5.scd b/doc/aerc-accounts.5.scd
index fdf10b76..8fa48647 100644
--- a/doc/aerc-accounts.5.scd
+++ b/doc/aerc-accounts.5.scd
@@ -88,6 +88,30 @@ Note that many of these configuration options are written for you, such as
use *aerc-sendmail*(5) in combination with *msmtp*(1) and
*--read-envelope-from*.
+*headers* = _<header1,header2,header3...>_
+ Specifies the comma separated list of headers to fetch with the message.
+
+ By default, all headers are fetched. If any headers are specified in this
+ list, aerc will append it to the following list of required headers:
+
+ - date
+ - subject
+ - from
+ - sender
+ - reply-to
+ - to
+ - cc
+ - bcc
+ - in-reply-to
+ - message-id
+ - references
+
+*headers-exclude* = _<header1,header2,header3...>_
+ Specifies the comma separated list of headers to exclude from fetching.
+ Note that this overrides anything from *headers*.
+
+ By default, no headers are excluded.
+
*outgoing* = _<uri>_
Specifies the transport for sending outgoing emails on this account. It
should be a connection string, and the specific meaning of each component
diff --git a/worker/imap/cache.go b/worker/imap/cache.go
index a02f2cae..cf372154 100644
--- a/worker/imap/cache.go
+++ b/worker/imap/cache.go
@@ -8,6 +8,7 @@ import (
"fmt"
"os"
"path"
+ "strings"
"time"
"git.sr.ht/~rjarry/aerc/lib/parse"
@@ -42,6 +43,14 @@ var (
// initCacheDb opens (or creates) the database for the cache. One database is
// created per account
func (w *IMAPWorker) initCacheDb(acct string) {
+ switch {
+ case len(w.config.headersExclude) > 0:
+ headerTag := strings.Join(w.config.headersExclude, "")
+ cacheTag = append(cacheTag, headerTag...)
+ case len(w.config.headers) > 0:
+ headerTag := strings.Join(w.config.headers, "")
+ cacheTag = append(cacheTag, headerTag...)
+ }
cd, err := cacheDir()
if err != nil {
w.cache = nil
diff --git a/worker/imap/configure.go b/worker/imap/configure.go
index a9689f68..1581794f 100644
--- a/worker/imap/configure.go
+++ b/worker/imap/configure.go
@@ -60,6 +60,8 @@ func (w *IMAPWorker) handleConfigure(msg *types.Configure) error {
w.config.user = u.User
w.config.folders = msg.Config.Folders
+ w.config.headers = msg.Config.Headers
+ w.config.headersExclude = msg.Config.HeadersExclude
w.config.idle_timeout = 10 * time.Second
w.config.idle_debounce = 10 * time.Millisecond
diff --git a/worker/imap/fetch.go b/worker/imap/fetch.go
index f209d7f0..8189e6aa 100644
--- a/worker/imap/fetch.go
+++ b/worker/imap/fetch.go
@@ -29,11 +29,19 @@ func (imapw *IMAPWorker) handleFetchMessageHeaders(
return
}
log.Tracef("Fetching message headers: %v", toFetch)
+ hdrBodyPart := imap.BodyPartName{
+ Specifier: imap.HeaderSpecifier,
+ }
+ switch {
+ case len(imapw.config.headersExclude) > 0:
+ hdrBodyPart.NotFields = true
+ hdrBodyPart.Fields = imapw.config.headersExclude
+ case len(imapw.config.headers) > 0:
+ hdrBodyPart.Fields = imapw.config.headers
+ }
section := &imap.BodySectionName{
- BodyPartName: imap.BodyPartName{
- Specifier: imap.HeaderSpecifier,
- },
- Peek: true,
+ BodyPartName: hdrBodyPart,
+ Peek: true,
}
items := []imap.FetchItem{
diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index f9a722e6..f46f39d6 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -43,6 +43,8 @@ type imapConfig struct {
insecure bool
addr string
user *url.Userinfo
+ headers []string
+ headersExclude []string
folders []string
oauthBearer lib.OAuthBearer
xoauth2 lib.Xoauth2
diff --git a/worker/lib/parse.go b/worker/lib/parse.go
index ac86292f..2baf13f7 100644
--- a/worker/lib/parse.go
+++ b/worker/lib/parse.go
@@ -310,6 +310,30 @@ func MessageInfo(raw RawMessage) (*models.MessageInfo, error) {
}, nil
}
+// LimitHeaders returns a new Header with the specified headers included or
+// excluded
+func LimitHeaders(hdr *mail.Header, fields []string, exclude bool) {
+ fieldMap := make(map[string]struct{}, len(fields))
+ for _, f := range fields {
+ fieldMap[strings.ToLower(f)] = struct{}{}
+ }
+ curFields := hdr.Fields()
+ for curFields.Next() {
+ key := strings.ToLower(curFields.Key())
+ _, ok := fieldMap[key]
+ switch {
+ case exclude && ok:
+ curFields.Del()
+ case exclude && !ok:
+ // No-op: exclude but we didn't find it
+ case !exclude && ok:
+ // No-op: include and we found it
+ case !exclude && !ok:
+ curFields.Del()
+ }
+ }
+}
+
// MessageHeaders populates a models.MessageInfo struct for the message.
// based on the reader returned by NewReader. Minimal information is included.
// There is no body structure or RFC822Headers set
diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go
index b222aab8..c45992eb 100644
--- a/worker/maildir/worker.go
+++ b/worker/maildir/worker.go
@@ -47,6 +47,8 @@ type Worker struct {
currentSortCriteria []*types.SortCriterion
maildirpp bool // whether to use Maildir++ directory layout
capabilities *models.Capabilities
+ headers []string
+ headersExclude []string
}
// NewWorker creates a new maildir worker with the provided worker.
@@ -349,6 +351,8 @@ func (w *Worker) handleConfigure(msg *types.Configure) error {
if err != nil {
return err
}
+ w.headers = msg.Config.Headers
+ w.headersExclude = msg.Config.HeadersExclude
log.Debugf("configured base maildir: %s", dir)
return nil
}
@@ -620,6 +624,12 @@ func (w *Worker) handleFetchMessageHeaders(
w.worker.PostMessageInfoError(msg, uid, err)
continue
}
+ switch {
+ case len(w.headersExclude) > 0:
+ lib.LimitHeaders(info.RFC822Headers, w.headersExclude, true)
+ case len(w.headers) > 0:
+ lib.LimitHeaders(info.RFC822Headers, w.headers, false)
+ }
w.worker.PostMessage(&types.MessageInfo{
Message: types.RespondTo(msg),
Info: info,
diff --git a/worker/mbox/worker.go b/worker/mbox/worker.go
index 47713048..7a746cf0 100644
--- a/worker/mbox/worker.go
+++ b/worker/mbox/worker.go
@@ -30,7 +30,9 @@ type mboxWorker struct {
folder *container
worker *types.Worker
- capabilities *models.Capabilities
+ capabilities *models.Capabilities
+ headers []string
+ headersExclude []string
}
func NewWorker(worker *types.Worker) (types.Backend, error) {
@@ -68,6 +70,8 @@ func (w *mboxWorker) handleMessage(msg types.WorkerMessage) error {
} else {
dir = filepath.Join(u.Host, u.Path)
}
+ w.headers = msg.Config.Headers
+ w.headersExclude = msg.Config.HeadersExclude
w.data, err = createMailboxContainer(dir)
if err != nil || w.data == nil {
w.data = &mailboxContainer{
@@ -161,6 +165,12 @@ func (w *mboxWorker) handleMessage(msg types.WorkerMessage) error {
w.worker.PostMessageInfoError(msg, uid, err)
break
} else {
+ switch {
+ case len(w.headersExclude) > 0:
+ lib.LimitHeaders(msgInfo.RFC822Headers, w.headersExclude, true)
+ case len(w.headers) > 0:
+ lib.LimitHeaders(msgInfo.RFC822Headers, w.headers, false)
+ }
w.worker.PostMessage(&types.MessageInfo{
Message: types.RespondTo(msg),
Info: msgInfo,
diff --git a/worker/notmuch/worker.go b/worker/notmuch/worker.go
index d5c012ad..a7bab688 100644
--- a/worker/notmuch/worker.go
+++ b/worker/notmuch/worker.go
@@ -49,6 +49,8 @@ type worker struct {
watcher types.FSWatcher
watcherDebounce *time.Timer
capabilities *models.Capabilities
+ headers []string
+ headersExclude []string
}
// NewWorker creates a new notmuch worker with the provided worker.
@@ -223,6 +225,8 @@ func (w *worker) handleConfigure(msg *types.Configure) error {
}
w.store = store
}
+ w.headers = msg.Config.Headers
+ w.headersExclude = msg.Config.HeadersExclude
return nil
}
@@ -676,6 +680,12 @@ func (w *worker) emitMessageInfo(m *Message,
if err != nil {
return fmt.Errorf("could not get MessageInfo: %w", err)
}
+ switch {
+ case len(w.headersExclude) > 0:
+ lib.LimitHeaders(info.RFC822Headers, w.headersExclude, true)
+ case len(w.headers) > 0:
+ lib.LimitHeaders(info.RFC822Headers, w.headers, false)
+ }
w.w.PostMessage(&types.MessageInfo{
Message: types.RespondTo(parent),
Info: info,
generated by cgit (git 2.34.1) at 2024-11-16 19:09:22 +0000