fix: Handle spaces inside angle brackets (#360)

Co-authored-by: Andrei Sidorenko <[email protected]>
jhillyerd · Jan 5, 2025 · 50133b8 · 50133b8
1 parent 1d9fc9c
commit 50133b8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/internal/stringutil/addr.go b/internal/stringutil/addr.go
@@ -34,6 +34,7 @@ func EnsureCommaDelimitedAddresses(s string) string {
 	inQuotes := false
 	inDomain := false
 	escapeSequence := false
+	inAngles := false
 	sb := strings.Builder{}
 	for i, r := range s {
 		if escapeSequence {
@@ -46,6 +47,19 @@ func EnsureCommaDelimitedAddresses(s string) string {
 			sb.WriteRune(r)
 			continue
 		}
+
+		if r == '<' {
+			inAngles = true
+			sb.WriteRune(r)
+			continue
+		}
+
+		if r == '>' {
+			inAngles = false
+			sb.WriteRune(r)
+			continue
+		}
+
 		if inQuotes {
 			if r == '\\' {
 				escapeSequence = true
@@ -74,13 +88,17 @@ func EnsureCommaDelimitedAddresses(s string) string {
 					sb.WriteRune(r)
 					continue
 				}
-				if r == ' ' {
+				if r == ' ' && !inAngles {
 					inDomain = false
 					sb.WriteRune(',')
 					sb.WriteRune(r)
 					continue
 				}
 			}
+
+			if inAngles && r == ' ' {
+				continue
+			}
 		}
 		sb.WriteRune(r)
 	}

diff --git a/internal/stringutil/addr_test.go b/internal/stringutil/addr_test.go
@@ -108,6 +108,22 @@ func TestCommaDelimitedAddressLists(t *testing.T) {
 			have: `"Joe @ Company" <[email protected]>;<[email protected]>`,
 			want: `"Joe @ Company" <[email protected]>,<[email protected]>`,
 		},
+		{
+			have: `"Joe @ Company" <[email protected] >;<[email protected]>`,
+			want: `"Joe @ Company" <[email protected]>,<[email protected]>`,
+		},
+		{
+			have: `"Joe @ Company" <[email protected]>;<[email protected]     >`,
+			want: `"Joe @ Company" <[email protected]>,<[email protected]>`,
+		},
+		{
+			have: `"Joe @ Company" <[email protected]>;<  [email protected]>`,
+			want: `"Joe @ Company" <[email protected]>,<[email protected]>`,
+		},
+		{
+			have: `"Joe @ Company" <  [email protected]  >;< [email protected]     >`,
+			want: `"Joe @ Company" <[email protected]>,<[email protected]>`,
+		},
 	}
 	for _, tt := range testData {
 		t.Run(tt.have, func(t *testing.T) {