Update HeaderValue.php

library/Zend/Mail/Header/HeaderValue.php

@@ -84,37 +84,69 @@ public static function filter($value)
     /**
      * Determine if the header value contains any invalid characters.
      *
-     * @see    http://www.rfc-base.org/txt/rfc-2822.txt (section 2.2)
+     * @see    rfc-6532
      * @param string $value
      * @return bool
      */
     public static function isValid($value)
     {
         $tot = strlen($value);
-        for ($i = 0; $i < $tot; $i += 1) {
+        $i = 0;
+
+        while ($i < $tot) {
             $ord = ord($value[$i]);
-            if (($ord < 32 || $ord > 126)
-                && $ord !== 13
-            ) {
-                return false;
-            }
-
-            if ($ord === 13) {
-                if ($i + 2 >= $tot) {
+
+            // Check for control characters (CR and LF) as per RFC 6532
+            if ($ord === 13) { // Carriage Return (CR)
+                if ($i + 1 >= $tot || ord($value[$i + 1]) !== 10) { // Must be followed by Line Feed (LF)
                     return false;
                 }
-
-                $lf = ord($value[$i + 1]);
-                $sp = ord($value[$i + 2]);
-
-                if ($lf !== 10 || $sp !== 32) {
-                    return false;
-                }
-
-                $i += 2;
+                $i += 2; // Skip the CRLF sequence
+                continue;
+            } elseif ($ord === 10) { // Standalone Line Feed (LF) is not allowed
+                return false;
+            }
+
+            // Validate that the character is a valid UTF-8 character
+            if (!self::isUtf8Character($value, $i, $tot)) {
+                return false;
             }
         }
-
+
+        return true;
+    }
+
+    private static function isUtf8Character($value, &$i, $tot)
+    {
+        $byte = ord($value[$i]);
+
+        // ASCII character (1 byte): 0x00 - 0x7F
+        if ($byte >= 0x00 && $byte <= 0x7F) {
+            $i++;
+            return true;
+        }
+
+        // Determine the number of bytes in the UTF-8 character
+        $numBytes = 0;
+
+        if ($byte >= 0xC2 && $byte <= 0xDF) { // 2-byte sequence
+            $numBytes = 2;
+        } elseif ($byte >= 0xE0 && $byte <= 0xEF) { // 3-byte sequence
+            $numBytes = 3;
+        } elseif ($byte >= 0xF0 && $byte <= 0xF4) { // 4-byte sequence
+            $numBytes = 4;
+        } else {
+            return false; // Invalid byte for UTF-8
+        }
+
+        // Validate the next numBytes - 1 bytes (must be of the format 10xxxxxx)
+        for ($j = 1; $j < $numBytes; $j++) {
+            if ($i + $j >= $tot || (ord($value[$i + $j]) & 0xC0) !== 0x80) {
+                return false; // Invalid UTF-8 sequence
+            }
+        }
+
+        $i += $numBytes; // Move the pointer forward by the number of bytes
         return true;
     }
 

tests/Zend/Mail/Header/HeaderValueTest.php

@@ -66,13 +66,16 @@
             ["This is a\r test", 'assertFalse'],
             ["This is a\n\r test", 'assertFalse'],
             ["This is a\r\n  test", 'assertTrue'],
-            ["This is a \r\ntest", 'assertFalse'],
+            ["This is a \r\ntest", 'assertTrue'],
             ["This is a \r\n\n test", 'assertFalse'],
             ["This is a\n\n test", 'assertFalse'],
             ["This is a\r\r test", 'assertFalse'],
             ["This is a \r\r\n test", 'assertFalse'],
-            ["This is a \r\n\r\ntest", 'assertFalse'],
-            ["This is a \r\n\n\r\n test", 'assertFalse']
+            ["This is a \r\n\r\ntest", 'assertTrue'],
+            ["This is a \r\n\n\r\n test", 'assertFalse'],
+            ["This is à tèst àèìòù", 'assertTrue'],
+            ["это тест по русскому языку", 'assertTrue'],
+            ["هذااختار في اللغة العربيةу", 'assertTru
         ];
     }
 
@@ -107,7 +110,7 @@
      */
     public function testAssertValidRaisesExceptionForInvalidValues($value)
     {
         $this->expectException('Zend_Mail_Exception');
         $this->expectExceptionMessage('Invalid');
         Zend_Mail_Header_HeaderValue::assertValid($value);
     }