[Calendar] Fix unfolding issue (#42)

Co-authored-by: Ren Xie Liu <ren.xie@proton.ch>
ProtonMail · Feb 10, 2022 · 5479bba · 5479bba
1 parent eaba674
commit 5479bba
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 2 deletions.
diff --git a/lib/Parser/MimeDir.php b/lib/Parser/MimeDir.php
@@ -9,6 +9,7 @@
 use Sabre\VObject\EofException;
 use Sabre\VObject\Node;
 use Sabre\VObject\ParseException;
+use Sabre\VObject\Reader;
 
 /**
  * MimeDir parser.
@@ -200,15 +201,32 @@ protected function parseLine($line)
             }
             $component = $this->root->createComponent(substr($line, 6), [], false);
 
+            $prevNode = null;
             while (true) {
                 // Reading until we hit END:
                 $line = $this->readLine();
                 if ('END:' === strtoupper(substr($line, 0, 4))) {
                     break;
                 }
-                $result = $this->parseLine($line);
+                try {
+                    $result = $this->parseLine($line);
+                } catch (\Exception $e) {
+                    if (isset($prevNode)
+                        && $e instanceof ParseException && str_contains($e->getMessage(), 'Invalid Mimedir file. Line starting at')
+                        && ($this->options & Reader::OPTION_FIX_UNFOLDING)
+                    ) {
+                        // Fix unfolding
+                        $component->remove($prevNode);
+                        $value = $prevNode->getValue() . ' ' . $line . PHP_EOL;
+                        $prevNode->offsetSet('VALUE', $value);
+                        $prevNode->setValue($value);
+                        $component->add($prevNode);
+                        continue;
+                    }
+                    throw $e;
+                }
                 if ($result) {
-                    $component->add($result);
+                    $prevNode = $component->add($result);
                 }
             }
 

diff --git a/lib/Reader.php b/lib/Reader.php
@@ -26,6 +26,11 @@ class Reader
      */
     const OPTION_IGNORE_INVALID_LINES = 2;
 
+    /**
+     * If this option is turned on, it will fix unfolding parse error by adding empty space.
+     */
+    const OPTION_FIX_UNFOLDING = 4;
+
     /**
      * Parses a vCard or iCalendar object, and returns the top component.
      *

diff --git a/tests/VObject/Parser/UnfoldingTest.php b/tests/VObject/Parser/UnfoldingTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Sabre\VObject\Parser;
+
+use PHPUnit\Framework\TestCase;
+use Sabre\VObject\ParseException;
+use Sabre\VObject\Reader;
+
+class UnfoldingTest extends TestCase
+{
+    public function testFixUnfoldingICS()
+    {
+        $vcard = <<<ICS
+BEGIN:VCALENDAR
+BEGIN:VEVENT
+DTEND;TZID=America/Edmonton:20181212T112000
+LAST-MODIFIED:20181128T171443Z
+UID:071597C2-0692-4B67-9C8C-3FC0FEABB9E6
+DTSTAMP:20181211T181642Z
+LOCATION: test
+SEQUENCE:0
+SUMMARY:test
+DTSTART;TZID=America/Edmonton:20181212T102000
+CREATED:20171107T180706Z
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI;X-ADDRESS=221-501 BBBBBB BBbbb\\nSs
+ sssss BBBBB XXXXX\\nAAAAA AAAA AB AA B\\nCCCCC;X-APPLE-ABUID=
+ ab://Trent%E2%80%99s%20Work";X-APPLE-REFERENCEFRAME=1;X-TITLE=111-111 Ww 
+ xxxx xxxx
+aabbabc aabbabc xxxaaaccc 
+hahaha eeeee UU WW PPP 
+Canada:geo:11.11111,-111.111111
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $mimeDir = new MimeDir();
+        $vcard = $mimeDir->parse($vcard, Reader::OPTION_FIX_UNFOLDING);
+
+        $this->assertNotNull($vcard->children()[0]->{'X-APPLE-STRUCTURED-LOCATION'}->getValue());
+    }
+
+    public function testNotFixUnfolding()
+    {
+        $this->expectException(ParseException::class);
+
+        $vcard = <<<ICS
+BEGIN:VCALENDAR
+BEGIN:VEVENT
+DTEND;TZID=America/Edmonton:20181212T112000
+LAST-MODIFIED:20181128T171443Z
+UID:071597C2-0692-4B67-9C8C-3FC0FEABB9E6
+DTSTAMP:20181211T181642Z
+LOCATION: test
+SEQUENCE:0
+SUMMARY:test
+DTSTART;TZID=America/Edmonton:20181212T102000
+CREATED:20171107T180706Z
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI;X-ADDRESS=221-501 BBBBBB BBbbb\\nSs
+ sssss BBBBB XXXXX\\nAAAAA AAAA AB AA B\\nCCCCC;X-APPLE-ABUID=
+ ab://Trent%E2%80%99s%20Work";X-APPLE-REFERENCEFRAME=1;X-TITLE=111-111 Ww 
+ xxxx xxxx
+aabbabc aabbabc xxxaaaccc 
+hahaha eeeee UU WW PPP 
+Canada:geo:11.11111,-111.111111
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        (new MimeDir())->parse($vcard);
+    }
+
+    public function testNotFixUnknownProperty()
+    {
+        $vcard = <<<ICS
+BEGIN:VCALENDAR
+BEGIN:VEVENT
+DTEND;TZID=America/Edmonton:20211111T200000
+X-APPLE-STRUCTURED-LOCATION;VALUE=URI;X-ADDRESS=111 11111 xxxxxxxx xx 111
+ \\nLllll cccccc xx xxx xxx\\nCanada;X-APPLE-RADIUS=100;X-APPLE-REFERENCE
+ FRAME=1;X-TITLE=111 11111 xxxxx xx 111:geo:11.111111,-111.111111
+UID:25A069F7-5FAA-48FB-BA3E-01CAFC4A1814
+DTSTAMP:20211112T020041Z
+LOCATION:test
+DESCRIPTION:test
+SEQUENCE:0
+CONFERENCE;VALUE=URI:tel://(111)%11111-1111
+SUMMARY:test
+LAST-MODIFIED:20211110T132821Z
+CREATED:20211110T132805Z
+DTSTART;TZID=America/Edmonton:20211111T190000
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $vcard = (new MimeDir())->parse($vcard);
+
+        $this->assertNotNull($vcard->children()[0]->CONFERENCE->getValue());
+    }
+}