Request 3189 (accepted)

kolab-syncroton.spec Changed

buildtarball.sh Changed

debian.changelog Changed

kolab-syncroton-2.4.1.tar.gz/lib/ext/Syncroton/Server.php -> kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Server.php Changed

@@ -123,10 +123,11 @@
                 $decoder = new Syncroton_Wbxml_Decoder($this->_body);
                 $requestBody = $decoder->decode();
                 if ($this->_logger instanceof Zend_Log) {
-                    $requestBody->formatOutput = true;
-                    $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " xml request:\n" . $requestBody->saveXML());
+                    $this->_logDomDocument($requestBody, 'request', __METHOD__, __LINE__);
                 }
             } catch(Syncroton_Wbxml_Exception_UnexpectedEndOfFile $e) {
+                if ($this->_logger instanceof Zend_Log)
+                    $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " unexpected end of file.");
                 $requestBody = NULL;
             }
         } else {
@@ -174,7 +175,7 @@
         
         if ($response instanceof DOMDocument) {
             if ($this->_logger instanceof Zend_Log) {
-                $this->_logDomDocument(Zend_Log::DEBUG, $response, __METHOD__, __LINE__);
+                $this->_logDomDocument($response, 'response', __METHOD__, __LINE__);
             }
             
             if (isset($command) && $command instanceof Syncroton_Command_ICommand) {
@@ -244,13 +245,17 @@
     /**
      * write (possible big) DOMDocument in smaller chunks to log file
      * 
-     * @param int         $priority
      * @param DOMDocument $dom
+     * @param string      $action
      * @param string      $method
      * @param int         $line
      */
-    protected function _logDomDocument($priority, DOMDocument $dom, $method, $line)
+    protected function _logDomDocument(DOMDocument $dom, $action, $method, $line)
     {
+        if (method_exists($this->_logger, 'hasDebug') && !$this->_logger->hasDebug()) {
+            return;
+        }
+
         $tempStream = tmpfile();
 
         $meta_data = stream_get_meta_data($tempStream);
@@ -261,8 +266,12 @@
         $dom->formatOutput = false;
         
         rewind($tempStream);
-        
-        $this->_logger->log($method . '::' . $line . " xml response(first 4k):\n" . fread($tempStream, 4 * 1024), $priority);
+
+        $loops = 0;
+        while (!feof($tempStream)) {
+            $this->_logger->debug("{$method}::{$line} xml {$action} ({$loops}):\n" . fread($tempStream, 1048576));
+            $loops++;
+        }
         
         fclose($tempStream);
     }

kolab-syncroton-2.4.1.tar.gz/lib/ext/Syncroton/Wbxml/Exception/UnexpectedEndOfFile.php -> kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Exception/UnexpectedEndOfFile.php Changed

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync.php Changed

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_backend.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_backend.php Changed

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_data.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data.php Changed

@@ -1771,35 +1771,39 @@
         $ex_list = array();
 
         // exceptions (modified occurences)
-        foreach ((array)$data'recurrence''EXCEPTIONS' as $exception) {
-            $exception'_mailbox' = $data'_mailbox';
+        if (!empty($data'recurrence''EXCEPTIONS')) {
+            foreach ((array)$data'recurrence''EXCEPTIONS' as $exception) {
+                $exception'_mailbox' = $data'_mailbox';
 
-            $ex   = $this->getEntry($collection, $exception, true);
-            $date = clone ($exception'recurrence_date' ?: $ex'startTime');
+                $ex   = $this->getEntry($collection, $exception, true);
+                $date = clone ($exception'recurrence_date' ?: $ex'startTime');
 
-            $ex'exceptionStartTime' = self::set_exception_time($date, $data'_start');
+                $ex'exceptionStartTime' = self::set_exception_time($date, $data'_start');
 
-            // remove fields not supported by Syncroton_Model_EventException
-            unset($ex'uID');
+                // remove fields not supported by Syncroton_Model_EventException
+                unset($ex'uID');
 
-            // @TODO: 'thisandfuture=true' is not supported in Activesync
-            // we'd need to slit the event into two separate events
+                // @TODO: 'thisandfuture=true' is not supported in Activesync
+                // we'd need to slit the event into two separate events
 
-            $ex_list = new Syncroton_Model_EventException($ex);
+                $ex_list = new Syncroton_Model_EventException($ex);
+            }
         }
 
         // exdate (deleted occurences)
-        foreach ((array)$data'recurrence''EXDATE' as $exception) {
-            if (!($exception instanceof DateTime)) {
-                continue;
-            }
+        if (!empty($data'recurrence''EXDATE')) {
+            foreach ((array)$data'recurrence''EXDATE' as $exception) {
+                if (!($exception instanceof DateTime)) {
+                    continue;
+                }
 
-            $ex = array(
-                'deleted'            => 1,
-                'exceptionStartTime' => self::set_exception_time($exception, $data'_start'),
-            );
+                $ex = array(
+                    'deleted'            => 1,
+                    'exceptionStartTime' => self::set_exception_time($exception, $data'_start'),
+                );
 
-            $ex_list = new Syncroton_Model_EventException($ex);
+                $ex_list = new Syncroton_Model_EventException($ex);
+            }
         }
 
         return $ex_list;

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_data_calendar.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -185,20 +185,9 @@
         $config = $this->getFolderConfig($event'_mailbox');
         $result = array();
 
-        // Timezone
         // Kolab Format 3.0 and xCal does support timezone per-date, but ActiveSync allows
         // only one timezone per-event. We'll use timezone of the start date
-        if ($event'start' instanceof DateTime) {
-            $timezone = $event'start'->getTimezone();
-
-            if ($timezone && ($tz_name = $timezone->getName()) != 'UTC') {
-                $tzc = kolab_sync_timezone_converter::getInstance();
-
-                if ($tz_name = $tzc->encodeTimezone($tz_name, $event'start'->format('Y-m-d'))) {
-                    $result'timezone' = $tz_name;
-                }
-            }
-        }
+        $result'timezone' = kolab_sync_timezone_converter::encodeTimezoneFromDate($event'start');
 
         // Calendar namespace fields
         foreach ($this->mapping as $key => $name) {
@@ -332,7 +321,7 @@
         }
 
         // Event meeting status
-        $this->meeting_status_from_kolab($collection, $event, $result);
+        $this->meeting_status_from_kolab($event, $result);
 
         // Recurrence (and exceptions)
         $this->recurrence_from_kolab($collection, $event, $result);
@@ -356,8 +345,23 @@
      */
     public function toKolab(Syncroton_Model_IEntry $data, $folderid, $entry = null, $timezone = null)
     {
+        $foldername = isset($entry'_mailbox') ? $entry'_mailbox' : $this->getFolderName($folderid);
+        if (empty($entry)) {
+            // If we don't have an existing event (not a modification) we nevertheless check for conflicts.
+            // This is necessary so we don't overwrite the server-side copy in case the client did not have it available
+            // when generating an Add command.
+            try {
+                $folder = $this->getFolderObject($foldername);
+                $entry = $folder->get_object($data->uID);
+
+                if ($entry) {
+                    $this->logger->debug('Found and existing event for UID: ' . $data->uID);
+                }
+            } catch (Exception $e) {
+                // uID is not available on exceptions, so we guard for that and silently ignore.
+            }
+        }
         $event        = !empty($entry) ? $entry : array();
-        $foldername   = isset($event'_mailbox') ? $event'_mailbox' : $this->getFolderName($folderid);
         $config       = $this->getFolderConfig($foldername);
         $is_exception = $data instanceof Syncroton_Model_EventException;
         $dummy_tz     = str_repeat('A', 230) . '==';
@@ -386,7 +390,7 @@
         }
 
         if (empty($timezone)) {
-            $timezone = $old_timezone ?: new DateTimeZone('UTC');
+            $timezone = !empty($old_timezone) ? $old_timezone : new DateTimeZone('UTC');
         }
 
         $event'allday' = 0;
@@ -490,10 +494,10 @@
         // this update resets attendee status set in the MeetingResponse request.
         // We ignore changes to attendees data on such updates
         if ($is_outlook && $this->isDummyOutlookUpdate($data, $entry, $event)) {
+            $this->logger->debug('Dummy outlook update detected, ignoring attendee changes.');
             $attendees = $entry'attendees';
         }
         else if (isset($data->attendees)) {
-            $statusMap = array_flip($this->attendeeStatusMap);
             foreach ($data->attendees as $attendee) {
                 if (!empty($organizer_email) && $attendee->email && !strcasecmp($attendee->email, $organizer_email)) {
                     // skip the organizer
@@ -819,10 +823,12 @@
                 $event'attendees'$i'status' = $status;
                 $event'attendees'$i'rsvp'   = false;
                 $event_attendee = $attendee;
+                $this->logger->debug('Updating existing attendee: ' . $attendee'email' . ' status: ' . $status);
             }
         }
 
         if (empty($event_attendee)) {
+            $this->logger->debug('Adding new attendee ' . $emails0 . ' status: ' . $status);
             // Add the user to the attendees list
             $event'attendees' = array(
                 'role'   => 'OPT-PARTICIPANT',
@@ -872,7 +878,7 @@
     /**
      * Set MeetingStatus according to event data
      */
-    protected function meeting_status_from_kolab($collection, $event, &$result)
+    protected function meeting_status_from_kolab($event, &$result)
     {
         // 0 - The event is an appointment, which has no attendees.
         // 1 - The event is a meeting and the user is the meeting organizer.

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_data_email.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_email.php Changed

@@ -118,6 +118,48 @@
     }
 
     /**
+     * Encode a globalObjId according to https://interoperability.blob.core.windows.net/files/MS-ASEMAIL/%5bMS-ASEMAIL%5d-150526.pdf 2.2.2.3
+     *
+     * @param array $data An array with the data to encode
+     *
+     * @return string the encoded globalObjId
+     */
+    public static function encodeGlobalObjId(array $data): string
+    {
+        $classid = "040000008200e00074c5b7101a82e008";
+        $uid = $data'uid';
+        $vcalid = "vCal-Uid\1\0\0\0{$uid}\0";
+
+        $packed = pack(
+            "H32nCCPx8Va*",
+            $classid,
+            $data'year' ?? 0,
+            $data'month' ?? 0,
+            $data'day' ?? 0,
+            $data'now' ?? 0,
+            strlen($vcalid),
+            $vcalid
+        );
+
+        return base64_encode($packed);
+    }
+
+    /**
+     * Decode a globalObjId according to https://interoperability.blob.core.windows.net/files/MS-ASEMAIL/%5bMS-ASEMAIL%5d-150526.pdf 2.2.2.3
+     *
+     * @param string the encoded globalObjId
+     *
+     * @return array An array with the decoded data
+     */
+    public static function decodeGlobalObjId(string $globalObjId): array
+    {
+        $unpackString = 'H32classid/nyear/Cmonth/Cday/Pnow/x8/Vbytecount/a*data';
+        $decoded = unpack($unpackString, base64_decode($globalObjId));
+        $decoded'uid' = substr($decoded'data', strlen("vCal-Uid\1\0\0\0"), -1);
+        return $decoded;
+    }
+
+    /**
      * Creates model object
      *
      * @param Syncroton_Model_SyncCollection $collection Collection data
@@ -339,19 +381,73 @@
         $result'nativeBodyType' = $message->has_html_part() ? 2 : 1;
 
         // Message class
+        $result'messageClass' = 'IPM.Note';
+        $result'contentClass' = 'urn:content-classes:message';
+
         if ($headers->ctype == 'multipart/signed'
-            && count($message->attachments) == 1 && $message->attachments0->mimetype == 'application/pkcs7-signature'
+            && !empty($message->parts1)
+            && $message->parts1->mimetype == 'application/pkcs7-signature'
         ) {
             $result'messageClass' = 'IPM.Note.SMIME.MultipartSigned';
         }
         else if ($headers->ctype == 'application/pkcs7-mime' || $headers->ctype == 'application/x-pkcs7-mime') {
             $result'messageClass' = 'IPM.Note.SMIME';
         }
-        else {
-            $result'messageClass' = 'IPM.Note';
-        }
+        else if ($event = $this->get_invitation_event_from_message($message)) {
+            $result'messageClass' = 'IPM.Schedule.Meeting.Request';
+            $result'contentClass' = 'urn:content-classes:calendarmessage';
+
+            $meeting = array();
+
+            $meeting'allDayEvent' = $event'allday' ?? null ? 1 : 0;
+            $meeting'startTime' = $event'start';
+            $meeting'dtStamp' = $event'created' ?? null;
+            $meeting'endTime' = $event'end' ?? null;
+
+            //TODO implement recurrences. We can't detect exceptions like this (don't know how), and the recurrences structure is different from event,
+            //so that also doesn't work like this.
+            // if (isset($event'recurrence''EXCEPTIONS')) {
+            //     $meeting'instanceType' = Syncroton_Model_EmailMeetingRequest::TYPE_RECURRING_EXCEPTION;
+            //     $this->recurrence_from_kolab($collection, $event, $meeting);
+            // // } else if (isset($event'recurrence')) {
+            // //     $meeting'instanceType' = Syncroton_Model_EmailMeetingRequest::TYPE_RECURRING_SINGLE;
+            // //     $meeting'recurrenceId' = set the date;
+            // } else if (isset($event'recurrence')) {
+            //     $meeting'instanceType' = Syncroton_Model_EmailMeetingRequest::TYPE_RECURRING_MASTER;
+            //     $this->recurrence_from_kolab($collection, $event, $meeting);
+            // } else {
+            //     $meeting'instanceType' = Syncroton_Model_EmailMeetingRequest::TYPE_NORMAL;
+            // }
+            $meeting'instanceType' = Syncroton_Model_EmailMeetingRequest::TYPE_NORMAL;
+
+            $meeting'location' = $event'location' ?? null;
+
+            // Organizer
+            if (!empty($event'attendees')) {
+                foreach ($event'attendees' as $idx => $attendee) {
+                    if ($attendee'role' == 'ORGANIZER') {
+                        if ($email = $attendee'email') {
+                            $meeting'organizer' = $email;
+                        }
+                        break;
+                    }
+                }
+            }
 
-        $result'contentClass' = 'urn:content-classes:message';
+            // Kolab Format 3.0 and xCal does support timezone per-date, but ActiveSync allows
+            // only one timezone per-event. We'll use timezone of the start date
+            $meeting'timeZone' = kolab_sync_timezone_converter::encodeTimezoneFromDate($event'start');
+            $meeting'globalObjId' = self::encodeGlobalObjId('uid' => $event'uid');
+
+            //TODO handle other methods
+            if ($event'_method' == 'REQUEST') {
+                $meeting'meetingMessageType' = Syncroton_Model_EmailMeetingRequest::MESSAGE_TYPE_REQUEST;
+            } else {
+                $meeting'meetingMessageType' = Syncroton_Model_EmailMeetingRequest::MESSAGE_TYPE_NORMAL;
+            }
+
+            $result'meetingRequest' = new Syncroton_Model_EmailMeetingRequest($meeting);
+        }
 
         // Categories (Tags)
         if (isset($this->tag_categories) && $this->tag_categories) {
@@ -584,13 +680,22 @@
      * @param string                 $folderId Folder identifier
      * @param Syncroton_Model_IEntry $entry    Entry
      *
-     * @return array
+     * @return string ID of the created entry
      */
     public function createEntry($folderId, Syncroton_Model_IEntry $entry)
     {
-        // Throw exception here for better handling of unsupported
-        // entry creation, it can be object of class Email or SMS here
-        throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::INVALID_ITEM);
+        // Creating emails is not normally supported like this, but is implemented for testing purposes
+        $foldername = $this->backend->folder_id2name($folderId, $this->device->deviceid);
+
+        $flag = !empty($entry->read) ? 'SEEN' : 'UNSEEN';
+        $uid = $this->storage->save_message($foldername, $entry->body->data, '', false, $flag);
+
+        if (!$uid) {
+            $this->logger->error("Error while storing the message " . $this->storage->get_error_str());
+            throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::SYNC_SERVER_ERROR);
+        }
+
+        return $this->createMessageId($folderId, $uid);
     }
 
     /**
@@ -1265,13 +1370,13 @@
             $entryid = $entryid'itemId';
         }
 
-        // Note: the id might be in a form of <folder>::<uid>::<part_id>
-        list($folderid, $uid) = explode('::', $entryid);
-
-        if (empty($uid)) {
+        if (!is_string($entryid) || !strpos($entryid, '::')) {
             return;
         }
 
+        // Note: the id might be in a form of <folder>::<uid>::<part_id>
+        list($folderid, $uid) = explode('::', $entryid);
+
         $foldername = $this->backend->folder_id2name($folderid, $this->device->deviceid);
 
         if ($foldername === null || $foldername === false) {
@@ -1674,22 +1779,33 @@
     /**
      * Returns calendar event data from the iTip invitation attached to a mail message
      */
+    public function get_invitation_event_from_message($message)
+    {
+        // Parse the message and find iTip attachments
+        $libcal = libcalendaring::get_instance();
+        $libcal->mail_message_load(array('object' => $message));
+        $ical_objects = $libcal->get_mail_ical_objects();
+
+        // We support only one event in the iTip
+        foreach ($ical_objects as $mime_id => $event) {
+            if ($event'_type' == 'event') {
+                $event'_method' = $ical_objects->method;
+                return $event;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns calendar event data from the iTip invitation attached to a mail message
+     */
     public function get_invitation_event($messageId)
     {
         // Get the mail message object
         if ($message = $this->getObject($messageId)) {
-            // Parse the message and find iTip attachments
-            $libcal = libcalendaring::get_instance();
-            $libcal->mail_message_load(array('object' => $message));
-            $ical_objects = $libcal->get_mail_ical_objects();
-
-            // We support only one event in the iTip
-            foreach ($ical_objects as $mime_id => $event) {
-                if ($event'_type' == 'event') {
-                    return $event;
-                }
-            }
+            return $this->get_invitation_event_from_message($message);
         }
+        return null;
     }

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_data_tasks.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_tasks.php Changed

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_logger.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_logger.php Changed

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_message.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_message.php Changed

kolab-syncroton-2.4.1.tar.gz/lib/kolab_sync_timezone_converter.php -> kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_timezone_converter.php Changed

kolab-syncroton-2.4.2.tar.gz/tests/globalid_converter.php Added

@@ -0,0 +1,32 @@
+<?php
+
+require_once "../lib/kolab_sync_data.php";
+require_once "../lib/kolab_sync_data_email.php";
+
+class globalid_converter extends PHPUnit\Framework\TestCase
+{
+    function test_decode()
+    {
+        // https://learn.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-asemail/e7424ddc-dd10-431e-a0b7-5c794863370e
+        $input = 'BAAAAIIA4AB0xbcQGoLgCAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAHZDYWwtVWlkAQAAAHs4MTQxMkQzQy0yQTI0LTRFOUQtQjIwRS0xMUY3QkJFOTI3OTl9AA==';
+        $output = kolab_sync_data_email::decodeGlobalObjId($input);
+
+        $this->assertSame(51, $output'bytecount');
+        $this->assertSame('{81412D3C-2A24-4E9D-B20E-11F7BBE92799}', $output'uid');
+
+        $encoded = kolab_sync_data_email::encodeGlobalObjId($output);
+        $this->assertSame($encoded, $input);
+
+
+        $input = 'BAAAAIIA4AB0xbcQGoLgCAfUCRDgQMnBJoXEAQAAAAAAAAAAEAAAAAvw7UtuTulOnjnjhns3jvM=';
+        $output = kolab_sync_data_email::decodeGlobalObjId($input);
+
+        $this->assertSame(16, $output'bytecount');
+        $this->assertSame(2004, $output'year');
+        $this->assertSame(9, $output'month');
+        $this->assertSame(16, $output'day');
+        //FIXME we don't currently implement non ical uids
+        // $encoded = kolab_sync_data_email::encodeGlobalObjId($output);
+        // $this->assertSame($encoded, $input);
+    }
+}

kolab-syncroton.dsc Changed

Overview

Request 3189 (accepted)

Request History