Skip to content

Commit b479b40

Browse files
committed
fixed the nil issue when there is no from address, as well fixed the way we fetch the To address (from RCPT) instead of (Data.To)
1 parent ce19c7d commit b479b40

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

main.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@ import (
66
"fmt"
77
"io/ioutil"
88
"log"
9+
"net/mail"
10+
"time"
911

1012
"github.com/alash3al/go-smtpsrv/v3"
1113
"github.com/go-resty/resty/v2"
1214
)
1315

1416
func main() {
1517
cfg := smtpsrv.ServerConfig{
18+
ReadTimeout: 60 * time.Second,
1619
ListenAddr: *flagListenAddr,
1720
MaxMessageBytes: int(*flagMaxMessageSize),
1821
BannerDomain: *flagServerName,
@@ -39,8 +42,11 @@ func main() {
3942
jsonData.Body.HTML = string(msg.HTMLBody)
4043
jsonData.Body.Text = string(msg.TextBody)
4144

42-
jsonData.Addresses.From = transformStdAddressToEmailAddress(msg.From)[0]
43-
jsonData.Addresses.To = transformStdAddressToEmailAddress(msg.To)
45+
if from := transformStdAddressToEmailAddress(msg.From); len(from) > 0 {
46+
jsonData.Addresses.From = from[0]
47+
}
48+
49+
jsonData.Addresses.To = transformStdAddressToEmailAddress([]*mail.Address{c.To()})
4450
jsonData.Addresses.Cc = transformStdAddressToEmailAddress(msg.Cc)
4551
jsonData.Addresses.Bcc = transformStdAddressToEmailAddress(msg.Bcc)
4652
jsonData.Addresses.ReplyTo = transformStdAddressToEmailAddress(msg.ReplyTo)

0 commit comments

Comments
 (0)