From f0f07218c69533a33d25fe5d4fe6a315dabf5389 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 8 Jul 2021 22:40:21 +0100 Subject: [PATCH] Validation fixes --- internal/smtpserver/session_remote.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/smtpserver/session_remote.go b/internal/smtpserver/session_remote.go index 08fbf3b..5c1f5cf 100644 --- a/internal/smtpserver/session_remote.go +++ b/internal/smtpserver/session_remote.go @@ -27,13 +27,12 @@ func (s *SessionRemote) Mail(from string, opts smtp.MailOptions) error { return fmt.Errorf("mail.ParseAddress: %w", err) } - pks, err := hex.DecodeString(host) + pks, err := hex.DecodeString(s.state.RemoteAddr.String()) if err != nil { return fmt.Errorf("hex.DecodeString: %w", err) } - remote := base62.EncodeToString(pks) - if local := s.state.RemoteAddr.String(); local != remote { + if remote := base62.EncodeToString(pks); host != remote { return fmt.Errorf("not allowed to send incoming mail as %s", from) }