Request 3327 (superseded)

kolab-syncroton.spec Changed

debian.changelog Changed

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

@@ -37,7 +37,6 @@
 require_once "Syncroton/Command/Sync.php";
 require_once "Syncroton/Command/Ping.php";
 require_once "Syncroton/Command/MoveItems.php";
-require_once "Syncroton/Command/FolderSync.php";
 
 $filename = $argv1;
 
@@ -46,8 +45,7 @@
 // Split up the log files into chunks that hopefully match the commands
 $parts = preg_split("/\.*\: " . preg_quote("DEBUG Syncroton_Server::handle::65 REQUEST METHOD: POST", '/') . "/", $content, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
-function getStatusConstants($classname)
-{
+function getStatusConstants($classname) {
     $reflect = new ReflectionClass($classname);
     $result = $reflect->getConstants();
     $result = array_filter($result, function ($val) {
@@ -57,11 +55,7 @@
     return $result;
 }
 
-function explainStatus($command, $status)
-{
-    if (!$status) {
-        return "none";
-    }
+function explainStatus($command, $status) {
     switch ($command) {
         case "Ping":
             $result = getStatusConstants("Syncroton_Command_Ping");
@@ -72,11 +66,8 @@
         case "MoveItems":
             $result = getStatusConstants("Syncroton_Command_MoveItems");
             return $result$status ?? "Unknown";
-        case "FolderSync":
-            $result = getStatusConstants("Syncroton_Command_FolderSync");
-            return $result$status ?? "Unknown";
     }
-    return "Unknown command";
+    return "Unkonwn";
 }
 
 foreach ($parts as $part) {
@@ -91,7 +82,7 @@
 
     $statusExplained = explainStatus($command, $status);
 
-    print(" Command: " . str_pad($command, 10) . str_pad("\tStatus: $status ($statusExplained)", 45) . "\tTimestamp: $timestamp\n");
+    print(" Command: ". str_pad($command, 10) . str_pad("\tStatus: $status ($statusExplained)", 45) . "\tTimestamp: $timestamp\n");
     if ($command == "Sync") {
         // Find collections within this sync
         // 25-Sep-2024 09:16:35.347730: INFO Syncroton_Command_Sync::handle::221 SyncKey is 7301 Class: Email CollectionId: 38b950ebd62cd9a66929c89615d0fc04
@@ -124,19 +115,19 @@
         // Detect entries that are being added from the client
         if (preg_match_all('/found (.*) entries to be added on server/', $part, $matches)) {
             foreach ($matches0 ??  as $match) {
-                print("  " . $match . "\n");
+                print("  " . $match. "\n");
             }
         }
 
         if (preg_match_all('/found (.*) entries to be updated on server/', $part, $matches)) {
             foreach ($matches0 ??  as $match) {
-                print("  " . $match . "\n");
+                print("  " . $match. "\n");
             }
         }
 
         if (preg_match_all('/found (.*) entries to be deleted on server/', $part, $matches)) {
             foreach ($matches0 ??  as $match) {
-                print("  " . $match . "\n");
+                print("  " . $match. "\n");
             }
         }
     }
@@ -147,3 +138,4 @@
     //TODO on Sync:
     //* Reason for interruption
 }
+

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

@@ -110,8 +110,8 @@
     'ssl' => 
         'verify_peer_name' => false,
         'verify_peer' => false,
-        'allow_self_signed' => true,
-    ,
+        'allow_self_signed' => true
+    
 ;
 
 ini_set('display_errors', 1);
@@ -233,15 +233,13 @@
     var_export($result);
 }
 
-function println($output)
-{
+function println($output) {
     print("{$output}\n");
 }
 
-function filterType($value)
-{
+function filterType($value) {
     if (!$value) {
-        return "No filter";
+            return "No filter";
     }
     switch($value) {
         case 0: return "No filter";
@@ -257,13 +255,11 @@
     return "Unknown value: $value";
 }
 
-function getContentUids($db, $device_id, $folder_id)
-{
+function getContentUids($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
+        $device_id, $folder_id
     );
 
     $contentUids = ;
@@ -273,8 +269,7 @@
     return $contentUids;
 }
 
-function getImapUids($imap, $folder, $lastfiltertype)
-{
+function getImapUids($imap, $folder, $lastfiltertype) {
     $imap->select($folder);
     $index = $imap->search($folder, 'ALL UNDELETED ' . filterTypeToIMAPSearch($lastfiltertype), true);
     if (!$index->is_error()) {

kolab-syncroton-2.4.2.tar.gz/bin/resync.php Deleted

@@ -1,116 +0,0 @@
-#!/usr/bin/php
-<?php
-/*
- +--------------------------------------------------------------------------+
- | Kolab Sync (ActiveSync for Kolab)                                        |
- |                                                                          |
- | Copyright (C) 2024, Apheleia IT AG <contact@apheleia-it.ch>              |
- |                                                                          |
- | This program is free software: you can redistribute it and/or modify     |
- | it under the terms of the GNU Affero General Public License as published |
- | by the Free Software Foundation, either version 3 of the License, or     |
- | (at your option) any later version.                                      |
- |                                                                          |
- | This program is distributed in the hope that it will be useful,          |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |
- | GNU Affero General Public License for more details.                      |
- |                                                                          |
- | You should have received a copy of the GNU Affero General Public License |
- | along with this program. If not, see <http://www.gnu.org/licenses/>      |
- +--------------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@apheleia-it.ch>                    |
- +--------------------------------------------------------------------------+
-*/
-
-define('RCUBE_INSTALL_PATH', realpath(dirname(__FILE__) . '/../') . '/');
-define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'lib/plugins/');
-
-// Define include path
-$include_path  = RCUBE_INSTALL_PATH . 'lib' . PATH_SEPARATOR;
-$include_path .= RCUBE_INSTALL_PATH . 'lib/ext' . PATH_SEPARATOR;
-$include_path .= ini_get('include_path');
-set_include_path($include_path);
-
-// include composer autoloader (if available)
-if (@file_exists(RCUBE_INSTALL_PATH . 'vendor/autoload.php')) {
-    require RCUBE_INSTALL_PATH . 'vendor/autoload.php';
-}
-
-// include global functions from Roundcube Framework
-require_once 'Roundcube/bootstrap.php';
-
-$opts = rcube_utils::get_opt(
-    'o' => 'owner',
-    'f' => 'folder',
-    'd' => 'deviceid',
-    't' => 'devicetype', // e.g. WindowsOutlook15 or iPhone
-);
-
-$rcube = \rcube::get_instance();
-$db    = $rcube->get_dbh();
-
-if (empty($opts'owner')) {
-    rcube::raise_error("Owner not specified (--owner).", false, true);
-}
-if (empty($opts'folder')) {
-    rcube::raise_error("Folder name not specified (--folder).", false, true);
-}
-
-$select = $db->query(
-    "SELECT `user_id` FROM `users` WHERE `username` = ? ORDER BY `user_id` DESC",
-    \strtolower($opts'owner')
-);
-
-if ($data = $db->fetch_assoc($select)) {
-    $userid = $data'user_id';
-} else {
-    rcube::raise_error("User not found in Roundcube database.", false, true);
-}
-
-$devices = ;
-if (!empty($opts'deviceid')) {
-    $select = $db->query(
-        "SELECT `id` FROM `syncroton_device` WHERE `owner_id` = ? AND `deviceid` = ?",
-        $userid,
-        $opts'deviceid'
-    );
-    while ($record = $db->fetch_assoc($select)) {
-        $devices = $record'id';
-    }
-} elseif (!empty($opts'devicetype')) {
-    $select = $db->query(
-        "SELECT `id` FROM `syncroton_device` WHERE `owner_id` = ? AND `devicetype` = ?",
-        $userid,
-        $opts'devicetype'
-    );
-    while ($record = $db->fetch_assoc($select)) {
-        $devices = $record'id';
-    }
-} else {
-    $select = $db->query("SELECT `id` FROM `syncroton_device` WHERE `owner_id` = ?", $userid);
-    while ($record = $db->fetch_assoc($select)) {
-        $devices = $record'id';
-    }
-}
-
-if (empty($devices)) {
-    rcube::raise_error("Device not found.", false, true);
-}
-
-// TODO: Support not only top-level folders
-
-$select = $db->query(
-    "SELECT `id`, `displayname`, `folderid` FROM `syncroton_folder`"
-    . " WHERE `device_id` IN (" . $db->array2list($devices) . ")"
-    . " AND `parentid` = '0' AND `displayname` = " . $db->quote($opts'folder')
-);
-
-while ($record = $db->fetch_assoc($select)) {
-    if (!empty($opts'dry-run')) {
-        print("DRY-RUN {$record'displayname'} ({$record'id'}:{$record'folderid'})\n");
-    } else {
-        $db->query("UPDATE `syncroton_folder` SET `resync` = 1 WHERE id = ?", $record'id');
-        print("{$record'displayname'} ({$record'id'}:{$record'folderid'})\n");
-    }
-}

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql.initial.sql Changed

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql/2024101700.sql Deleted

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql/2024102300.sql Deleted

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

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

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

@@ -94,9 +94,6 @@
         }
 
         if (!($this->_syncState = $this->_syncStateBackend->validate($this->_device, 'FolderSync', $syncKey)) instanceof Syncroton_Model_SyncState) {
-            if ($this->_logger instanceof Zend_Log) {
-                $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " invalidating sync state");
-            }
             $this->_syncStateBackend->resetState($this->_device, 'FolderSync');
         }
     }
@@ -146,7 +143,7 @@
                 $serverFolders = $dataController->getAllFolders();
 
                 // retrieve all folders sent to client
-                $clientFolders = $this->_folderBackend->getFolderState($this->_device, $class, $this->_syncState->counter);
+                $clientFolders = $this->_folderBackend->getFolderState($this->_device, $class);
 
                 if ($this->_syncState->counter > 0) {
                     // retrieve all folders changed since last sync
@@ -197,7 +194,6 @@
                 } else {
                     $add = $serverFolders$serverFolderId;
                     $add->creationTime = $this->_syncTimeStamp;
-                    $add->creationSynckey = $this->_syncState->counter + 1;
                     $add->deviceId     = $this->_device->id;
                     unset($add->id);
                 }
@@ -238,12 +234,6 @@
                 }
             }
 
-            // Handle folders set for forced re-sync, we'll send a delete action to the client,
-            // but because the folder is still existing and subscribed on the backend it should
-            // "immediately" be added again (and re-synced).
-            $forceDeleteIds = array_keys(array_filter($clientFolders, function ($f) { return !empty($f->resync); }));
-            $serverFoldersIds = array_diff($serverFoldersIds, $forceDeleteIds);
-
             // calculate deleted entries
             $serverDiff = array_diff($clientFoldersIds, $serverFoldersIds);
             foreach ($serverDiff as $serverFolderId) {
@@ -272,12 +262,7 @@
 
             // store folder in backend
             if (empty($folder->id)) {
-                try {
-                    $this->_folderBackend->create($folder);
-                } catch(Exception $zdse) {
-                    //This can happen if we rerun a previous sync-key
-                    $this->_folderBackend->update($folder);
-                }
+                $this->_folderBackend->create($folder);
             }
         }
 
@@ -296,10 +281,10 @@
             $this->_folderBackend->delete($folder);
         }
 
-        // Only create this syncstate if it isn't already existing (which happens if we a sync key is re-sent)
-        if (!$this->_syncStateBackend->haveNext($this->_device, 'FolderSync', $this->_syncState->counter - 1)) {
-            // Keep previous sync states in case a sync key is re-sent
-            $this->_syncStateBackend->create($this->_syncState, true);
+        if (empty($this->_syncState->id)) {
+            $this->_syncStateBackend->create($this->_syncState);
+        } else {
+            $this->_syncStateBackend->update($this->_syncState);
         }
 
         return $this->_outputDom;

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

@@ -68,10 +68,6 @@
                 $folders = ;
                 foreach ($xml->Folders->Folder as $folderXml) {
                     try {
-                        if (empty((string)$folderXml->Id)) {
-                            // Ignore empty folder ids
-                            continue;
-                        }
                         // does the folder exist?
                         $folder = $this->_folderBackend->getFolder($this->_device, (string)$folderXml->Id);
 
@@ -128,7 +124,7 @@
             do {
                 // take a break to save battery lifetime
                 call_user_func($sleepCallback);
-                sleep(min(Syncroton_Registry::getPingTimeout(), $lifeTime));
+                sleep(Syncroton_Registry::getPingTimeout());
 
                 // make sure the connection is still alive, abort otherwise
                 if (connection_aborted()) {
@@ -195,10 +191,6 @@
                 $now = new DateTime('now', new DateTimeZone('UTC'));
 
                 foreach ($folders as $folderId) {
-                    if (empty($folderId)) {
-                        // Ignore empty folder ids
-                        continue;
-                    }
                     try {
                         /** @var Syncroton_Model_Folder $folder */
                         $folder         = $this->_folderBackend->get($folderId);

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

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

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

@@ -50,19 +50,15 @@
      *
      * @param Syncroton_Model_Device|string $deviceid Device object or identifier
      * @param string                        $class    Class name
-     * @param int                           $syncKey  Sync key
      *
      * @return array List of object identifiers
      */
-    public function getFolderState($deviceid, $class, $syncKey = null)
+    public function getFolderState($deviceid, $class)
     {
         $device_id = $deviceid instanceof Syncroton_Model_IDevice ? $deviceid->id : $deviceid;
 
         $where = $this->db->quote_identifier('device_id') . ' = ' . $this->db->quote($device_id);
         $where = $this->db->quote_identifier('class') . ' = ' . $this->db->quote($class);
-        if ($syncKey) {
-            $where = $this->db->quote_identifier('creation_synckey') . ' < ' . $this->db->quote($syncKey + 1);
-        }
 
         $select = $this->db->query('SELECT * FROM `' . $this->table_name . '` WHERE ' . implode(' AND ', $where));
         $result = ;
@@ -92,11 +88,8 @@
         $select = $this->db->query('SELECT * FROM `' . $this->table_name . '` WHERE ' . implode(' AND ', $where));
         $folder = $this->db->fetch_assoc($select);
 
-        if (!empty($folder'resync')) {
-            throw new Syncroton_Exception_NotFound("Folder $folderid not found because of resync");
-        }
         if (empty($folder)) {
-            throw new Syncroton_Exception_NotFound("Folder $folderid not found");
+            throw new Syncroton_Exception_NotFound('Folder not found');
         }
 
         return $this->get_object($folder);
@@ -127,18 +120,6 @@
         // Reset imap cache so we work with up-to-date folders list
         rcube::get_instance()->get_storage()->clear_cache('mailboxes', true);
 
-        // Retrieve all folders already sent to the client
-        $select = $this->db->query("SELECT * FROM `{$this->table_name}` WHERE `device_id` = ?", $device->id);
-
-        while ($folder = $this->db->fetch_assoc($select)) {
-            if (!empty($folder'resync')) {
-                // Folder re-sync requested
-                return true;
-            }
-
-            $client_folders$folder'folderid' = $this->get_object($folder);
-        }
-
         foreach ($folder_classes as $class) {
             try {
                 // retrieve all folders available in data backend
@@ -151,6 +132,13 @@
             }
         }
 
+        // retrieve all folders sent to the client
+        $select = $this->db->query("SELECT * FROM `{$this->table_name}` WHERE `device_id` = ?", $device->id);
+
+        while ($folder = $this->db->fetch_assoc($select)) {
+            $client_folders$folder'folderid' = $this->get_object($folder);
+        }
+
         ksort($client_folders);
         ksort($server_folders);

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

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

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

@@ -1966,7 +1966,7 @@
 
         //If we had a collision before
         if (isset($this->relations$folderid$synctime . "-1")) {
-            return $this->relations$folderid$synctime . "-1";
+            return $this->relations$folderid$synctime. "-1";
         }
         if (!isset($this->relations$folderid$synctime)) {
             $rcube = rcube::get_instance();
@@ -1982,25 +1982,8 @@
                 $folderid,
                 $synctime
             );
-            $row = $db->fetch_assoc();
-            if (!$row) {
-                // Only if we don't have a timestamp that is older than synctime do we return the next best.
-                // We MUST return an entry if there are any, because otherwise we will keep INSERTing new entries in,
-                // relations_state_set
-                $db->limitquery(
-                    "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
-                    . " WHERE `device_id` = ? AND `folder_id` = ?"
-                    . " ORDER BY `synctime` ASC",
-                    0,
-                    1,
-                    $device_key,
-                    $folderid,
-                    $synctime
-                );
-                $row = $db->fetch_assoc();
-            }
 
-            if ($row) {
+            if ($row = $db->fetch_assoc()) {
                 // Don't use $row'synctime' for the internal cache.
                 // The synctime of the found row is usually earlier than the requested synctime.
                 // Note: We use internal cache because there's a call to both hasChanges() and

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

@@ -3,230 +3,16 @@
 class FoldersTest extends Tests\SyncTestCase
 {
     /**
-     * Cleanup folders
+     * Test FolderSync command
      */
-    public function setUp(): void
+    public function testFolderSync()
     {
         // Note: We essentially assume the test account is in an initial state, extra folders may break tests
         // Anyway, we first remove folders that might have been created during tests in this file
         $this->deleteTestFolder('Test Folder', 'mail');
-        $this->deleteTestFolder('NewFolder', 'mail');
-        $this->deleteTestFolder('NewFolder2', 'mail');
         $this->deleteTestFolder('Test Folder New', 'mail');
         $this->deleteTestFolder('Test Contacts Folder', 'contact');
         $this->deleteTestFolder('Test Contacts New', 'contact');
-        parent::setUp();
-    }
-
-    /**
-     * Test FolderSync command
-     */
-    public function testFolderSyncBasic()
-    {
-        $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());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        // We expect some folders to exist (dont' know how many)
-        $this->assertTrue(intval($xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue) > 2);
-
-        $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());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        // No changes on second sync
-        $this->assertSame(strval(0), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-
-        //Clear the creation_synckey (that's the migration scenario)
-        //Shouldn't trigger a change
-        $rcube = \rcube::get_instance();
-        $db    = $rcube->get_dbh();
-        $result = $db->query(
-            "UPDATE `syncroton_folder` SET `creation_synckey` = null",
-        );
-
-        $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());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->printDom($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        // No changes on second sync
-        $this->assertSame(strval(0), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test invalid sync key
-     */
-    public function testFolderInvalidSyncKey()
-    {
-        $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>999</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('9', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-    }
-
-
-    /**
-     * Test synckey reuse
-     */
-    public function testSyncKeyResend()
-    {
-        $this->deleteTestFolder('NewFolder', 'mail');
-        $this->deleteTestFolder('NewFolder2', 'mail');
-        $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());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-
-        //Now change something
-        $this->createTestFolder("NewFolder", "mail");
-        $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());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('2', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame(strval(1), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        //Resend the same synckey
-        $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());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('2', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame(strval(1), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        //And now make sure we can still move on
-        $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>2</SyncKey>
-            </FolderSync>
-            EOF;
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('2', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-
-        //Now add another folder
-        $this->createTestFolder("NewFolder2", "mail");
-        $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>2</SyncKey>
-            </FolderSync>
-            EOF;
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('3', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame(strval(1), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        //And finally make sure we can't go back two synckeys (because that has been cleaned up meanwhile)
-        $this->createTestFolder("NewFolder2", "mail");
-        $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());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('9', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-
-        // Cleanup for the other tests
-        $this->deleteTestFolder('NewFolder', 'mail');
-        $this->deleteTestFolder('NewFolder2', 'mail');
-    }
-
-    /**
-     * Test FolderSync command
-     */
-    public function testFolderSync()
-    {
 
         $request = <<<EOF
             <?xml version="1.0" encoding="utf-8"?>

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

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

@@ -1,102 +0,0 @@
-<?php
-
-class PingTest extends Tests\SyncTestCase
-{
-
-    /**
-     * Test Ping command
-     */
-    public function testFolderSyncBasic()
-    {
-        $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->printDom($dom);
-
-        //Initially we know no folders
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-
-
-        //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/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        //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/">
-            <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->printDom($dom);
-        //Initially we know no folders
-        $this->assertSame('2', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test Ping command
-     */
-    public function testUnknownFolder()
-    {
-        $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>foobar</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->printDom($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-}

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

@@ -4,8 +4,8 @@
 
 class RelationsTest extends \Tests\SyncTestCase
 {
-    protected function initialSyncRequest($folderId)
-    {
+
+    protected function initialSyncRequest($folderId) {
         $request = <<<EOF
             <?xml version="1.0" encoding="utf-8"?>
             <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
@@ -21,8 +21,7 @@
         return $this->request($request, 'Sync');
     }
 
-    protected function syncRequest($syncKey, $folderId, $windowSize = null)
-    {
+    protected function syncRequest($syncKey, $folderId, $windowSize = null) {
         $request = <<<EOF
             <?xml version="1.0" encoding="utf-8"?>
             <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
@@ -50,23 +49,6 @@
         return $this->request($request, 'Sync');
     }
 
-    private function getRelationsState($device_id, $folderId)
-    {
-        $db    = \rcube::get_instance()->get_dbh();
-        $result = $db->query(
-            "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
-            . " WHERE `device_id` = ? AND `folder_id` = ?"
-            . " ORDER BY `synctime` DESC",
-            $device_id,
-            $folderId
-        );
-        $data = ;
-        while ($state = $db->fetch_assoc($result)) {
-            $data = $state;
-        }
-        return $data;
-    }
-
     /**
      * Test Sync command
      */
@@ -95,7 +77,7 @@
         $this->assertSame('Email', $xpath->query("//ns:Sync/ns:Collections/ns:Collection/ns:Class")->item(0)->nodeValue);
         $this->assertSame($folderId, $xpath->query("//ns:Sync/ns:Collections/ns:Collection/ns:CollectionId")->item(0)->nodeValue);
 
-        // First we append
+        // First we append 
         $uid1 = $this->appendMail('INBOX', 'mail.sync1');
         $uid2 = $this->appendMail('INBOX', 'mail.sync2');
         $this->appendMail('INBOX', 'mail.sync1', 'sync1' => 'sync3');
@@ -163,7 +145,20 @@
             $this->assertSame("test1test2", $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->item(0)->nodeValue);
 
             // Assert the db state
-            $this->assertSame(2, count($this->getRelationsState($device'ID', $folderId)));
+            $rcube = \rcube::get_instance();
+            $db    = $rcube->get_dbh();
+            $result = $db->query(
+                "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
+                . " WHERE `device_id` = ? AND `folder_id` = ?"
+                . " ORDER BY `synctime` DESC",
+                $device'ID',
+                $folderId
+            );
+            $data = ;
+            while ($state = $db->fetch_assoc($result)) {
+                $data = $state;
+            }
+            $this->assertSame(2, count($data));
             // Make sure we have a new timestamp after the first iteration.
             // This way we can potentially catch errors when we end up using the same or a different timestamp.
             sleep(1);
@@ -189,10 +184,21 @@
         $this->assertSame(0, $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->count());
         //FIXME this currently fails because we omit the empty categories element
         // $this->assertSame("", $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->item(0)->nodeValue);
-
+        
 
         // Assert the db state
-        $this->assertSame(2, count($this->getRelationsState($device'ID', $folderId)));
+        $result = $db->query(
+            "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
+            . " WHERE `device_id` = ? AND `folder_id` = ?"
+            . " ORDER BY `synctime` DESC",
+            $device'ID',
+            $folderId
+        );
+        $data = ;
+        while ($state = $db->fetch_assoc($result)) {
+            $data = $state;
+        }
+        $this->assertSame(2, count($data));
 
         $response = $this->syncRequest($syncKey, $folderId, 10);
         $this->assertEquals(200, $response->getStatusCode());
@@ -202,78 +208,5 @@
 
         return $syncKey;
     }
-
-    public function testPing()
-    {
-        // Setup with a tag and an initial sync completed
-        $folderId = '38b950ebd62cd9a66929c89615d0fc04';
-        $sync = \kolab_sync::get_instance();
-        $device = $sync->storage()->device_get(self::$deviceId);
-
-        $uid1 = $this->appendMail('INBOX', 'mail.sync1');
-        $sync->storage()->updateItem($folderId, $device'ID', \kolab_sync_storage::MODEL_EMAIL, $uid1, null, 'categories' => 'test1');
-        sleep(1);
-
-        $response = $this->syncRequest(0, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-        $response = $this->syncRequest(1, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-
-
-        $this->assertSame(2, count($this->getRelationsState($device'ID', $folderId)));
-
-        // Make sure the timestamp changes
-        sleep(1);
-
-        // Pings should not change the number of relation states
-        for ($i=0; $i < 2; $i++) {
-            $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>$folderId</Id>
-                            <Class>Email</Class>
-                        </Folder>
-                    </Folders>
-                </Ping>
-                EOF;
-
-            $response = $this->request($request, 'Ping');
-
-            $this->assertEquals(200, $response->getStatusCode());
-            $this->assertSame(1, count($this->getRelationsState($device'ID', $folderId)));
-        }
-
-        // This simulates a specific case where we had:
-        // * An old lastsync timestamp (because the folders were not actively synchronized)
-        // * The folder was still included in the ping command
-        // => This resulted in the relations code never finding a relation, and thus not cleaning up, but it still inserted new entries
-        $db    = \rcube::get_instance()->get_dbh();
-        $result = $db->query(
-            "UPDATE `syncroton_synckey` SET `lastsync` = '2023-06-23 13:15:03'"
-        );
-
-        $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>$folderId</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertSame(1, count($this->getRelationsState($device'ID', $folderId)));
-
-    }
 }
+

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

@@ -178,6 +178,8 @@
             } else {
                 exit("Folder is missing");
             }
+
+            return;
         }
 
         $dav = $this->getDavStorage();
@@ -222,27 +224,6 @@
     }
 
     /**
-     * Create a folder
-     */
-    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);
-
-            $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;
-        }
-    }
-
-    /**
      * Remove all objects from a folder
      */
     protected function emptyTestFolder($name, $type)
@@ -413,14 +394,6 @@
         return $xpath;
     }
 
-    /**
-      * Pretty print the DOM
-      */
-    protected function printDom($dom)
-    {
-        $dom->formatOutput = true;
-        print($dom->saveXML());
-    }
 
     /**
      * adapter for phpunit < 9

kolab-syncroton.dsc Changed

Overview

Request 3327 (superseded)

Request History