Improve error check in Mimedir parser

Author: kristoffermollerhoj

lib/Parser/MimeDir.php

@@ -26,6 +26,11 @@
  */
 class MimeDir extends Parser
 {
+    public const TOKEN_PROPNAME = 1;
+    public const TOKEN_PROPVALUE = 2;
+    public const TOKEN_PARAMNAME = 3;
+    public const TOKEN_PARAMVALUE = 4;
+
     /**
      * The input stream.
      *
@@ -360,6 +365,12 @@ protected function readProperty(string $line)
             'value' => null,
         ];
 
+        /*
+         * Keep track on the last token we parsed in order to do
+         * better error checking
+         */
+        $lastToken = null;
+
         $lastParam = null;
 
         /*
@@ -385,10 +396,16 @@ protected function readProperty(string $line)
                         // option is set to ignore invalid lines, we ignore this line
                         // This can happen when servers provide faulty data as iCloud
                         //  frequently does with X-APPLE-STRUCTURED-LOCATION
+                        $lastToken = self::TOKEN_PARAMVALUE;
                         continue;
                     }
                     throw new ParseException('Invalid Mimedir file. Line starting at '.$this->startLine.' did not follow iCalendar/vCard conventions');
                 }
+
+                if ('=' == $match[0][0] && self::TOKEN_PARAMNAME != $lastToken) {
+                    throw new ParseException('Invalid Mimedir file. Line starting at '.$this->startLine.': Missing parameter name for parameter value "'.$match['paramValue'].'"');
+                }
+
                 if (\is_null($property['parameters'][$lastParam])) {
                     $property['parameters'][$lastParam] = $value;
                 } elseif (is_array($property['parameters'][$lastParam])) {
@@ -402,21 +419,25 @@ protected function readProperty(string $line)
                         $value,
                     ];
                 }
+                $lastToken = self::TOKEN_PARAMVALUE;
                 continue;
             }
             if (isset($match['paramName'])) {
                 $lastParam = strtoupper($match['paramName']);
                 if (!isset($property['parameters'][$lastParam])) {
                     $property['parameters'][$lastParam] = null;
                 }
+                $lastToken = self::TOKEN_PARAMNAME;
                 continue;
             }
             if (isset($match['propValue'])) {
                 $property['value'] = $match['propValue'];
+                $lastToken = self::TOKEN_PROPVALUE;
                 continue;
             }
             if (isset($match['name']) && 0 < strlen($match['name'])) {
                 $property['name'] = strtoupper($match['name']);
+                $lastToken = self::TOKEN_PROPNAME;
                 continue;
             }
 

tests/VObject/Parser/MimeDirTest.php

@@ -276,4 +276,21 @@ public function testPropertyName0(): void
         $vevent = $mimeDir->parse($iCal);
         self::assertEquals('test', $vevent->VEVENT->{0}->getValue());
     }
+
+    public function testInvalidParameter(): void
+    {
+        $this->expectException(ParseException::class);
+        $this->expectExceptionMessage('Invalid Mimedir file. Line starting at 3: Missing parameter name for parameter value "value2"');
+        $vcard = <<<EOF
+BEGIN:VCARD
+VERSION:4.0
+FN;P1=value1; P2=value2:value
+UID:1234
+END:VCARD
+EOF;
+        $mimeDir = new MimeDir();
+        $vcard = $mimeDir->parse($vcard);
+
+        echo $vcard->serialize();
+    }
 }