fix: tighten email validation rules

internal/mailer/validateclient/validateclient.go

@@ -56,12 +56,51 @@ var invalidHostMap = map[string]bool{
 
 	// Hundreds of typos per day for this.
 	"gamil.com": true,
+	"gamai.com": true,
 
 	// These are not email providers, but people often use them.
 	"anonymous.com": true,
 	"email.com":     true,
 }
 
+// We skip checking hosts for some of the biggest well known public email
+// providers, generated via:
+//
+//	test -f "gmass.html" \
+//	  || wget -O "gmass.html" https://www.gmass.co/domains
+//	cat "gmass.html" \
+//	  | pup 'div#status-details a json{}' \
+//	  | jq -r 'map([(.text | split(" "))[1], .children[0].text])
+//	      | map("`" + .[0] + ".` : true, // " + .[1]) | join("\n")' \
+//	  | sed 's| emails sent||g' \
+//	  | head -20
+//
+// Note:
+// This only affects the validateHost code, if we have an exact match we don't
+// bother to make a dns request.
+var hostAllowList = map[string]bool{
+	`gmail.com.`:     true, // 563,185,814
+	`yahoo.com.`:     true, // 107,413,999
+	`hotmail.com.`:   true, // 98,895,904
+	`aol.com.`:       true, // 31,839,178
+	`outlook.com.`:   true, // 11,826,511
+	`comcast.net.`:   true, // 9,663,112
+	`icloud.com.`:    true, // 9,274,437
+	`msn.com.`:       true, // 7,101,124
+	`hotmail.co.uk.`: true, // 5,456,609
+	`sbcglobal.net.`: true, // 5,167,305
+	`live.com.`:      true, // 5,140,589
+	`yahoo.co.in.`:   true, // 4,091,798
+	`me.com.`:        true, // 3,920,969
+	`att.net.`:       true, // 3,688,388
+	`mail.ru.`:       true, // 3,583,276
+	`bellsouth.net.`: true, // 3,455,683
+	`rediffmail.com`: true, // 3,400,300
+	`cox.net.`:       true, // 3,254,227
+	`yahoo.co.uk.`:   true, // 3,218,049
+	`verizon.net.`:   true, // 3,046,288
+}
+
 const (
 	validateEmailTimeout = 3 * time.Second
 )
@@ -222,6 +261,12 @@ func (ev *emailValidator) validateStatic(email string) (string, error) {
 		return "", ErrInvalidEmailFormat
 	}
 
+	// The mail package supports RFC 5322 addresses which are not valid for
+	// signup users (e.g. Chris Stockton <chris.stockton@host...>).
+	if ea.Address != email {
+		return "", ErrInvalidEmailFormat
+	}
+
 	i := strings.LastIndex(ea.Address, "@")
 	if i == -1 {
 		return "", ErrInvalidEmailFormat
@@ -291,13 +336,16 @@ func (ev *emailValidator) validateService(ctx context.Context, email string) err
 		return nil
 	}
 
+	// 32 bytes is plenty for the payload: {"valid": true|false}
 	dec := json.NewDecoder(io.LimitReader(res.Body, 1<<5))
 	if err := dec.Decode(&resObject); err != nil {
 		return nil
 	}
 
-	// If the object did not contain a valid key we consider the check as
-	// failed. We _must_ get a valid JSON response with a "valid" field.
+	// If the resObject contained no "valid" key we ignore the service and
+	// return a nil error. If the Valid key is present AND set to true we
+	// will return a nil error, otherwise the valid key was present & false
+	// so we fall through to ErrInvalidEmailAddress.
 	if resObject.Valid == nil || *resObject.Valid {
 		return nil
 	}
@@ -320,7 +368,29 @@ func (ev *emailValidator) validateProviders(name, host string) error {
 	return nil
 }
 
