Request 3350 (accepted)

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz/bin/analyzelogs.php 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,7 +78,6 @@
     'e' => 'email',
     'p' => 'adminpassword',
     'd' => 'debug',
-    'k' => 'dump'
 );
 
 if (empty($opts'email')) {
@@ -100,35 +99,14 @@
 
 $rcube = rcube::get_instance();
 $default_port = $rcube->config->get('default_port', 143);
-
-$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;
-}
-
+$default_host = $rcube->config->get('default_host');
 $imap = new \rcube_imap_generic();
 if ($proxyAuth) {
     $options'auth_cid' = $user;
     $options'auth_pw' = $password;
 }
 $options'auth_type' = 'PLAIN';
-$options'port' = $port;
-
+$options'port' = $default_port;
 $options'socket_options' = 
     'ssl' => 
         'verify_peer_name' => false,
@@ -143,7 +121,7 @@
 $debug = !empty($opts'debug');
 
 $imap->setDebug($debug);
-if (!$imap->connect($host, $email, $password, $options)) {
+if (!$imap->connect($default_host, $email, $password, $options)) {
     rcube::raise_error("Failed to connect to imap.", false, true);
 }
 
@@ -153,10 +131,8 @@
 $select = $db->query(
     "SELECT `user_id` FROM `users`"
     . " WHERE `username` = ?"
-    . " AND `mail_host` = ?"
     . " ORDER BY `user_id` DESC",
-    \strtolower($email),
-    \strtolower($host)
+    \strtolower($email)
 );
 
 if ($data = $db->fetch_assoc($select)) {
@@ -284,23 +260,6 @@
     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(
@@ -352,41 +311,6 @@
         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

@@ -10,9 +10,11 @@
 $config'activesync_log_file' = null;
 
 // Type of ActiveSync cache. Supported values: 'db', 'apc' and 'memcache'.
+// Note: This is only for some additional data like timezones mapping.
 $config'activesync_cache' = 'db';
 
-// Lifetime of the ActiveSync cache. Supported units: s, m, h, d, w
+// lifetime of ActiveSync cache
+// possible units: s, m, h, d, w
 $config'activesync_cache_ttl' = '1d';
 
 // Type of ActiveSync Auth cache. Supported values: 'db', 'apc' and 'memcache'.
@@ -119,8 +121,3 @@
 // Enables adding sender name in the From: header of send email
 // when a device uses email address only (e.g. iOS devices)
 $config'activesync_fix_from' = false;
-
-// Force a subscription state per folder
-// The following configuration is recommended for Outlook.
-// States can be: 0 => not subscribed, 1 => subscribed, 2 => subscribed with alarm
-$config'activesync_force_subscription_state' = 'INBOX' => 1, 'Sent' => 1, 'Trash' => 1, 'Calendar' => 1, 'Contacts' => 1, 'Tasks' => 1;

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

@@ -37,23 +37,6 @@
     protected $_changesDetected = false;
     protected $_foldersWithChanges = ;
 
-    private function goToSleep($sleepInterval) {
-        // take a break to save battery lifetime
-        call_user_func(Syncroton_Registry::getSleepCallback());
-        sleep($sleepInterval);
-
-        // make sure the connection is still alive, abort otherwise
-        if (connection_aborted()) {
-            if ($this->_logger instanceof Zend_Log) {
-                $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " Exiting on aborted connection");
-            }
-            exit;
-        }
-
-        // reconnect external connections, etc.
-        call_user_func(Syncroton_Registry::getWakeupCallback());
-    }
-
     /**
      * process the XML file and add, change, delete or fetches data
      *
@@ -65,7 +48,6 @@
         $intervalStart = time();
         $status = self::STATUS_NO_CHANGES_FOUND;
 
-        $pingTimeout = Syncroton_Registry::getPingTimeout();
         // the client does not send a wbxml document, if the Ping parameters did not change compared with the last request
         if ($this->_requestBody instanceof DOMDocument) {
             $xml = simplexml_import_dom($this->_requestBody);
@@ -73,11 +55,6 @@
 
             if (isset($xml->HeartbeatInterval)) {
                 $this->_device->pinglifetime = (int)$xml->HeartbeatInterval;
-                // Magic value for testing
-                if ($this->_device->pinglifetime == 9999) {
-                    $pingTimeout = 1;
-                    $this->_device->pinglifetime = 900;
-                }
             }
 
             if (isset($xml->Folders->Folder)) {
@@ -133,6 +110,7 @@
         }
 
         $intervalEnd = $intervalStart + $lifeTime;
+        $secondsLeft = $intervalEnd;
 
         $folders = $this->_device->pingfolder ? unserialize($this->_device->pingfolder) : ;
 
@@ -145,7 +123,29 @@
         }
 
         if ($status === self::STATUS_NO_CHANGES_FOUND) {
+            $sleepCallback  = Syncroton_Registry::getSleepCallback();
+            $wakeupCallback = Syncroton_Registry::getWakeupCallback();
+
             do {
+                // take a break to save battery lifetime
+                call_user_func($sleepCallback);
+                sleep(min(Syncroton_Registry::getPingTimeout(), $lifeTime));
+
+                // make sure the connection is still alive, abort otherwise
+                if (connection_aborted()) {
+                    if ($this->_logger instanceof Zend_Log) {
+                        $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " Exiting on aborted connection");
+                    }
+                    exit;
+                }
+
+                // reconnect external connections, etc.
+                call_user_func($wakeupCallback);
+
+                // Calculate secondsLeft before any loop break just to have a correct value
+                // for logging purposes in case we breaked from the loop early
+                $secondsLeft = $intervalEnd - time();
+
                 try {
                     /** @var Syncroton_Model_Device $device */
                     $device = $this->_deviceBackend->get($this->_device->id);
@@ -259,6 +259,7 @@
                     break;
                 }
 
+                // Update secondsLeft (again)
                 $secondsLeft = $intervalEnd - time();
 
                 if ($this->_logger instanceof Zend_Log) {
@@ -270,16 +271,9 @@
                 // break if there are less than PingTimeout + 10 seconds left for the next loop
                 // otherwise the response will be returned after the client has finished his Ping
                 // request already maybe
-                if ($secondsLeft < ($pingTimeout + 10)) {
-                    break;
-                } else {
-                    $this->goToSleep($pingTimeout);
-                }
-
-            } while (Syncroton_Server::validateSession());
+            } while (Syncroton_Server::validateSession() && $secondsLeft > (Syncroton_Registry::getPingTimeout() + 10));
         }
 
