Kolab Groupware OBS

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/config/config.inc.php.dist Changed

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

@@ -37,6 +37,23 @@
     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
      *
@@ -48,6 +65,7 @@
         $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);
@@ -55,6 +73,11 @@
 
             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)) {
@@ -110,7 +133,6 @@
         }
 
         $intervalEnd = $intervalStart + $lifeTime;
-        $secondsLeft = $intervalEnd;
 
         $folders = $this->_device->pingfolder ? unserialize($this->_device->pingfolder) : ;
 
@@ -123,29 +145,7 @@
         }
 
         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,7 +259,6 @@
                     break;
                 }
 
-                // Update secondsLeft (again)
                 $secondsLeft = $intervalEnd - time();
 
                 if ($this->_logger instanceof Zend_Log) {
@@ -271,9 +270,16 @@
                 // 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
-            } while (Syncroton_Server::validateSession() && $secondsLeft > (Syncroton_Registry::getPingTimeout() + 10));
+                if ($secondsLeft < ($pingTimeout + 10)) {
+                    break;
+                } else {
+                    $this->goToSleep($pingTimeout);
+                }
+
+            } while (Syncroton_Server::validateSession());
         }
 
+        $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/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/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_storage.php Changed

@@ -59,6 +59,7 @@
     protected $relationSupport = self::MODEL_TASKS, self::MODEL_NOTES, self::MODEL_EMAIL;
     protected $tag_rts = ;
     private $modseq = ;
+    private $protectedFolders = null;
 
     protected static $instance;
 
@@ -124,6 +125,7 @@
     public function reset()
     {
         $this->folders = ;
+        $this->folder_meta = null;
     }
 
     /**
@@ -174,9 +176,7 @@
 
         // check if folders are "subscribed" for activesync
         foreach ($folderdata as $folder => $meta) {
-            if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
-                || empty($meta'FOLDER'$deviceid'S')
-            ) {
+            if (!$this->is_subscribed($deviceid, $folder, $meta)) {
                 continue;
             }
 
@@ -1871,6 +1871,27 @@
         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
      *
@@ -1914,9 +1935,7 @@
 
         // check if folders are "subscribed" for activesync
         foreach ($folderdata as $folder => $meta) {
-            if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
-                || empty($meta'FOLDER'$deviceid'S')
-            ) {
+            if (!$this->is_subscribed($deviceid, $folder, $meta)) {
                 continue;
             }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_storage_kolab4.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,12 +63,61 @@
         $this->assertEquals(200, $response->getStatusCode());
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
-        // Initially we know no folders
+        // We don't find the folder state because it was never synced
         $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 Ping command
+     * Test Unknown Folder
      */
     public function testUnknownFolder()
     {
@@ -95,4 +144,148 @@
 
         $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;

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

@@ -224,22 +224,33 @@
     /**
      * Create a folder
      */
-    protected function createTestFolder($name, $type)
+    protected function createTestFolder($name, $type, $subscriptionState = '1')
     {
         // 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' = '1';
-            $imap->set_metadata($name, '/private/vendor/kolab/activesync' => json_encode($metadata));
-
-            return;
+            $metadata'FOLDER'self::$deviceId'S' = $subscriptionState;
+            $metadata = json_encode($metadata);
         }
+        $this->getImapStorage()->set_metadata($name, '/private/vendor/kolab/activesync' => $metadata);
     }
 
     /**

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

kolab-syncroton.dsc Changed

Changes of Revision 68