+// NOTE(cstockton): We could consider using[1] in the future for an additional
+// data point.
+//
+// [1] https://pkg.go.dev/golang.org/x/net/publicsuffix
 func (ev *emailValidator) validateHost(ctx context.Context, host string) error {
+
+	// As far as I know there is no such thing as valid single label hosts for
+	// email. This will block anything like: email@a, email@mycompanygltd and
+	// so on.
+	if !strings.Contains(host, ".") {
+		return ErrInvalidEmailDNS
+	}
+
+	// Require a FQDN to remove possible implict search behavior.
+	if !strings.HasSuffix(host, ".") {
+		host = host + "."
+	}
+
+	// If the host is in the allow list skip mx check all together.
+	if hostAllowList[host] {
+		return nil
+	}
+
 	mxs, err := validateEmailResolver.LookupMX(ctx, host)
 	if !isHostNotFound(err) {
 		return ev.validateMXRecords(mxs, nil)

internal/mailer/validateclient/validateclient_test.go

@@ -3,6 +3,7 @@ package validateclient
 import (
 	"context"
 	"fmt"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"sync/atomic"
@@ -201,7 +202,10 @@ func TestValidateEmailExtended(t *testing.T) {
 		// valid (has mx record)
 		{email: "[email protected]"},
 		{email: "[email protected]"},
-		{email: "[email protected]"},
+		{email: "[email protected]"},
+
+		// valid (RFC 5321 fallback, supabase.co has no mx, but valid A)
+		{email: "[email protected]"},
 
 		// bad format
 		{email: "", err: "invalid_email_format"},
@@ -210,6 +214,25 @@ func TestValidateEmailExtended(t *testing.T) {
 		{email: "@supabase.io", err: "invalid_email_format"},
 		{email: "[email protected]", err: "invalid_email_format"},
 
+		// invalid providers check doesn't allow short gmails
+		{email: "[email protected]", err: "invalid_email_address"},
+		{email: "[email protected]"}, // allow other providers
+
+		// ensure the mail parser does not result in mutated addr
+		{email: "Chris Stockton <[email protected]>",
+			err: "invalid_email_format"},
+
+		// Check dot suffixes are invalid (mutations)
+		{email: "[email protected].", err: "invalid_email_format"},
+		{email: "a@", err: "invalid_email_format"},
+		{email: "a@.", err: "invalid_email_format"},
+		{email: "a@a.", err: "invalid_email_format"},
+		{email: "[email protected].", err: "invalid_email_format"},
+		{email: "[email protected]..", err: "invalid_email_format"},
+		{email: "[email protected]", err: "invalid_email_format"},
+		{email: "[email protected].", err: "invalid_email_format"},
+		{email: "[email protected]", err: "invalid_email_format"},
+
 		// invalid: valid mx records, but invalid and often typed
 		// (invalidEmailMap)
 		{email: "[email protected]", err: "invalid_email_address"},
@@ -235,23 +258,23 @@ func TestValidateEmailExtended(t *testing.T) {
 		// valid but not actually valid and typed a lot
 		{email: "a@invalid", err: "invalid_email_dns"},
 		{email: "[email protected]", err: "invalid_email_dns"},
-		{email: "test@invalid", err: "invalid_email_dns"},
 
 		// various invalid emails
 		{email: "[email protected]", err: "invalid_email_dns"},
 		{email: "[email protected]", err: "invalid_email_dns"},
 		{email: "[email protected]", err: "invalid_email_dns"},
-
-		// test blocked mx records
-		{email: "[email protected]", err: "invalid_email_mx"},
-
 		// this low timeout should simulate a dns timeout, which should
 		// not be treated as an invalid email.
 		{email: "[email protected]",
 			timeout: time.Millisecond},
 
 		// likewise for a valid email
-		{email: "[email protected]", timeout: time.Millisecond},
+		{email: "[email protected]", timeout: time.Millisecond},
+
+		// invalid dns
+		{email: "a@a", err: "invalid_email_dns"},
+		{email: "[email protected]", err: "invalid_email_dns"},
+		{email: "a@abcd", err: "invalid_email_dns"},
 	}
 
 	cfg := conf.MailerConfiguration{
@@ -268,6 +291,7 @@ func TestValidateEmailExtended(t *testing.T) {
 
 	ev := newEmailValidator(cfg)
 
+	seen := make(map[string]bool)
 	for idx, tc := range cases {
 		func(timeout time.Duration) {
 			if timeout == 0 {
@@ -277,6 +301,11 @@ func TestValidateEmailExtended(t *testing.T) {
 			ctx, cancel := context.WithTimeout(ctx, timeout)
 			defer cancel()
 
+			if seen[tc.email] {
+				t.Fatalf("duplicate email %v in test cases", tc.email)
+			}
+			seen[tc.email] = true
+
 			now := time.Now()
 			err := ev.Validate(ctx, tc.email)
 			dur := time.Since(now)
@@ -294,4 +323,24 @@ func TestValidateEmailExtended(t *testing.T) {
 
 		}(tc.timeout)
 	}
+
+	// test blocked mx list
+	{
+		for _, v := range []string{
+			"hotmail-com.olc.protection.outlook.com",
+			"hotmail-com.olc.protection.outlook.com.",
+		} {
+			{
+				err := ev.validateMXRecords([]*net.MX{{Host: v}}, nil)
+				require.Error(t, err)
+				require.Contains(t, err.Error(), ErrInvalidEmailMX.Error())
+			}
+
+			{
+				err := ev.validateMXRecords(nil, []string{v})
+				require.Error(t, err)
+				require.Contains(t, err.Error(), ErrInvalidEmailMX.Error())
+			}
+		}
+	}
 }