Include tld in email obfuscation

Author: benbusby

backend/server/auth/handlers.go

@@ -161,7 +161,7 @@ func AccountHandler(w http.ResponseWriter, req *http.Request, id string) {
 			return
 		}
 
-		obscuredEmail, _ := utils.ObscureEmail(user.Email)
+		obscuredEmail, _ := shared.ObscureEmail(user.Email)
 		_ = json.NewEncoder(w).Encode(shared.AccountResponse{
 			Email:            obscuredEmail,
 			PaymentID:        user.PaymentID,

backend/server/html/handlers.go

@@ -11,7 +11,6 @@ import (
 	"yeetfile/backend/server/html/templates"
 	"yeetfile/backend/server/session"
 	"yeetfile/backend/server/upgrades"
-	"yeetfile/backend/utils"
 	"yeetfile/shared"
 	"yeetfile/shared/endpoints"
 )
@@ -198,7 +197,7 @@ func AccountPageHandler(w http.ResponseWriter, req *http.Request, userID string)
 
 	successMsg, errorMsg := generateAccountMessages(req)
 	hasHint := user.PasswordHint != nil && len(user.PasswordHint) > 0
-	obscuredEmail, _ := utils.ObscureEmail(user.Email)
+	obscuredEmail, _ := shared.ObscureEmail(user.Email)
 	isPrevUpgraded := user.UpgradeExp.Year() >= 2024
 
 	_ = templates.ServeTemplate(

backend/utils/misc.go

@@ -4,7 +4,6 @@ import (
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -238,36 +237,6 @@ func ParseSizeString(str string) int64 {
 	return 0
 }
 
-// ObscureEmail takes an email and strips out the majority of the address and
-// domain, adding "***" as an indicator of the obfuscation for both.
-func ObscureEmail(email string) (string, error) {
-	segments := strings.Split(email, "@")
-	if len(segments) != 2 {
-		return "", errors.New("invalid email")
-	}
-
-	address := segments[0]
-	domain := segments[1]
-
-	var hiddenEmail string
-	if len(address) > 1 {
-		hiddenEmail = fmt.Sprintf(
-			"%c%c***%c@%c***.com",
-			address[0],
-			address[1],
-			address[len(address)-1],
-			domain[0])
-	} else {
-		hiddenEmail = fmt.Sprintf(
-			"%c***%c@%c***.com",
-			address[0],
-			address[len(address)-1],
-			domain[0])
-	}
-
-	return hiddenEmail, nil
-}
-
 // LimitedChunkReader reads the request body, limited to max chunk size + encryption
 // overhead + 1024 bytes. This is big enough for all data-containing requests
 // made to the YeetFile API.

shared/utils.go

@@ -2,6 +2,7 @@ package shared
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"math"
 	"math/rand"
@@ -184,3 +185,38 @@ func ArrayContains(items []string, target string) bool {
 	}
 	return false
 }
+
+// ObscureEmail takes an email and strips out the majority of the address and
+// domain, adding "***" as an indicator of the obfuscation for both.
+func ObscureEmail(email string) (string, error) {
+	segments := strings.Split(email, "@")
+	if len(segments) != 2 {
+		return "", errors.New("invalid email")
+	}
+
+	address := segments[0]
+	domain := segments[1]
+
+	segments = strings.Split(email, ".")
+	ext := segments[len(segments)-1]
+
+	var hiddenEmail string
+	if len(address) > 1 {
+		hiddenEmail = fmt.Sprintf(
+			"%c%c***%c@%c***.%s",
+			address[0],
+			address[1],
+			address[len(address)-1],
+			domain[0],
+			ext)
+	} else {
+		hiddenEmail = fmt.Sprintf(
+			"%c***%c@%c***.%s",
+			address[0],
+			address[len(address)-1],
+			domain[0],
+			ext)
+	}
+
+	return hiddenEmail, nil
+}