This is the main dovel repository, it has the Go code to run dovel SMTP server.
Author: brian (git@myr.sh)
Date: Mon Sep 18 18:31:06 2023 -0300
Parent: 8b90660
Changed wkd to external library
commit 9ca774960fc4527d10a0e1ddaafc04f4fb8ae473
Author: brian <git@myr.sh>
Date: Mon Sep 18 18:31:06 2023 -0300
Changed wkd to external library
diff --git a/cmd/dovel/backend.go b/cmd/dovel/backend.go
index 754a898..6898fc6 100644
--- a/cmd/dovel/backend.go
+++ b/cmd/dovel/backend.go
@@ -1,7 +1,6 @@
package main
import (
- "bufio"
"bytes"
"crypto/rsa"
"crypto/x509"
@@ -11,16 +10,15 @@ import (
"log/slog"
"net"
"net/mail"
- "net/textproto"
"os"
"os/exec"
"path"
"strings"
"time"
- "git.derelict.garden/dovel/email/wkd"
- "github.com/ProtonMail/gopenpgp/v2/helper"
+ "golang.org/x/crypto/openpgp"
"github.com/emersion/go-mbox"
+ "github.com/emersion/go-openpgp-wkd"
"github.com/emersion/go-msgauth/dkim"
"github.com/emersion/go-smtp"
)
@@ -76,6 +74,11 @@ func (s *Session) Data(raw io.Reader) error {
return err
}
+ tos, err := mail.ParseAddressList(strings.Join(s.tos, ","))
+ if err != nil {
+ return err
+ }
+
// sending email
dom := strings.Split(s.from, "@")[1]
if dom == cfg.Domain {
@@ -83,7 +86,7 @@ func (s *Session) Data(raw io.Reader) error {
if s.user == "" {
return smtp.ErrAuthRequired
}
- err = s.Send(s.from, s.tos, strings.NewReader(string(cont)))
+ err = s.Send(s.from, tos, strings.NewReader(string(cont)))
if err != nil {
slog.Error("send error", "msg", err.Error())
return err
@@ -110,13 +113,8 @@ func (s *Session) Data(raw io.Reader) error {
}
// receiving email
- for _, to := range s.tos {
- toAddr, err := mail.ParseAddress(to)
- if err != nil {
- slog.Error("parse to", err.Error())
- return err
- }
- domain := strings.Split(toAddr.Address, "@")[1]
+ for _, to := range tos {
+ domain := strings.Split(to.Address, "@")[1]
h := path.Join(configPath, "hooks", "receive-"+domain)
if f, err := os.Lstat(h); err != nil {
@@ -149,7 +147,7 @@ func (s *Session) Logout() error {
}
// TODO: remove pgp logic, move to client packages
-func (s *Session) Send(from string, tos []string, raw io.Reader) error {
+func (s *Session) Send(from string, tos []*mail.Address, raw io.Reader) error {
email, err := mail.ReadMessage(raw)
if err != nil {
return err
@@ -161,16 +159,16 @@ func (s *Session) Send(from string, tos []string, raw io.Reader) error {
}
fromdom := strings.Split(from, "@")
- body, err := io.ReadAll(email.Body)
+ content, err := io.ReadAll(email.Body)
if err != nil {
return err
}
for _, to := range tos {
slog.Debug("sending email", "to", to)
- msg := string(body)
+ body := content
// dns mx for email
- addr := strings.Split(to, "@")
+ addr := strings.Split(to.Address, "@")
mxs, err := net.LookupMX(addr[1])
if err != nil {
return err
@@ -179,25 +177,31 @@ func (s *Session) Send(from string, tos []string, raw io.Reader) error {
return err
}
- // TODO: use package from emersion
slog.Debug("checking wkd key")
- key, _ := wkd.FetchPGPKey(addr[0], addr[1])
- if key != "" {
+ key, _ := wkd.Discover(to.Address)
+ if key != nil {
slog.Debug("found wkd key")
- msg, err = helper.EncryptMessageArmored(key, msg)
+ enc := bytes.Buffer{}
+ c, err := openpgp.Encrypt(&enc, key, key[0], nil, nil)
if err != nil {
return err
}
+ c.Write(content)
+ c.Close()
email.Header["Content-Type"] = []string{"application/pgp-encrypted"}
+ body = enc.Bytes()
}
- payload := bytes.Buffer{}
- writer := textproto.NewWriter(bufio.NewWriter(&payload))
+ // write email headers into payload
+ var headers string
for k, v := range email.Header {
- writer.PrintfLine("%s: %s", k, strings.Join(v, ", "))
+ headers += fmt.Sprintf(
+ "%s: %s\r\n",
+ k, strings.Join(v, ", "),
+ )
}
- writer.PrintfLine("")
- payload.Write([]byte(msg))
+ headers += "\r\n"
+ body = append([]byte(headers), body...)
// dkim
slog.Debug("dkim check")
@@ -220,13 +224,18 @@ func (s *Session) Send(from string, tos []string, raw io.Reader) error {
Signer: privateKey.(*rsa.PrivateKey),
}
- err = dkim.Sign(&res, &payload, options)
+ err = dkim.Sign(&res, bytes.NewReader(body), options)
if err != nil {
slog.Error("failed to sign body", "err", err)
}
} else {
slog.Debug("no dkim key")
- io.Copy(&res, &payload)
+ io.Copy(&res, bytes.NewReader(body))
+ }
+
+ addrs := make([]string, len(tos))
+ for i, to := range tos {
+ addrs[i] = to.Address
}
server := mxs[0].Host + ":smtp"
@@ -235,7 +244,7 @@ func (s *Session) Send(from string, tos []string, raw io.Reader) error {
server,
nil,
from,
- tos,
+ addrs,
&res,
)
if err != nil {
commit 9ca774960fc4527d10a0e1ddaafc04f4fb8ae473
Author: brian <git@myr.sh>
Date: Mon Sep 18 18:31:06 2023 -0300
Changed wkd to external library
diff --git a/go.mod b/go.mod
index 8e77281..d438d94 100644
--- a/go.mod
+++ b/go.mod
@@ -19,6 +19,7 @@ require (
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/cloudflare/circl v1.3.2 // indirect
github.com/emersion/go-mbox v1.0.3 // indirect
+ github.com/emersion/go-openpgp-wkd v0.0.0-20200304100729-bbe7fac61be2 // indirect
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
commit 9ca774960fc4527d10a0e1ddaafc04f4fb8ae473
Author: brian <git@myr.sh>
Date: Mon Sep 18 18:31:06 2023 -0300
Changed wkd to external library
diff --git a/go.sum b/go.sum
index fdb9a9a..2e4a8f1 100644
--- a/go.sum
+++ b/go.sum
@@ -34,6 +34,8 @@ github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwd
github.com/emersion/go-milter v0.3.3/go.mod h1:ablHK0pbLB83kMFBznp/Rj8aV+Kc3jw8cxzzmCNLIOY=
github.com/emersion/go-msgauth v0.6.6 h1:buv5lL8v/3v4RpHnQFS2IPhE3nxSRX+AxnrEJbDbHhA=
github.com/emersion/go-msgauth v0.6.6/go.mod h1:A+/zaz9bzukLM6tRWRgJ3BdrBi+TFKTvQ3fGMFOI9SM=
+github.com/emersion/go-openpgp-wkd v0.0.0-20200304100729-bbe7fac61be2 h1:RRN+juF6u3H5xKIzP9lPXp9R96z+BiZ57b2MaQy/PoE=
+github.com/emersion/go-openpgp-wkd v0.0.0-20200304100729-bbe7fac61be2/go.mod h1:KijsmD9V/D4vgO0SOfKdDDUPSSsmMNL++XqmkEObKY0=
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
@@ -93,6 +95,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tv42/zbase32 v0.0.0-20190604154422-aacc64a8f915/go.mod h1:Y5DJgF9Eou+hSWetC39Mns8E0PU7DykCLNWiYeOINrE=
github.com/tv42/zbase32 v0.0.0-20220222190657-f76a9fc892fa h1:2EwhXkNkeMjX9iFYGWLPQLPhw9O58BhnYgtYKeqybcY=
github.com/tv42/zbase32 v0.0.0-20220222190657-f76a9fc892fa/go.mod h1:is48sjgBanWcA5CQrPBu9Y5yABY/T2awj/zI65bq704=
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
@@ -100,6 +103,7 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/arch v0.1.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
@@ -113,6 +117,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -127,6 +132,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
commit 9ca774960fc4527d10a0e1ddaafc04f4fb8ae473
Author: brian <git@myr.sh>
Date: Mon Sep 18 18:31:06 2023 -0300
Changed wkd to external library
diff --git a/wkd/wkd.go b/wkd/wkd.go
deleted file mode 100644
index 1a86698..0000000
--- a/wkd/wkd.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package wkd
-
-import (
- "crypto/sha1"
- "fmt"
- "net/http"
-
- pgp "github.com/ProtonMail/gopenpgp/v2/crypto"
- "github.com/tv42/zbase32"
-)
-
-const suffix = "/.well-known/openpgpkey/hu/"
-
-func FetchPGPKey(local, domain string) (string, error) {
- s := sha1.Sum([]byte(local))
- slug := zbase32.EncodeToString(s[:])
- res, err := http.Get("https://" + domain + suffix + slug)
- if err != nil {
- return "", err
- }
-
- if res.StatusCode > 399 {
- return "", fmt.Errorf("key not found")
- }
- defer res.Body.Close()
-
- key, err := pgp.NewKeyFromReader(res.Body)
- if err != nil {
- return "", err
- }
-
- return key.GetArmoredPublicKey()
-}