Request 3345 (review)

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz/bin/delete-device.php Changed

kolab-syncroton-2.4.2.tar.gz/bin/inspect.php Changed

@@ -78,6 +78,7 @@
     'e' => 'email',
     'p' => 'adminpassword',
     'd' => 'debug',
+    'k' => 'dump'
 );
 
 if (empty($opts'email')) {
@@ -99,14 +100,35 @@
 
 $rcube = rcube::get_instance();
 $default_port = $rcube->config->get('default_port', 143);
-$default_host = $rcube->config->get('default_host');
+
+$host = $rcube->config->get('imap_host', $rcube->config->get('default_host'));
+
+// parse $host
+$a_host = parse_url($host);
+$port = null;
+$ssl = null;
+if (!empty($a_host'host')) {
+    $host = $a_host'host';
+    $ssl = (isset($a_host'scheme') && in_array($a_host'scheme', 'ssl','imaps','tls')) ? $a_host'scheme' : null;
+    if (!empty($a_host'port')) {
+        $port = $a_host'port';
+    } elseif ($ssl && $ssl != 'tls' && (!$default_port || $default_port == 143)) {
+        $port = 993;
+    }
+}
+
+if (!$port) {
+    $port = $default_port;
+}
+
 $imap = new \rcube_imap_generic();
 if ($proxyAuth) {
     $options'auth_cid' = $user;
     $options'auth_pw' = $password;
 }
 $options'auth_type' = 'PLAIN';
-$options'port' = $default_port;
+$options'port' = $port;
+
 $options'socket_options' = 
     'ssl' => 
         'verify_peer_name' => false,
@@ -121,7 +143,7 @@
 $debug = !empty($opts'debug');
 
 $imap->setDebug($debug);
-if (!$imap->connect($default_host, $email, $password, $options)) {
+if (!$imap->connect($host, $email, $password, $options)) {
     rcube::raise_error("Failed to connect to imap.", false, true);
 }
 
@@ -131,8 +153,10 @@
 $select = $db->query(
     "SELECT `user_id` FROM `users`"
     . " WHERE `username` = ?"
+    . " AND `mail_host` = ?"
     . " ORDER BY `user_id` DESC",
-    \strtolower($email)
+    \strtolower($email),
+    \strtolower($host)
 );
 
 if ($data = $db->fetch_assoc($select)) {
@@ -260,6 +284,23 @@
     return "Unknown value: $value";
 }
 
+
+function getContentIds($db, $device_id, $folder_id)
+{
+    $contentSelect = $db->query(
+        "SELECT contentid FROM `syncroton_content`"
+        . " WHERE `device_id` = ? AND `folder_id` = ? AND `is_deleted` = 0",
+        $device_id,
+        $folder_id
+    );
+
+    $contentUids = ;
+    while ($content = $db->fetch_assoc($contentSelect)) {
+        $contentUids = $content'contentid';
+    }
+    return $contentUids;
+}
+
 function getContentUids($db, $device_id, $folder_id)
 {
     $contentSelect = $db->query(
@@ -311,6 +352,41 @@
         println("    Number of syncs: " . ($folder'counter' ?? "None"));
         println("    Filter type: " . filterType($folder'lastfiltertype' ?? null));
 
+
+        if (!empty($opts'dump') && $opts'dump' == $folder'name') {
+            $contentUids = getContentUids($db, $deviceId, $folderId);
+            $imapUids = getImapUids($imap, $folder'name', $folder'lastfiltertype' ?? null);
+
+            $entries = array_diff($imapUids, $contentUids);
+            if (!empty($entries)) {
+                println("       The following messages are on the server, but not the device:");
+                foreach ($entries as $uid) {
+                    println("           $uid");
+                    //TODO get details from imap?
+                }
+            }
+
+            $entries = array_diff($contentUids, $imapUids);
+            if (!empty($entries)) {
+                println("       The following messages are on the device, but not the server:");
+                foreach ($entries as $uid) {
+                    println("           $uid");
+                    //TODO get details from the content part?
+                    //TODO display creation_synckey?
+                }
+            }
+
+            $contentUids = getContentUids($db, $deviceId, $folderId);
+            foreach (array_slice($contentUids, -10, 10) as $uid) {
+                println($uid);
+            }
+
+            $contentIds = getContentIds($db, $deviceId, $folderId);
+            foreach (array_slice($contentIds, -10, 10) as $uid) {
+                println($uid);
+            }
+        }
+
         if (($folder'class' == "Email") && ($folder'counter' ?? false) && $messageCount != $totalCount && ($modseq == "none" || $modseq == $imapModseq)) {
             if (($folder'lastfiltertype' ?? false) && $messageCount > $totalCount) {
                 // This doesn't have to indicate an issue, since the timewindow of the filter wanders, so some messages that have been synchronized may no longer match the window.

kolab-syncroton-2.4.2.tar.gz/config/config.inc.php.dist Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/SendMail.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/SmartForward.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/SmartReply.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/Email.php Changed

@@ -31,7 +31,7 @@
      * (non-PHPdoc)
      * @see Syncroton_Data_IDataEmail::forwardEmail()
      */
-    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime)
+    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId)
     {
         if ($inputStream == 'triggerException') {
             throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAILBOX_SERVER_OFFLINE);
@@ -59,7 +59,7 @@
      * (non-PHPdoc)
      * @see Syncroton_Data_IDataEmail::replyEmail()
      */
-    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime)
+    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId)
     {
         // forward email
     }
@@ -78,7 +78,7 @@
      * (non-PHPdoc)
      * @see Syncroton_Data_IDataEmail::sendEmail()
      */
-    public function sendEmail($inputStream, $saveInSent)
+    public function sendEmail($inputStream, $saveInSent, $clientId)
     {
         if ($inputStream == 'triggerException') {
             throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAILBOX_SERVER_OFFLINE);

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/IDataEmail.php Changed

@@ -21,26 +21,31 @@
     /**
      * send an email
      *
-     * @param  resource  $inputStream
-     * @param  boolean   $saveInSent
+     * @param resource $inputStream
+     * @param bool     $saveInSent
+     * @param ?string  $clientId
      */
-    public function sendEmail($inputStream, $saveInSent);
+    public function sendEmail($inputStream, $saveInSent, $clientId);
 
     /**
      * forward an email
      *
-     * @param  string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
-     * @param  string        $inputStream
-     * @param  string        $saveInSent
+     * @param string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
+     * @param string        $inputStream
+     * @param string        $saveInSent
+     * @param bool          $replaceMime
+     * @param ?string       $clientId
      */
-    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime);
+    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId);
 
     /**
      * reply to an email
      *
-     * @param  string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
-     * @param  string        $inputStream
-     * @param  string        $saveInSent
+     * @param string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
+     * @param string        $inputStream
+     * @param string        $saveInSent
+     * @param bool          $replaceMime
+     * @param ?string       $clientId
      */
-    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime);
+    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId);
 }

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

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