-        $secondsLeft = $intervalEnd - time();
         if ($this->_logger instanceof Zend_Log) {
             $this->_logger->info(__METHOD__ . '::' . __LINE__ . " DeviceId: " . $this->_device->deviceid . " Lifetime: $lifeTime SecondsLeft: $secondsLeft Status: $status)");
         }

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, $clientId)
+    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime)
     {
         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, $clientId)
+    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime)
     {
         // forward email
     }
@@ -78,7 +78,7 @@
      * (non-PHPdoc)
      * @see Syncroton_Data_IDataEmail::sendEmail()
      */
-    public function sendEmail($inputStream, $saveInSent, $clientId)
+    public function sendEmail($inputStream, $saveInSent)
     {
         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,31 +21,26 @@
     /**
      * send an email
      *
-     * @param resource $inputStream
-     * @param bool     $saveInSent
-     * @param ?string  $clientId
+     * @param  resource  $inputStream
+     * @param  boolean   $saveInSent
      */
-    public function sendEmail($inputStream, $saveInSent, $clientId);
+    public function sendEmail($inputStream, $saveInSent);
 
     /**
      * 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 bool          $replaceMime
-     * @param ?string       $clientId
+     * @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
      */
-    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId);
+    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime);
 
     /**
      * 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 bool          $replaceMime
-     * @param ?string       $clientId
+     * @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
      */
-    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId);
+    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime);
 }

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

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

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

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

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

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

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

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

