try to receive attachments

smtp/server.go

@@ -46,7 +46,7 @@ func Start(domain, port, loglevel string, client Client) error {
 	s.AuthDisabled = true
 	s.ReadTimeout = 10 * time.Second
 	s.WriteTimeout = 10 * time.Second
-	s.MaxMessageBytes = 63 * 1024
+	s.MaxMessageBytes = 128 * 1024
 	if log.GetLevel() == "DEBUG" || log.GetLevel() == "TRACE" {
 		s.Debug = os.Stdout
 	}

smtp/session.go

@@ -52,17 +52,36 @@ func (s *session) Rcpt(to string) error {
 	return nil
 }
 
+func (s *session) parseAttachments(parts []*enmime.Part) []*utils.File {
+	files := make([]*utils.File, 0, len(parts))
+	for _, attachment := range parts {
+		for _, err := range attachment.Errors {
+			s.log.Warn("attachment error: %v", err)
+		}
+		file := utils.NewFile(attachment.FileName, attachment.ContentType, attachment.Content)
+		files = append(files, file)
+	}
+
+	return files
+}
+
 func (s *session) Data(r io.Reader) error {
 	parser := enmime.NewParser()
-	env, err := parser.ReadEnvelope(r)
+	eml, err := parser.ReadEnvelope(r)
 	if err != nil {
 		return err
 	}
-	text := env.Text
-	if env.HTML != "" {
-		text = env.HTML
+	text := eml.Text
+	if eml.HTML != "" {
+		text = eml.HTML
 	}
-	return s.client.Send(s.from, s.to, env.GetHeader("Subject"), text)
+
+	attachments := s.parseAttachments(eml.Attachments)
+	inlines := s.parseAttachments(eml.Inlines)
+	files := make([]*utils.File, 0, len(attachments)+len(inlines))
+	files = append(files, attachments...)
+	files = append(files, inlines...)
+	return s.client.Send(s.ctx, s.from, s.to, eml.GetHeader("Subject"), text, files)
 }
 
 func (s *session) Reset() {}

smtp/smtp.go

@@ -3,11 +3,12 @@ package smtp
 import (
 	"context"
 
+	"gitlab.com/etke.cc/postmoogle/utils"
 	"maunium.net/go/mautrix/id"
 )
 
 // Client interface to send emails
 type Client interface {
 	GetMappings(context.Context) (map[string]id.RoomID, error)
-	Send(from, mailbox, subject, body string) error
+	Send(ctx context.Context, from, mailbox, subject, body string, files []*utils.File) error
 }