@@ -30,6 +30,9 @@
 {
     public const MAX_SEARCH_RESULT = 200;
 
+    protected const MAIL_SUBMITTED = 1;
+    protected const MAIL_DONE = 2;
+
     /**
      * Mapping from ActiveSync Email namespace fields
      */
@@ -510,9 +513,13 @@
         $is_ios = preg_match('/(iphone|ipad)/i', $this->device->devicetype);
 
         // attachments
-        $attachments = array_merge($message->attachments, $message->inline_parts);
+        $attachments = $message->attachments;
+        if (isset($message->inline_parts)) {
+            $attachments = array_merge($attachments, $message->inline_parts);
+        }
         if (!empty($attachments)) {
             $result'attachments' = ;
+            $attachment_ids = ;
 
             foreach ($attachments as $attachment) {
                 $att = ;
@@ -521,28 +528,37 @@
                     continue;
                 }
 
+                // Eliminate possible duplicates in $attachments
+                if (in_array($attachment->mime_id, $attachment_ids)) {
+                    continue;
+                }
+
                 $filename = rcube_charset::clean($attachment->filename);
                 if (empty($filename) && $attachment->mimetype == 'text/html') {
                     $filename = 'HTML Part';
                 }
 
-                $att'displayName'   = $filename;
+                $att'displayName' = $filename;
                 $att'fileReference' = $serverId . '::' . $attachment->mime_id;
-                $att'method'        = 1;
+                // Message/rfc822 parts have Method=5, anything else Method=1
+                // FIXME: Method=6 is for OLE objects, but is it inline images or sth else?
+                $att'method' = strcasecmp($attachment->mimetype, 'message/rfc822') === 0 ? 5 : 1;
                 $att'estimatedDataSize' = $attachment->size;
 
                 if (!empty($attachment->content_id)) {
                     $att'contentId' = rcube_charset::clean($attachment->content_id);
                 }
+
                 if (!empty($attachment->content_location)) {
                     $att'contentLocation' = rcube_charset::clean($attachment->content_location);
                 }
 
-                if (in_array($attachment, $message->inline_parts)) {
+                if (strcasecmp($attachment->disposition, 'inline') === 0) {
                     $att'isInline' = 1;
                 }
 
                 $result'attachments' = new Syncroton_Model_EmailAttachment($att);
+                $attachment_ids = $attachment->mime_id;
             }
         }
 
@@ -813,30 +829,44 @@
      * Send an email
      *
      * @param mixed   $message    MIME message
-     * @param boolean $saveInSent Enables saving the sent message in Sent folder
+     * @param bool    $saveInSent Enables saving the sent message in Sent folder
+     * @param ?string $clientId   Message client-id
      *
      * @throws Syncroton_Exception_Status
      */
-    public function sendEmail($message, $saveInSent)
+    public function sendEmail($message, $saveInSent, $clientId)
     {
+        if (($status = $this->sentMailStatus($clientId, $cache, $cache_key)) === self::MAIL_DONE) {
+            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MESSAGE_PREVIOUSLY_SENT);
+        }
+
         if (!($message instanceof kolab_sync_message)) {
             $message = new kolab_sync_message($message);
         }
 
-        $sent = $message->send($smtp_error);
+        // Snet the message (if not sent previously)
+        if (!$status) {
+            $sent = $message->send($smtp_error);
 
-        if (!$sent) {
-            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAIL_SUBMISSION_FAILED);
+            if (!$sent) {
+                throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAIL_SUBMISSION_FAILED);
+            }
+
+            if (!empty($cache)) {
+                $cache->set($cache_key, self::MAIL_SUBMITTED);
+            }
         }
 
         // Save sent message in Sent folder
         if ($saveInSent) {
-            $sent_folder = kolab_sync::get_instance()->config->get('sent_mbox');
-
-            if (strlen($sent_folder) && $this->storage->folder_exists($sent_folder)) {
-                return $this->storage->save_message($sent_folder, $message->source(), '', false, 'SEEN');
+            if (!$message->saveInSent()) {
+                throw new Syncroton_Exception_Status(Syncroton_Exception_Status::SERVER_ERROR);
             }
         }
+
+        if (!empty($cache)) {
+            $cache->set($cache_key, self::MAIL_DONE);
+        }
     }
 
     /**
@@ -845,13 +875,18 @@
      * @param array|string    $itemId      A string LongId or an array with following properties:
      *                                     collectionId, itemId and instanceId
      * @param resource|string $body        MIME message
-     * @param boolean         $saveInSent  Enables saving the sent message in Sent folder
-     * @param boolean         $replaceMime If enabled, original message would be appended
+     * @param bool            $saveInSent  Enables saving the sent message in Sent folder
+     * @param bool            $replaceMime If enabled, original message would be appended
+     * @param ?string         $clientId    Message client-id
      *
      * @throws Syncroton_Exception_Status
      */