@@ -30,9 +30,6 @@
 {
     public const MAX_SEARCH_RESULT = 200;
 
-    protected const MAIL_SUBMITTED = 1;
-    protected const MAIL_DONE = 2;
-
     /**
      * Mapping from ActiveSync Email namespace fields
      */
@@ -513,13 +510,9 @@
         $is_ios = preg_match('/(iphone|ipad)/i', $this->device->devicetype);
 
         // attachments
-        $attachments = $message->attachments;
-        if (isset($message->inline_parts)) {
-            $attachments = array_merge($attachments, $message->inline_parts);
-        }
+        $attachments = array_merge($message->attachments, $message->inline_parts);
         if (!empty($attachments)) {
             $result'attachments' = ;
-            $attachment_ids = ;
 
             foreach ($attachments as $attachment) {
                 $att = ;
@@ -528,37 +521,28 @@
                     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;
-                // 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'method'        = 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 (strcasecmp($attachment->disposition, 'inline') === 0) {
+                if (in_array($attachment, $message->inline_parts)) {
                     $att'isInline' = 1;
                 }
 
                 $result'attachments' = new Syncroton_Model_EmailAttachment($att);
-                $attachment_ids = $attachment->mime_id;
             }
         }
 
@@ -829,43 +813,29 @@
      * Send an email
      *
      * @param mixed   $message    MIME message
-     * @param bool    $saveInSent Enables saving the sent message in Sent folder
-     * @param ?string $clientId   Message client-id
+     * @param boolean $saveInSent Enables saving the sent message in Sent folder
      *
      * @throws Syncroton_Exception_Status
      */
-    public function sendEmail($message, $saveInSent, $clientId)
+    public function sendEmail($message, $saveInSent)
     {
-        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);
         }
 
-        // Snet the message (if not sent previously)
-        if (!$status) {
-            $sent = $message->send($smtp_error);
+        $sent = $message->send($smtp_error);
 
-            if (!$sent) {
-                throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAIL_SUBMISSION_FAILED);
-            }
-
-            if (!empty($cache)) {
-                $cache->set($cache_key, self::MAIL_SUBMITTED);
-            }
+        if (!$sent) {
+            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAIL_SUBMISSION_FAILED);
         }
 
         // Save sent message in Sent folder
         if ($saveInSent) {
-            if (!$message->saveInSent()) {
-                throw new Syncroton_Exception_Status(Syncroton_Exception_Status::SERVER_ERROR);
-            }
-        }
+            $sent_folder = kolab_sync::get_instance()->config->get('sent_mbox');
 
-        if (!empty($cache)) {
-            $cache->set($cache_key, self::MAIL_DONE);
+            if (strlen($sent_folder) && $this->storage->folder_exists($sent_folder)) {
+                return $this->storage->save_message($sent_folder, $message->source(), '', false, 'SEEN');
+            }
         }
     }
 
@@ -875,18 +845,13 @@
      * @param array|string    $itemId      A string LongId or an array with following properties:
      *                                     collectionId, itemId and instanceId
      * @param resource|string $body        MIME message
-     * @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
+     * @param boolean         $saveInSent  Enables saving the sent message in Sent folder
+     * @param boolean         $replaceMime If enabled, original message would be appended
      *
      * @throws Syncroton_Exception_Status
      */
-    public function forwardEmail($itemId, $body, $saveInSent, $replaceMime, $clientId)
+    public function forwardEmail($itemId, $body, $saveInSent, $replaceMime)
     {
-        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,
@@ -928,7 +893,7 @@
         }
 
         // Send message
-        $this->sendEmail($sync_msg, $saveInSent, $clientId);
+        $this->sendEmail($sync_msg, $saveInSent);
 
         // Set FORWARDED flag on the replied message
         if (empty($message->headers->flags'FORWARDED')) {
@@ -943,18 +908,13 @@
      * @param array|string    $itemId      A string LongId or an array with following properties:
      *                                     collectionId, itemId and instanceId
      * @param resource|string $body        MIME message
-     * @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
+     * @param boolean         $saveInSent  Enables saving the sent message in Sent folder
+     * @param boolean         $replaceMime If enabled, original message would be appended
      *
      * @throws Syncroton_Exception_Status
      */
-    public function replyEmail($itemId, $body, $saveInSent, $replaceMime, $clientId)
+    public function replyEmail($itemId, $body, $saveInSent, $replaceMime)
     {
-        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);
 
@@ -984,7 +944,7 @@
         }
 
         // Send message
