Fix 'original' field having an un-escaped local part

Fixes #169.

Author: JoshData

CHANGELOG.md

@@ -2,6 +2,7 @@ In Development
 --------------
 
 * Python 3.8 and 3.9 are no longer supported.
+* The `original` field of the returned validated email object incorrectly un-escaped the local part of the email address. Now it returns the original address, without any display name, as passed to validate_email.
 
 2.3.0 (August 26, 2025)
 -----------------------

email_validator/syntax.py

@@ -11,9 +11,9 @@
 from typing import Optional, TypedDict
 
 
-def split_email(email: str) -> tuple[Optional[str], str, str, bool]:
-    # Return the display name, unescaped local part, and domain part
-    # of the address, and whether the local part was quoted. If no
+def split_email(email: str) -> tuple[Optional[str], str, str, bool, str]:
+    # Return the display name, the original local part, the unescaped
+    # local part, and the domain part of the address. If no
     # display name was present and angle brackets do not surround
     # the address, display name will be None; otherwise, it will be
     # set to the display name or the empty string if there were
@@ -193,9 +193,9 @@ def unquote_quoted_string(text: str) -> tuple[str, bool]:
         domain_part = domain_part[1:]
 
     # Unquote the local part if it is quoted.
-    local_part, is_quoted_local_part = unquote_quoted_string(local_part)
+    local_part_unquoted, is_quoted_local_part = unquote_quoted_string(local_part)
 
-    return display_name, local_part, domain_part, is_quoted_local_part
+    return display_name, local_part, local_part_unquoted, is_quoted_local_part, domain_part
 
 
 def get_length_reason(addr: str, limit: int) -> str:

email_validator/types.py