-    public function forwardEmail($itemId, $body, $saveInSent, $replaceMime)
+    public function forwardEmail($itemId, $body, $saveInSent, $replaceMime, $clientId)
     {
+        if ($this->sentMailStatus($clientId) === self::MAIL_DONE) {
+            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MESSAGE_PREVIOUSLY_SENT);
+        }
+
         /*
         @TODO:
         The SmartForward command can be applied to a meeting. When SmartForward is applied to a recurring meeting,
@@ -893,7 +928,7 @@
         }
 
         // Send message
-        $this->sendEmail($sync_msg, $saveInSent);
+        $this->sendEmail($sync_msg, $saveInSent, $clientId);
 
         // Set FORWARDED flag on the replied message
         if (empty($message->headers->flags'FORWARDED')) {
@@ -908,13 +943,18 @@
      * @param array|string    $itemId      A string LongId or an array with following properties:
      *                                     collectionId, itemId and instanceId
      * @param resource|string $body        MIME message
-     * @param boolean         $saveInSent  Enables saving the sent message in Sent folder
-     * @param boolean         $replaceMime If enabled, original message would be appended
+     * @param bool            $saveInSent  Enables saving the sent message in Sent folder
+     * @param bool            $replaceMime If enabled, original message would be appended
+     * @param ?string         $clientId    Message client-id
      *
      * @throws Syncroton_Exception_Status
      */
