- Archive the original message on delivery and on release, never when held or rejected - Log archive failures instead of blocking delivery - Add List-Unsubscribe per recipient: signed one-click URL and the +leave address - Add signed unsubscribe tokens bound to their purpose - Fix the mailto unsubscribe address, +unsubscribe was not a known command
58 lines
1.4 KiB
Go
58 lines
1.4 KiB
Go
package router
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
"net/mail"
|
|
|
|
"github.com/emersion/go-message/textproto"
|
|
|
|
"codeberg.org/squidd/parsimony/internal/store"
|
|
)
|
|
|
|
// rewrite adds the list headers shared by every recipient and rewrites From so DMARC alignment holds.
|
|
// The body is copied byte for byte.
|
|
func rewrite(l store.List, data []byte) ([]byte, error) {
|
|
br := bufio.NewReader(bytes.NewReader(data))
|
|
h, err := textproto.ReadHeader(br)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parse header: %w", err)
|
|
}
|
|
|
|
// Never trust list headers coming from outside.
|
|
for _, k := range []string{"List-Id", "List-Post", "List-Unsubscribe", "List-Unsubscribe-Post", "Precedence"} {
|
|
h.Del(k)
|
|
}
|
|
|
|
id := l.Name + "." + l.Domain
|
|
h.Set("List-Id", fmt.Sprintf("%s <%s>", l.Title, id))
|
|
h.Set("List-Post", "<mailto:"+l.Address()+">")
|
|
// List-Unsubscribe is per recipient: Router.Send adds it.
|
|
h.Set("Precedence", "list")
|
|
|
|
if orig := h.Get("From"); orig != "" {
|
|
name := orig
|
|
if a, err := mail.ParseAddress(orig); err == nil {
|
|
name = a.Name
|
|
if name == "" {
|
|
name = a.Address
|
|
}
|
|
}
|
|
if h.Get("Reply-To") == "" {
|
|
h.Set("Reply-To", orig)
|
|
}
|
|
from := mail.Address{Name: name + " via " + l.Title, Address: l.Address()}
|
|
h.Set("From", from.String())
|
|
}
|
|
|
|
var out bytes.Buffer
|
|
if err := textproto.WriteHeader(&out, h); err != nil {
|
|
return nil, err
|
|
}
|
|
if _, err := io.Copy(&out, br); err != nil {
|
|
return nil, err
|
|
}
|
|
return out.Bytes(), nil
|
|
}
|