-        $this->sendEmail($sync_msg, $saveInSent, $clientId);
+        $this->sendEmail($sync_msg, $saveInSent);
 
         // Set ANSWERED flag on the replied message
         if (empty($message->headers->flags'ANSWERED')) {
@@ -1608,27 +1568,4 @@
             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,22 +216,14 @@
         unset($smtp_headers'Bcc');
 
         // send message
-        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();
+        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();
+
         // log error
         if (!$sent) {
             rcube::raise_error('code' => 800, 'type' => 'smtp',
@@ -269,38 +261,6 @@
     }
 
     /**
-     * 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_storage.php Changed

@@ -59,7 +59,6 @@
     protected $relationSupport = self::MODEL_TASKS, self::MODEL_NOTES, self::MODEL_EMAIL;
     protected $tag_rts = ;
     private $modseq = ;
-    private $protectedFolders = null;
 
     protected static $instance;
 
@@ -125,7 +124,6 @@
     public function reset()
     {
         $this->folders = ;
-        $this->folder_meta = null;
     }
 
     /**
@@ -176,7 +174,9 @@
 
         // check if folders are "subscribed" for activesync
         foreach ($folderdata as $folder => $meta) {
-            if (!$this->is_subscribed($deviceid, $folder, $meta)) {
+            if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
+                || empty($meta'FOLDER'$deviceid'S')
+            ) {
                 continue;
             }
 
@@ -1871,27 +1871,6 @@
         return $this->folder_uids$name = $uid;
     }
 
-    private function is_protected($folder)
-    {
-        if ($this->protectedFolders === null) {
-            $this->protectedFolders = rcube::get_instance()->config->get('activesync_force_subscription_state', );
-        }
-        return array_key_exists($folder, $this->protectedFolders);
-    }
-
-    protected function is_subscribed($deviceid, $folder, $meta)
-    {
-        if ($this->is_protected($folder)) {
-            return true;
-        }
-        if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
-            || empty($meta'FOLDER'$deviceid'S')
-        ) {
-            return false;
-        }
-        return true;
-    }
-
     /**
      * Returns IMAP folder name
      *
@@ -1935,7 +1914,9 @@
 
         // check if folders are "subscribed" for activesync
         foreach ($folderdata as $folder => $meta) {
-            if (!$this->is_subscribed($deviceid, $folder, $meta)) {
+            if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
+                || empty($meta'FOLDER'$deviceid'S')
+            ) {
                 continue;
             }

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

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

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

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

@@ -28,11 +28,11 @@
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
 
-        // Initially we know no folders
+        //Initially we know no folders
         $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
 
 
-        // We discover folders with a foldersync
+        //We discover folders with a foldersync
         $request = <<<EOF
             <?xml version="1.0" encoding="utf-8"?>
             <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
@@ -44,7 +44,7 @@
         $response = $this->request($request, 'FolderSync');
         $this->assertEquals(200, $response->getStatusCode());
 
-        // Now we get to the actual ping
+        //Now we get to the actual ping
         $request = <<<EOF
             <?xml version="1.0" encoding="utf-8"?>
             <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
@@ -63,61 +63,12 @@
         $this->assertEquals(200, $response->getStatusCode());
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
-        // We don't find the folder state because it was never synced
+        // Initially we know no folders
         $this->assertSame('2', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-
-        // Sync inbox
-        $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>0</SyncKey>
-                        <CollectionId>38b950ebd62cd9a66929c89615d0fc04</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;
-
-        $response = $this->request($request, 'Sync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        // Now we should get no change
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>0</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
     }
 
     /**
-     * Test Unknown Folder
+     * Test Ping command
      */
     public function testUnknownFolder()
     {
@@ -144,148 +95,4 @@
 
         $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
     }
-
-    /**
-     * Test New Folder
-     */
-    public function testNewFolder()
-    {
-        // Initialize the folder state
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $this->createTestFolder("NewFolder", "mail");
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>900</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test Changed Subscription Folder
-     */
-    public function testNewFolderSubscriptionState()
-    {
-        // Initialize the folder state
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $this->setSubscriptionState("NewFolder", null);
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>900</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test changed subscription while ping is running
-     */
-    public function testNewFolderSubscriptionStateDuringPing()
-    {
-        // Initialize the folder state
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        // Set the metadata via a background script, while Ping is running.
-        // This is essential to trigger a bug where the initial Ping seeds the roundcube metadata cache,
-        // and then subsequent checks don't update the cache. We have to use a separate process to set
-        // the metadata, because otherwise we update the cache (we could also not use the roundcube
-        // infrastructure instead).
-        $deviceId = self::$deviceId;
-        $username = self::$username;
-        $password = self::$password;
-        exec("php setmetadata.php $deviceId NewFolder $username $password > /dev/null 2>&1 &");
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>9999</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
 }

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

@@ -1,112 +0,0 @@
-<?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,7 +112,29 @@
         $this->assertSame('test sync', $xpath->query("{$root}/ns:ApplicationData/Email:Subject")->item(0)->nodeValue);
 
         // List the rest of the mail
-        $request = preg_replace('|<SyncKey>\d</SyncKey>|', "<SyncKey>{$syncKey}</SyncKey>", $request);
+        $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;
 
         $response = $this->request($request, 'Sync');
 
@@ -133,41 +155,6 @@
         $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

@@ -224,33 +224,22 @@
     /**
      * Create a folder
      */
-    protected function createTestFolder($name, $type, $subscriptionState = '1')
+    protected function createTestFolder($name, $type)
     {
         // Create IMAP folders
         if ($type == 'mail' || $this->isStorageDriver('kolab')) {
             $imap = $this->getImapStorage();
+            //TODO set type if not mail
             $imap->create_folder($name, true);
-            if ($type != "mail") {
-                $imap->set_metadata($name, '/private/vendor/kolab/folder-type' => $type);
-            }
-            $this->setSubscriptionState($name, $subscriptionState);
-        }
-    }
 
-    /**
-     * Subscribe test folder
-     */
-    protected function setSubscriptionState($name, $subscriptionState)
-    {
-        $metadata = null;
-        if ($subscriptionState) {
             $metadata = ;
             $metadata'FOLDER' = ;
             $metadata'FOLDER'self::$deviceId = ;
-            $metadata'FOLDER'self::$deviceId'S' = $subscriptionState;
-            $metadata = json_encode($metadata);
+            $metadata'FOLDER'self::$deviceId'S' = '1';
+            $imap->set_metadata($name, '/private/vendor/kolab/activesync' => json_encode($metadata));
+
+            return;
         }
-        $this->getImapStorage()->set_metadata($name, '/private/vendor/kolab/activesync' => $metadata);
     }
 
     /**
@@ -305,7 +294,7 @@
 
         // Make sure user is authenticated
         $this->getImapStorage();
-        if ($sync->user) {
+        if (!empty($sync->user)) {
             // required e.g. for DAV client cache use
             \rcube::get_instance()->user = $sync->user;
         }
@@ -429,7 +418,6 @@
         $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");
@@ -455,7 +443,7 @@
         if (method_exists("PHPUnit\Framework\TestCase", "assertMatchesRegularExpression")) {
             parent::assertMatchesRegularExpression($arg1, $arg2, $message);
         } else {
-            parent::assertRegExp($arg1, $arg2, $message);
+            parent::assertRegExp($arg1, $arg2);
         }
     }
 }

kolab-syncroton-2.4.2.tar.gz/tests/setmetadata.php Deleted

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

kolab-syncroton.dsc Changed

Overview

Request 3350 (accepted)

Request History