-    public function replyEmail($itemId, $body, $saveInSent, $replaceMime)
+    public function replyEmail($itemId, $body, $saveInSent, $replaceMime, $clientId)
     {
+        if ($this->sentMailStatus($clientId) === self::MAIL_DONE) {
+            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MESSAGE_PREVIOUSLY_SENT);
+        }
+
         $msg     = $this->parseMessageId($itemId);
         $message = $this->getObject($itemId);
 
@@ -944,7 +984,7 @@
         }
 
         // Send message
-        $this->sendEmail($sync_msg, $saveInSent);
+        $this->sendEmail($sync_msg, $saveInSent, $clientId);
 
         // Set ANSWERED flag on the replied message
         if (empty($message->headers->flags'ANSWERED')) {
@@ -1568,4 +1608,27 @@
             return kolab_sync_message::fake_message($headers, $msg);
         }
     }
+
+    /**
+     * Check in the cache if specified message (client-id) has been previously processed
+     * and with what result. It's used to prevent a duplicate submission.
+     */
+    protected function sentMailStatus($clientId, &$cache = null, &$cache_key = null)
+    {
+        // Note: ClientId is set with ActiveSync version >= 14.0
+        if ($clientId === null || $clientId === '') {
+            return 0;
+        }
+
+        $engine = kolab_sync::get_instance();
+        $status = null;
+        $cache_key = "ClientId:{$clientId}";
+
+        if ($cache_type = $engine->config->get('activesync_cache', 'db')) {
+            $cache = $engine->get_cache('activesync_cache', $cache_type, '1d', false);
+            $status = $cache->get($cache_key);
+        }
+
+        return (int) $status;
+    }
 }

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

@@ -216,13 +216,21 @@
         unset($smtp_headers'Bcc');
 
         // send message
