fix(GODT-2776): Relax From & Sender validation checks

They were too restrictive. From and Sender can have the same address. Closes: #380
ProtonMail · Jul 7, 2023 · cb3fabd · cb3fabd
1 parent e8f6a4e
commit cb3fabd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/rfc5322/validation.go b/rfc5322/validation.go
@@ -58,14 +58,10 @@ func ValidateMessageHeaderFields(literal []byte) error {
 					return fmt.Errorf("%w: Required header field 'Sender' should not be empty", ErrInvalidMessage)
 				}
 
-				senderAddr, err := ParseAddress(senderValue)
+				_, err := ParseAddress(senderValue)
 				if err != nil {
 					return fmt.Errorf("%w: failed to parse Sender header: %v", ErrInvalidMessage, err)
 				}
-
-				if len(senderAddr) == 1 && senderAddr[0].Address == addresses[0].Address {
-					return fmt.Errorf("%w: `Sender` should not be present if equal to `From`", ErrInvalidMessage)
-				}
 			}
 		}
 	}

diff --git a/rfc5322/validation_test.go b/rfc5322/validation_test.go
@@ -28,15 +28,6 @@ func TestValidateMessageHeaderFields_ErrOnMissingDate(t *testing.T) {
 	require.Error(t, ValidateMessageHeaderFields([]byte(literal)))
 }
 
-func TestValidateMessageHeaderFields_ErrOnSingleFromAndSenderEqual(t *testing.T) {
-	const literal = `From: Foo@bar.com
-Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-Sender: Foo@bar.com
-`
-
-	require.Error(t, ValidateMessageHeaderFields([]byte(literal)))
-}
-
 func TestValidateMessageHeaderFields_AllowSingleFromWithDifferentSender(t *testing.T) {
 	const literal = `From: Foo@bar.com
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)