@@ -93,7 +93,8 @@ def __eq__(self, other: object) -> bool:
         if not isinstance(other, ValidatedEmail):
             return False
         return (
-            self.normalized == other.normalized
+            getattr(self, 'original', None) == getattr(other, 'original', None)
+            and self.normalized == other.normalized
             and self.local_part == other.local_part
             and self.domain == other.domain
             and getattr(self, 'ascii_email', None) == getattr(other, 'ascii_email', None)
@@ -110,7 +111,7 @@ def __eq__(self, other: object) -> bool:
     def as_constructor(self) -> str:
         return "ValidatedEmail(" \
             + ",".join(f"\n  {key}={repr(getattr(self, key))}"
-                       for key in ('normalized', 'local_part', 'domain',
+                       for key in ('original', 'normalized', 'local_part', 'domain',
                                    'ascii_email', 'ascii_local_part', 'ascii_domain',
                                    'smtputf8', 'mx', 'mx_fallback_type',
                                    'display_name')

email_validator/validate_email.py

@@ -77,7 +77,7 @@ def validate_email(
     # Normally, there is only one @-sign. But the awkward "quoted string"
     # local part form (RFC 5321 4.1.2) allows @-signs in the local
     # part if the local part is quoted.
-    display_name, local_part, domain_part, is_quoted_local_part \
+    display_name, original_local_part, unescaped_local_part, is_quoted_local_part, domain_part \
         = split_email(email)
 
     if display_name:
@@ -90,16 +90,14 @@ def validate_email(
 
     # Collect return values in this instance.
     ret = ValidatedEmail()
-    ret.original = ((local_part if not is_quoted_local_part
-                    else ('"' + local_part + '"'))
-                    + "@" + domain_part)  # drop the display name, if any, for email length tests at the end
+    ret.original = original_local_part + "@" + domain_part  # drop the display name, if any, for email length tests at the end
     ret.display_name = display_name
 
     # Validate the email address's local part syntax and get a normalized form.
     # If the original address was quoted and the decoded local part is a valid
     # unquoted local part, then we'll get back a normalized (unescaped) local
     # part.
-    local_part_info = validate_email_local_part(local_part,
+    local_part_info = validate_email_local_part(unescaped_local_part,
                                                 allow_smtputf8=allow_smtputf8,
                                                 allow_empty_local=allow_empty_local,
                                                 quoted_local_part=is_quoted_local_part,

tests/test_syntax.py

@@ -101,9 +101,34 @@ def MakeValidatedEmail(**kwargs: Any) -> ValidatedEmail:
                 ascii_email='de-quoted.local.part@example.org'
             ),
         ),
+        (
+            '"unnecessary.escaped.\\x.local.part"@example.org',
+            MakeValidatedEmail(
+                local_part='unnecessary.escaped.x.local.part',
+                ascii_local_part='unnecessary.escaped.x.local.part',
+                smtputf8=False,
+                ascii_domain='example.org',
+                domain='example.org',
+                normalized='unnecessary.escaped.x.local.part@example.org',
+                ascii_email='unnecessary.escaped.x.local.part@example.org'
+            ),
+        ),
+        (
+            '"escaped.quote.\\".local.part"@example.org',
+            MakeValidatedEmail(
+                local_part='"escaped.quote.\\".local.part"',
+                ascii_local_part='"escaped.quote.\\".local.part"',
+                smtputf8=False,
+                ascii_domain='example.org',
+                domain='example.org',
+                normalized='"escaped.quote.\\".local.part"@example.org',
+                ascii_email='"escaped.quote.\\".local.part"@example.org'
+            ),
+        ),
         (
             'MyName <me@example.org>',
             MakeValidatedEmail(
+                original='me@example.org',
                 local_part='me',
                 ascii_local_part='me',
                 smtputf8=False,
@@ -117,6 +142,7 @@ def MakeValidatedEmail(**kwargs: Any) -> ValidatedEmail:
         (
             'My Name <me@example.org>',
             MakeValidatedEmail(
+                original='me@example.org',
                 local_part='me',
                 ascii_local_part='me',
                 smtputf8=False,
@@ -130,6 +156,7 @@ def MakeValidatedEmail(**kwargs: Any) -> ValidatedEmail:
         (
             r'"My.\"Na\\me\".Is" <"me \" \\ me"@example.org>',
             MakeValidatedEmail(
+                original=r'"me \" \\ me"@example.org',
                 local_part=r'"me \" \\ me"',
                 ascii_local_part=r'"me \" \\ me"',
                 smtputf8=False,
@@ -143,6 +170,11 @@ def MakeValidatedEmail(**kwargs: Any) -> ValidatedEmail:
     ],
 )
 def test_email_valid(email_input: str, output: ValidatedEmail) -> None:
+    # Simplfiy hard-coded expected values above by filling
+    # in 'original' when it isn't set.
+    if not hasattr(output, 'original'):
+        output.original = email_input
+
     # These addresses do not require SMTPUTF8. See test_email_valid_intl_local_part
     # for addresses that are valid but require SMTPUTF8. Check that it passes with
     # allow_smtput8 both on and off.
@@ -297,6 +329,7 @@ def test_email_valid(email_input: str, output: ValidatedEmail) -> None:
         (
             '\"s\u0323\u0307\" <s\u0323\u0307@nfc.tld>',
             MakeValidatedEmail(
+                original='s\u0323\u0307@nfc.tld',
                 local_part='\u1E69',
                 smtputf8=True,
                 ascii_domain='nfc.tld',
@@ -318,6 +351,11 @@ def test_email_valid(email_input: str, output: ValidatedEmail) -> None:
     ],
 )
 def test_email_valid_intl_local_part(email_input: str, output: ValidatedEmail) -> None:
+    # Simplfiy hard-coded expected values above by filling
+    # in 'original' when it isn't set.
+    if not hasattr(output, 'original'):
+        output.original = email_input
+
     # Check that it passes when allow_smtputf8 is True.
     assert validate_email(email_input, check_deliverability=False, allow_display_name=True) == output