feat(GODT-2201): RFC5322 AddressList parser rewritten in Go

ProtonMail · Feb 21, 2023 · a6bbc98 · a6bbc98
1 parent 09ab705
commit a6bbc98
Show file tree

Hide file tree

Showing 16 changed files with 2,622 additions and 19 deletions.
diff --git a/imap/envelope.go b/imap/envelope.go
@@ -1,10 +1,10 @@
 package imap
 
 import (
+	"github.com/ProtonMail/gluon/rfc5322"
 	"net/mail"
 	"strings"
 
-	"github.com/ProtonMail/gluon/internal/parser"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/sirupsen/logrus"
 )
@@ -29,47 +29,44 @@ func envelope(header *rfc822.Header, c *paramList, writer parListWriter) error {
 		addString(writer, header.Get("Date")).
 		addString(writer, header.Get("Subject"))
 
-	addressParser := parser.NewRFC5322AddressListParser()
-	defer addressParser.Close()
-
 	if v, ok := header.GetChecked("From"); !ok {
 		fields.addString(writer, "")
 	} else {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	}
 
 	if v, ok := header.GetChecked("Sender"); ok {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	} else if v, ok := header.GetChecked("From"); ok {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	} else {
 		fields.addString(writer, "")
 	}
 
 	if v, ok := header.GetChecked("Reply-To"); ok {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	} else if v, ok := header.GetChecked("From"); ok {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	} else {
 		fields.addString(writer, "")
 	}
 
 	if v, ok := header.GetChecked("To"); !ok {
 		fields.addString(writer, "")
 	} else {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	}
 
 	if v, ok := header.GetChecked("Cc"); !ok {
 		fields.addString(writer, "")
 	} else {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	}
 
 	if v, ok := header.GetChecked("Bcc"); !ok {
 		fields.addString(writer, "")
 	} else {
-		fields.addAddresses(writer, tryParseAddressList(addressParser, v))
+		fields.addAddresses(writer, tryParseAddressList(v))
 	}
 
 	fields.addString(writer, header.Get("In-Reply-To"))
@@ -79,8 +76,8 @@ func envelope(header *rfc822.Header, c *paramList, writer parListWriter) error {
 	return nil
 }
 
-func tryParseAddressList(parser *parser.RFC5322AddressListParser, val string) []*mail.Address {
-	addr, err := parser.Parse(val)
+func tryParseAddressList(val string) []*mail.Address {
+	addr, err := rfc5322.ParseAddressList(val)
 	if err != nil {
 		logrus.WithError(err).Error("Failed to parse address")
 		return []*mail.Address{{Name: val}}