-        if (!is_object($rcube->smtp)) {
-            $rcube->smtp_init(true);
-        }
+        if (isset($headers'X-Syncroton-Test')
+            && preg_match('/smtp=(true|false)/i', $headers'X-Syncroton-Test', $m)
+        ) {
+            $sent = $m1 == 'true';
+            $smtp_response = ;
+            $smtp_error = 999;
+        } else {
+            if (!is_object($rcube->smtp)) {
+                $rcube->smtp_init(true);
+            }
 
-        $sent = $rcube->smtp->send_mail($headers'From', $recipients, $smtp_headers, $this->body, $smtp_opts);
-        $smtp_response = $rcube->smtp->get_response();
-        $smtp_error    = $rcube->smtp->get_error();
+            $sent = $rcube->smtp->send_mail($headers'From', $recipients, $smtp_headers, $this->body, $smtp_opts);
+            $smtp_response = $rcube->smtp->get_response();
+            $smtp_error    = $rcube->smtp->get_error();
+        }
 
         // log error
         if (!$sent) {
@@ -261,6 +269,38 @@
     }
 
     /**
+     * Save message in Sent folder
+     *
+     * @return bool True on success (or when the folder does not exist), False otherwise
+     */
+    public function saveInSent()
+    {
+        $engine = kolab_sync::get_instance();
+        $storage = $engine->get_storage();
+        $sent_folder = $engine->config->get('sent_mbox');
+
+        if (isset($this->headers'X-Syncroton-Test')
+            && preg_match('/imap=(true|false)/i', $this->headers'X-Syncroton-Test', $m)
+        ) {
+            return $m1 == 'true';
+        }
+
+        if (strlen($sent_folder) && $storage->folder_exists($sent_folder)) {
+            $source = $this->source();
+            $uid = $storage->save_message($sent_folder, $source, '', false, 'SEEN');
+
+            if (empty($uid)) {
+                rcube::raise_error('code' => 500, 'type' => 'imap',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Failed to save message in {$sent_folder}", true, false);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
      * Parses the message source and fixes 8bit data for ActiveSync.
      * This way any not UTF8 characters will be encoded before
      * sending to the device.

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

kolab-syncroton-2.4.2.tar.gz/tests/Sync/SendMailTest.php Added

@@ -0,0 +1,112 @@
+<?php
+
+class SendMailTest extends Tests\SyncTestCase
+{
+    /**
+     * Test SendMail command
+     */
+    public function testSendMail()
+    {
+        $this->emptyTestFolder('Sent', 'mail');
+
+        $clientId = microtime();
+
+        $request = <<<EOF
+            <?xml version="1.0" encoding="utf-8"?>
+            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
+            <SendMail xmlns="uri:ComposeMail">
+                <ClientId>{$clientId}</ClientId>
+                <SaveInSentItems />
+                <Mime>From: testuser1@kolab.org
+            To: testuser2@kolab.org
+            Subject: Test
+            MIME-Version: 1.0
+            Content-Type: text/plain; charset="iso-8859-1"
+            Message-ID: &lt;msg1@kolab.org&gt;
+            X-Syncroton-Test: smtp=true
+
+            This is the email body content.</Mime>
+            </SendMail>
+            EOF;
+
+        $response = $this->request($request, 'SendMail');
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('', (string) $response->getBody());
+        $emails = $this->listEmails('Sent', '*');
+        $this->assertCount(1, $emails);
+        // TODO: Assert mail content
+    }
+
+    /**
+     * Test SendMail command
+     */
+    public function testSendMailErrorHandling()
+    {
+        $this->emptyTestFolder('Sent', 'mail');
+
+        $clientId = microtime();
+
+        $request = <<<EOF
+            <?xml version="1.0" encoding="utf-8"?>
+            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
+            <SendMail xmlns="uri:ComposeMail">
+                <ClientId>{$clientId}</ClientId>
+                <SaveInSentItems />
+                <Mime>From: testuser1@kolab.org
+            To: testuser2@kolab.org
+            Subject: Test
+            MIME-Version: 1.0
+            Content-Type: text/plain; charset="iso-8859-1"
+            Message-ID: &lt;msg1@kolab.org&gt;
+            X-Syncroton-Test: smtp=false imap=true
+
+            This is the email body content.</Mime>
+            </SendMail>
+            EOF;
+
+        // Expect a SMTP error
+        $response = $this->request($request, 'SendMail');
+
+        $dom = $this->fromWbxml($response->getBody());
+        $xpath = $this->xpath($dom);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('120', $xpath->query("//ns:SendMail/ns:Status")->item(0)->nodeValue);
+        $this->assertCount(0, $this->listEmails('Sent', '*'));
+
+        // Test IMAP error handling
+        $request = str_replace('smtp=false', 'smtp=true', $request);
+        $request = str_replace('imap=true', 'imap=false', $request);
+
+        $response = $this->request($request, 'SendMail');
+
+        $dom = $this->fromWbxml($response->getBody());
+        $xpath = $this->xpath($dom);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('110', $xpath->query("//ns:SendMail/ns:Status")->item(0)->nodeValue);
+        $this->assertCount(0, $this->listEmails('Sent', '*'));
+
+        // Test no error
+        // smtp=false would cause error, but the submission should get skipped now
+        $request = str_replace('smtp=true', 'smtp=false', $request);
+        $request = str_replace('imap=false', '', $request);
+
+        $response = $this->request($request, 'SendMail');
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('', (string) $response->getBody());
+        $this->assertCount(1, $this->listEmails('Sent', '*'));
+
+        // Send the same mail again, expect an error
+        $response = $this->request($request, 'SendMail');
+
+        $dom = $this->fromWbxml($response->getBody());
+        $xpath = $this->xpath($dom);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('118', $xpath->query("//ns:SendMail/ns:Status")->item(0)->nodeValue);
+        $this->assertCount(1, $this->listEmails('Sent', '*'));
+    }
+}

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/EmailTest.php Changed

@@ -112,29 +112,7 @@
         $this->assertSame('test sync', $xpath->query("{$root}/ns:ApplicationData/Email:Subject")->item(0)->nodeValue);
 
         // List the rest of the mail
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Sync xmlns="uri:AirSync" xmlns:AirSyncBase="uri:AirSyncBase">
-                <Collections>
-                    <Collection>
-                        <SyncKey>{$syncKey}</SyncKey>
-                        <CollectionId>{$folderId}</CollectionId>
-                        <DeletesAsMoves>1</DeletesAsMoves>
-                        <GetChanges>1</GetChanges>
-                        <Options>
-                            <FilterType>0</FilterType>
-                            <Conflict>1</Conflict>
-                            <BodyPreference xmlns="uri:AirSyncBase">
-                                <Type>2</Type>
-                                <TruncationSize>51200</TruncationSize>
-                                <AllOrNone>0</AllOrNone>
-                            </BodyPreference>
-                        </Options>
-                    </Collection>
-                </Collections>
-            </Sync>
-            EOF;
+        $request = preg_replace('|<SyncKey>\d</SyncKey>|', "<SyncKey>{$syncKey}</SyncKey>", $request);
 
         $response = $this->request($request, 'Sync');
 
@@ -155,6 +133,41 @@
         $this->assertStringMatchesFormat("{$folderId}::%d", $xpath->query("{$root}/ns:ServerId")->item(0)->nodeValue);
         $this->assertSame('sync test with attachment', $xpath->query("{$root}/ns:ApplicationData/Email:Subject")->item(0)->nodeValue);
         $this->assertSame(1, $xpath->query("{$root}/ns:ApplicationData/AirSyncBase:Body")->count());
+        $attachments = $xpath->query("{$root}/ns:ApplicationData/AirSyncBase:Attachments/AirSyncBase:Attachment");
+        $this->assertSame(3, $attachments->count());
+        $att = $attachments->item(0);
+        $this->assertSame('message.eml', $xpath->query('AirSyncBase:DisplayName', $att)->item(0)->nodeValue);
+        $this->assertSame('5', $xpath->query('AirSyncBase:Method', $att)->item(0)->nodeValue);
+        $this->assertSame('63', $xpath->query('AirSyncBase:EstimatedDataSize', $att)->item(0)->nodeValue);
+        $this->assertSame(0, $xpath->query('AirSyncBase:IsInline', $att)->count());
+        $att = $attachments->item(1);
+        $this->assertSame('logo1.gif', $xpath->query('AirSyncBase:DisplayName', $att)->item(0)->nodeValue);
+        $this->assertSame('1', $xpath->query('AirSyncBase:Method', $att)->item(0)->nodeValue);
+        $this->assertSame('76', $xpath->query('AirSyncBase:EstimatedDataSize', $att)->item(0)->nodeValue);
+        $this->assertSame(0, $xpath->query('AirSyncBase:IsInline', $att)->count());
+        $att = $attachments->item(2);
+        $this->assertSame('logo2.gif', $xpath->query('AirSyncBase:DisplayName', $att)->item(0)->nodeValue);
+        $this->assertSame('1', $xpath->query('AirSyncBase:Method', $att)->item(0)->nodeValue);
+        $this->assertSame('76', $xpath->query('AirSyncBase:EstimatedDataSize', $att)->item(0)->nodeValue);
+        $this->assertSame('1', $xpath->query('AirSyncBase:IsInline', $att)->item(0)->nodeValue);
+        $this->assertSame('foo4foo1@bar.net', $xpath->query('AirSyncBase:ContentId', $att)->item(0)->nodeValue);
+        $this->assertSame('fiction1/fiction2', $xpath->query('AirSyncBase:ContentLocation', $att)->item(0)->nodeValue);
+
+        // Test the empty Sync response
+        $request = preg_replace('|<SyncKey>\d</SyncKey>|', "<SyncKey>{$syncKey}</SyncKey>", $request);
+
+        $response = $this->request($request, 'Sync');
+
+        // According to https://learn.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-ascmd/b4b366a5-7dfb-45a9-a256-af8fa7c53400
+        // the empty response should look like this
+        //
+        // HTTP/1.1 200 OK
+        // Date: Fri, 10 Apr 2009 20:32:39 GMT
+        // Content-Length: 0
+
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('', (string) $response->getBody());
+        $this->assertSame('0', $response->getHeader('Content-Length'));
 
         return $syncKey;
     }

kolab-syncroton-2.4.2.tar.gz/tests/SyncTestCase.php Changed

@@ -294,7 +294,7 @@
 
         // Make sure user is authenticated
         $this->getImapStorage();
-        if (!empty($sync->user)) {
+        if ($sync->user) {
             // required e.g. for DAV client cache use
             \rcube::get_instance()->user = $sync->user;
         }
@@ -418,6 +418,7 @@
         $xpath->registerNamespace("AirSyncBase", "uri:AirSyncBase");
         $xpath->registerNamespace("Calendar", "uri:Calendar");
         $xpath->registerNamespace("Contacts", "uri:Contacts");
+        $xpath->registerNamespace("ComposeMail", "uri:ComposeMail");
         $xpath->registerNamespace("Email", "uri:Email");
         $xpath->registerNamespace("Email2", "uri:Email2");
         $xpath->registerNamespace("Settings", "uri:Settings");
@@ -443,7 +444,7 @@
         if (method_exists("PHPUnit\Framework\TestCase", "assertMatchesRegularExpression")) {
             parent::assertMatchesRegularExpression($arg1, $arg2, $message);
         } else {
-            parent::assertRegExp($arg1, $arg2);
+            parent::assertRegExp($arg1, $arg2, $message);
         }
     }
 }

kolab-syncroton-2.4.2.tar.gz/tests/src/mail.sync2 Changed

kolab-syncroton.dsc Changed

Overview

Request 3345 (review)

Request History