fix: reject malformed email whitespace

Author: ppolariss

apis/schemas_test.go

@@ -4,6 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"testing"
+
+	"github.com/opentreehole/go-common"
+
+	"auth_next/config"
 )
 
 type VerificationModel struct {
@@ -26,3 +30,24 @@ func TestVerificationModel(t *testing.T) {
 		fmt.Println(model.Verification)
 	}
 }
+
+func TestRegisterRequestRejectsWhitespaceEmail(t *testing.T) {
+	config.Config.EmailWhitelist = []string{"fudan.edu.cn", "m.fudan.edu.cn"}
+
+	for _, email := range []string{
+		" student001@m.fudan.edu.cn",
+		"student002 @m.fudan.edu.cn",
+		"\tstudent003@fudan.edu.cn",
+	} {
+		body := RegisterRequest{
+			LoginRequest: LoginRequest{
+				EmailModel: EmailModel{Email: email},
+				Password:   "password123",
+			},
+			Verification: "000000",
+		}
+		if err := common.ValidateStruct(body); err == nil {
+			t.Fatalf("expected validation error for email %q", email)
+		}
+	}
+}

apis/shamir.go

@@ -11,7 +11,6 @@ import (
 	"sync"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	"github.com/opentreehole/go-common"
 	"github.com/rs/zerolog/log"
@@ -796,11 +795,10 @@ func decryptEmailWithThreshold(shares shamir.Shares, threshold int) (string, boo
 		return "", false
 	}
 
-	validate := validator.New()
 	var result string
 	ok := forEachShareCombination(n, threshold, func(selected []int) bool {
 		email := shamir.Decrypt(selectedShares(shares, selected))
-		if validate.Var(email, "required,email") == nil {
+		if utils.ValidateEmail(email) {
 			result = email
 			return false
 		}
@@ -822,15 +820,14 @@ func decryptUserEmailWithThreshold(userID int, shares shamir.Shares, identityNam
 		return DecryptedUserEmailResponse{}, false
 	}
 
-	validate := validator.New()
 	var result DecryptedUserEmailResponse
 	ok := forEachShareCombination(n, threshold, func(selected []int) bool {
 		response := DecryptedUserEmailResponse{
 			UserID:        userID,
 			UserEmail:     shamir.Decrypt(selectedShares(shares, selected)),
 			IdentityNames: selectedIdentityNames(identityNames, selected),
 		}
-		if validate.Struct(response) == nil {
+		if utils.ValidateEmail(response.UserEmail) {
 			result = response
 			return false
 		}

apis/shamir_test.go

@@ -18,6 +18,8 @@ import (
 )
 
 func TestDecryptUserEmailWithThresholdSkipsBadShare(t *testing.T) {
+	allowAnyEmailDomain(t)
+
 	const email = "test@example.com"
 
 	shares, err := shamir.Encrypt(email, 5, 4)
@@ -45,6 +47,8 @@ func TestDecryptUserEmailWithThresholdSkipsBadShare(t *testing.T) {
 }
 
 func TestDecryptUserEmailWithThreeOfFive(t *testing.T) {
+	allowAnyEmailDomain(t)
+
 	const email = "test@example.com"
 
 	shares, err := shamir.Encrypt(email, 5, 3)
@@ -87,15 +91,18 @@ func TestUpdateShamirPersistsFiveKeyLocalSQLite(t *testing.T) {
 	oldDB := models.DB
 	oldPublicKeys := models.ShamirPublicKeys
 	oldShamirFeature := config.Config.ShamirFeature
+	oldEmailWhitelist := config.Config.EmailWhitelist
 	t.Cleanup(func() {
 		models.DB = oldDB
 		models.ShamirPublicKeys = oldPublicKeys
 		config.Config.ShamirFeature = oldShamirFeature
+		config.Config.EmailWhitelist = oldEmailWhitelist
 		InitShamirStatus()
 	})
 
 	models.DB = db
 	config.Config.ShamirFeature = true
+	config.Config.EmailWhitelist = nil
 
 	publicKeys, privateKeyRings := generateTestKeySet(t, 7)
 	models.ShamirPublicKeys = publicKeys
@@ -217,15 +224,18 @@ func TestUpdateShamirInvalidShareDoesNotPanic(t *testing.T) {
 	oldDB := models.DB
 	oldPublicKeys := models.ShamirPublicKeys
 	oldShamirFeature := config.Config.ShamirFeature
+	oldEmailWhitelist := config.Config.EmailWhitelist
 	t.Cleanup(func() {
 		models.DB = oldDB
 		models.ShamirPublicKeys = oldPublicKeys
 		config.Config.ShamirFeature = oldShamirFeature
+		config.Config.EmailWhitelist = oldEmailWhitelist
 		InitShamirStatus()
 	})
 
 	models.DB = db
 	config.Config.ShamirFeature = true
+	config.Config.EmailWhitelist = nil
 
 	publicKeys, _ := generateTestKeySet(t, 5)
 	models.ShamirPublicKeys = publicKeys
@@ -297,15 +307,18 @@ func TestUpdateShamirPartialUpdateAllowedAtNinetyNinePercent(t *testing.T) {
 	oldDB := models.DB
 	oldPublicKeys := models.ShamirPublicKeys
 	oldShamirFeature := config.Config.ShamirFeature
+	oldEmailWhitelist := config.Config.EmailWhitelist
 	t.Cleanup(func() {
 		models.DB = oldDB
 		models.ShamirPublicKeys = oldPublicKeys
 		config.Config.ShamirFeature = oldShamirFeature
+		config.Config.EmailWhitelist = oldEmailWhitelist
 		InitShamirStatus()
 	})
 
 	models.DB = db
 	config.Config.ShamirFeature = true
+	config.Config.EmailWhitelist = nil
 
 	publicKeys, _ := generateTestKeySet(t, 5)
 	models.ShamirPublicKeys = publicKeys
@@ -430,6 +443,16 @@ func generateTestKeySet(t *testing.T, n int) ([]models.ShamirPublicKey, []*crypt
 	return publicKeys, privateKeyRings
 }
 
+func allowAnyEmailDomain(t *testing.T) {
+	t.Helper()
+
+	oldEmailWhitelist := config.Config.EmailWhitelist
+	config.Config.EmailWhitelist = nil
+	t.Cleanup(func() {
+		config.Config.EmailWhitelist = oldEmailWhitelist
+	})
+}
+
 func decryptTestShare(privateKeyRing *crypto.KeyRing, armoredPGPMessage string) (shamir.Share, error) {
 	pgpMessage, err := crypto.NewPGPMessageFromArmored(armoredPGPMessage)
 	if err != nil {

utils/validate.go

@@ -20,6 +20,10 @@ func init() {
 }
 
 func ValidateEmail(email string) bool {
+	if err := common.Validate.Var(email, "required,email"); err != nil {
+		return false
+	}
+
 	emailSplit := strings.Split(email, "@")
 	if len(emailSplit) != 2 {
 		return false

utils/validate_test.go

@@ -15,6 +15,9 @@ func TestValidateEmail(t *testing.T) {
 	assert.Equal(t, ValidateEmail("abcd@fudan.edu.cn"), true)
 	assert.Equal(t, ValidateEmail("abcd@qq.com"), false)
 	assert.Equal(t, ValidateEmail("123345"), false)
+	assert.Equal(t, ValidateEmail(" abcd@fudan.edu.cn"), false)
+	assert.Equal(t, ValidateEmail("abcd @fudan.edu.cn"), false)
+	assert.Equal(t, ValidateEmail("\tabcd@fudan.edu.cn"), false)
 }
 
 func TestValidateEmailFudan(t *testing.T) {
@@ -32,4 +35,6 @@ func TestValidateAll(t *testing.T) {
 	config.Config.EmailWhitelist = []string{"fudan.edu.cn", "m.fudan.edu.cn"}
 	err := common.ValidateStruct(TempStruct{Email: "abcd@fudan.edu.cn"})
 	assert.Equal(t, err, nil)
+	err = common.ValidateStruct(TempStruct{Email: " abcd@fudan.edu.cn"})
+	assert.NotEqual(t, err, nil)
 }