account data only; integrate smtp server; logging

smtp/server.go

@@ -1,23 +1,26 @@
 package smtp
 
 import (
-	"log"
-	"os"
+	"context"
 	"time"
 
 	"github.com/emersion/go-smtp"
-	"maunium.net/go/mautrix/id"
+	"github.com/getsentry/sentry-go"
+	"gitlab.com/etke.cc/go/logger"
 )
 
 type backend struct {
+	log    *logger.Logger
 	domain string
-	rooms  map[string]id.RoomID
+	client Client
 }
 
 func (b *backend) newSession() *session {
 	return &session{
+		ctx:    sentry.SetHubOnContext(context.Background(), sentry.CurrentHub().Clone()),
+		log:    b.log,
 		domain: b.domain,
-		rooms:  b.rooms,
+		client: b.client,
 	}
 }
 
@@ -29,22 +32,21 @@ func (b *backend) AnonymousLogin(state *smtp.ConnectionState) (smtp.Session, err
 	return b.newSession(), nil
 }
 
-func NewServer(domain string, mapping map[string]id.RoomID, port string) *smtp.Server {
+func Start(domain, port, loglevel string, client Client) error {
+	log := logger.New("smtp.", loglevel)
 	be := &backend{
+		log:    log,
 		domain: domain,
-		rooms:  mapping,
+		client: client,
 	}
 	s := smtp.NewServer(be)
 	s.Addr = ":" + port
 	s.Domain = domain
 	s.AuthDisabled = true
-	s.ReadTimeout = 360 * time.Second
-	s.WriteTimeout = 360 * time.Second
+	s.ReadTimeout = 10 * time.Second
+	s.WriteTimeout = 10 * time.Second
 	s.MaxMessageBytes = 63 * 1024
-	s.MaxRecipients = 50
-	s.Debug = os.Stdout
 
-	log.Println("Starting SMTP server")
-	log.Fatal(s.ListenAndServe())
-	return s
+	log.Info("Starting SMTP server on %s:%s", domain, port)
+	return s.ListenAndServe()
 }

smtp/session.go

@@ -1,43 +1,61 @@
 package smtp
 
 import (
+	"context"
 	"io"
-	"log"
 
 	"github.com/emersion/go-smtp"
-	"maunium.net/go/mautrix/id"
+	"github.com/getsentry/sentry-go"
+	"gitlab.com/etke.cc/go/logger"
 )
 
 type session struct {
+	log    *logger.Logger
 	domain string
-	rooms  map[string]id.RoomID
+	client Client
+
+	ctx  context.Context
+	to   string
+	from string
 }
 
 func (s *session) Mail(from string, opts smtp.MailOptions) error {
-	log.Println("mail from", from)
+	sentry.GetHubFromContext(s.ctx).Scope().SetTag("from", from)
+	s.from = from
+	s.log.Debug("mail from %s, options: %+v", from, opts)
 	return nil
 }
 
 func (s *session) Rcpt(to string) error {
-	_, ok := s.rooms[to]
+	sentry.GetHubFromContext(s.ctx).Scope().SetTag("to", to)
+	mappings, err := s.client.GetMappings(s.ctx)
+	if err != nil {
+		s.log.Error("cannot get mappings: %v", err)
+		return err
+	}
+	_, ok := mappings[to]
 	if !ok {
+		s.log.Debug("mapping for %s not found", to)
 		return smtp.ErrAuthRequired
 	}
 
 	if Domain(to) != s.domain {
+		s.log.Debug("wrong domain of %s", to)
 		return smtp.ErrAuthRequired
 	}
-	log.Println("rcpt to", to)
+
+	s.to = to
+	s.log.Debug("mail to %s", to)
 	return nil
 }
 
 func (s *session) Data(r io.Reader) error {
 	b, err := io.ReadAll(r)
 	if err != nil {
+		s.log.Error("cannot read data: %v", err)
 		return err
 	}
-	log.Println("Data", string(b))
-	return nil
+	return s.client.Send(s.from, s.to, "", string(b))
 }
 
 func (s *session) Reset() {}

smtp/smtp.go

@@ -0,0 +1,13 @@
+package smtp
+
+import (
+	"context"
+
+	"maunium.net/go/mautrix/id"
+)
+
+// Client interface to send emails
+type Client interface {
+	GetMappings(context.Context) (map[string]id.RoomID, error)
+	Send(from, to, subject, body string) error
+}