Kolab Groupware OBS

kolab-utils.spec Changed

0001-libcalendaring.patch Added

0002-no-tests-for-fbdaemon-on-Debian.patch Added

debian.changelog Changed

debian.control Changed

debian.series Added

kolab-utils-3.1.tar.gz/CMakeLists.txt -> kolab-utils-3.1.1.tar.gz/CMakeLists.txt Changed

@@ -18,9 +18,9 @@
 set(Kolabutils_VERSION_MAJOR 3)
 set(Kolabutils_VERSION_MINOR 1)
 # Enable the full x.y.z version only for release versions
-# set(Kolabutils_VERSION_PATCH 0)
-# set(Kolabutils_VERSION ${Kolabutils_VERSION_MAJOR}.${Kolabutils_VERSION_MINOR}.${Kolabutils_VERSION_PATCH} )
-set(Kolabutils_VERSION ${Kolabutils_VERSION_MAJOR}.${Kolabutils_VERSION_MINOR} )
+set(Kolabutils_VERSION_PATCH 1)
+set(Kolabutils_VERSION ${Kolabutils_VERSION_MAJOR}.${Kolabutils_VERSION_MINOR}.${Kolabutils_VERSION_PATCH} )
+# set(Kolabutils_VERSION ${Kolabutils_VERSION_MAJOR}.${Kolabutils_VERSION_MINOR} )
 set(Kolabutils_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Kolabutils_VERSION})
 
 option( USE_LIBCALENDARING "Use libcalendaring" FALSE )
@@ -38,6 +38,7 @@
     find_package(Libcalendaring)
     set( KDE_INCLUDES ${Libcalendaring_INCLUDE_DIRS} )
     set( KDE_LIBRARIES ${Libcalendaring_LIBRARIES} )
+    find_library(KDE_KIMAPTEST NAMES calendaring-kimaptest)
     message("${Libcalendaring_INCLUDE_DIRS} ${Libcalendaring_LIBRARIES}")
 else()
     find_package(KDE4 4.8 REQUIRED)
@@ -50,6 +51,7 @@
         ${KDEPIMLIBS_KMIME_LIBS}
         ${KDEPIMLIBS_KIMAP_LIBS}
         )
+     find_library(KDE_KIMAPTEST NAMES kimaptest)
 endif()
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common -Woverloaded-virtual -fno-threadsafe-statics -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden -fexceptions -UQT_NO_EXCEPTIONS -g" )
@@ -63,11 +65,14 @@
     ${Libkolab_LIBRARIES}
     ${Libkolabxml_LIBRARIES}
     ${QT_QTCORE_LIBRARY}
+    ${QT_QTNETWORK_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_GUI_LIBRARY}
     ${KDE_LIBRARIES}
 )
 
+enable_testing()
+
 add_subdirectory(lib)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

kolab-utils-3.1.tar.gz/fbdaemon/CMakeLists.txt -> kolab-utils-3.1.1.tar.gz/fbdaemon/CMakeLists.txt Changed

@@ -2,19 +2,27 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/authenticationjob.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/fbcoordinator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/fbgeneratorjob.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbgeneratorfolderjob.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generatefbjob.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/settings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kolabjob.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/fbaggregatorjob.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbdaemonserver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbdaemonthread.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbdaemonconnection.cpp
 )
     
 QT4_WRAP_CPP(FB_MOC
     ${CMAKE_CURRENT_SOURCE_DIR}/authenticationjob.h
     ${CMAKE_CURRENT_SOURCE_DIR}/fbcoordinator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/fbgeneratorjob.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbgeneratorfolderjob.h
     ${CMAKE_CURRENT_SOURCE_DIR}/generatefbjob.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kolabjob.h
     ${CMAKE_CURRENT_SOURCE_DIR}/fbaggregatorjob.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbdaemonserver.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbdaemonthread.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/fbdaemonconnection.h
 )
 
 set(FBDAEMON_SRCS ${FBDAEMON_SRCS} ${FB_MOC})

kolab-utils-3.1.tar.gz/fbdaemon/README -> kolab-utils-3.1.1.tar.gz/fbdaemon/README Changed

@@ -1,4 +1,4 @@
-The fbdeamon generates and aggreagates fb (freebusy) information on the kolab server.
+The fbdaemon generates and aggreagates fb (freebusy) information on the kolab server.
 
 == Functionality ==
 
@@ -31,6 +31,42 @@
 
 The default output directory is /var/lib/kolab-freebusy
 
+== Daemon mode ==
+
+A daemon that clients can use to generate F/B-Information for users and folders. The daemon starts an AF_INET socket for incoming connections.
+
+The protocol is similar to IMAP but untagged since no parallel requests are supported.
+
+Generate F/B for a user for the period between timestamp1 and timestamp2 which are unix timestamps:
+
+ C: IFB USER "$email" slot:$timestamp1-$timestamp2
+ S: * ({$datasize}\r\n$ifbdata)
+ S: OK
+
+The timestamps are optional, and $now:$now+$defaultvalue are used, if not available.
+
+Generate F/B for a folder for the period between timestamp1 and timestamp2 which are unix timestamps:
+
+ C: IFB FOLDER "$path" slot:$timestamp1-$timestamp2
+ S: * ({$datasize}\r\n$ifbdata)
+ S: OK
+
+The timestamps are optional, and $now:$now+$defaultvalue shall be used if not available.
+
+'interval' is a default nominator for a default interval, i.e.:
+
+ C: IFB EMAIL "$email" slot:interval-1402593346
+
+shall depict F/B $default_interval counting backwards from 1402593346, and
+
+ C: IFB EMAIL "$email" slot:1402593346-interval
+
+shall depict F/B $default_interval counting forwards from 1402593346.
+
+If there is an error:
+
+ S:BAD $reason
+
 == Configuration ==
 
 The configruation file is by default at /etc/kolab/kolab.conf. The location can be overridden using --configuration.
@@ -55,4 +91,4 @@
 * http://wiki.kolab.org/Free_Busy
 * http://wiki.kolab.org/FreeBusy_in_Kolab_3.0
 
-[0] https://wiki.kolab.org/User:Mollekopf/Drafts/KEP:17#Freebusy
\ No newline at end of file
+[0] https://wiki.kolab.org/User:Mollekopf/Drafts/KEP:17#Freebusy

kolab-utils-3.1.tar.gz/fbdaemon/authenticationjob.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/authenticationjob.cpp Changed

kolab-utils-3.1.tar.gz/fbdaemon/fbcoordinator.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/fbcoordinator.cpp Changed

kolab-utils-3.1.1.tar.gz/fbdaemon/fbdaemonconnection.cpp Added

@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+#include "fbdaemonconnection.h"
+#include "fbdaemonthread.h"
+#include "fbgeneratorjob.h"
+#include "fbgeneratorfolderjob.h"
+
+#include "settings.h"
+
+#include <xmlobject.h>
+#include <freebusy.h>
+#include <kpimutils/email.h>
+#include <kimap/rfccodecs.h>
+
+#include <QRegExp>
+#include <QStringList>
+
+FbDaemonConnection::FbDaemonConnection(FbDaemonThread* parent)
+    : QObject(parent)
+    , job(0)
+    , defaultTimeslot(1000)
+{
+    connect(parent, SIGNAL(newLine(const QByteArray&)), SLOT(onNewLine(const QByteArray&)));
+}
+
+FbDaemonConnection::~FbDaemonConnection()
+{
+    setJob(0);
+}
+
+void FbDaemonConnection::setJob(KJob* j)
+{
+    if (j == job) {
+        return;
+    }
+
+    if (job) {
+        emit job->kill();
+    }
+
+    job = j;
+}
+
+
+void FbDaemonConnection::generateForUser(const QStringList parameters)
+{
+    QString user = parameters[0];
+    if (!validateGenerateForUser(user)) {
+        sendError("emailaddress not valid");
+        return;
+    }
+
+    SessionSettings settings = Settings::instance().getSessionSettings();
+    settings.userName = user;
+    FBGeneratorJob *generator = new FBGeneratorJob(settings, false, this);
+
+    foreach(QString parameter, parameters.mid(1)) {
+        if (parameter.startsWith("slot:")) {
+            if (!validateTimeslot(parameter)) {
+                sendError("malformed timeslot");
+                return;
+            }
+            Timeslot slot = parseTimeslot(parameter);
+            generator->setTimeFrame(slot.start, slot.end);
+        } else {
+            sendError("unknown parameter");
+            return;
+        }
+    }
+
+    connect(generator, SIGNAL(result(KJob*)), this, SLOT(onGenerateUserDone(KJob*)));
+    setJob(generator);
+    generator->start();
+}
+
+void FbDaemonConnection::generateForFolder(const QStringList parameters)
+{
+    QString folder = parameters[0];
+    if (!validateGenerateForFolder(folder)) {
+        sendError("folder not valid");
+        return;
+    }
+    folder = KIMAP::decodeImapFolderName(folder);
+    SessionSettings settings = Settings::instance().getSessionSettings();
+    //Login as admin
+    settings.userName = settings.authorizationName;
+    settings.authorizationName = "";
+    FBGeneratorFolderJob *generator = new FBGeneratorFolderJob(settings, folder, this);
+
+    foreach(QString parameter, parameters.mid(1)) {
+        if (parameter.startsWith("slot:")) {
+            if (!validateTimeslot(parameter)) {
+                sendError("malformed timeslot");
+                return;
+            }
+            Timeslot slot = parseTimeslot(parameter);
+            generator->setTimeFrame(slot.start, slot.end);
+        } else {
+            sendError("unknown parameter");
+            return;
+        }
+    }
+
+    connect(generator, SIGNAL(result(KJob*)), this, SLOT(onGenerateFolderDone(KJob*)));
+    setJob(generator);
+    generator->start();
+}
+
+void FbDaemonConnection::onNewLine(const QByteArray& line)
+{
+    if (job) {
+        sendError("Can only process one command after another");
+        return;
+    }
+
+    QStringList tokens;
+    QString token;
+    QRegExp rx("([ \n\"])");
+
+    int pos = 0, oldpos = 0;
+    bool insideString = false;
+
+    line.trimmed();
+    while ((pos = rx.indexIn(line, pos)) != -1) {
+        if (insideString) {
+            if (line[pos - 1] == '\\') {               //escaped "
+                token += line.mid(oldpos, pos - oldpos - 1);
+            } else {
+                token += line.mid(oldpos, pos - oldpos);
+                if (rx.cap(1) == QString('"')) {
+                    insideString = false;
+                    token = token.mid(1, token.size() - 1);
+                }
+            }
+        } else {
+            if (oldpos > 0) {
+                oldpos += 1;
+            }
+            token = line.mid(oldpos, pos - oldpos);
+            if (rx.cap(1) == QString('"')) {
+                insideString = true;
+            }
+        }
+
+        if (!insideString && !token.trimmed().isEmpty()) {
+            tokens << token.trimmed();
+        }
+
+        oldpos = pos;
+        pos += 1;
+    }
+
+    if (insideString) {
+        sendError("no closing \" found");
+        return;
+    }
+
+    token = line.mid(oldpos + 1).trimmed();
+    if (!token.isEmpty()) {
+        tokens << token;
+    }
+
+    qDebug() << "tokens" << tokens;
+    if (tokens.size() < 3) {
+        sendError("command not valid");
+        return;
+    }
+
+    method = tokens[0].toAscii();
+
+    if (!validateMethod(method)) {
+        sendError("method not valid");
+        return;
+    }
+
+    QString submethod = tokens[1].toUpper();
+    QStringList parameters = tokens.mid(2);
+
+    if (submethod == "USER") {
+        generateForUser(parameters);
+    } else if (submethod == "FOLDER") {
+        generateForFolder(parameters);
+    } else {
+        sendError("unknown command: " + submethod.toAscii());

kolab-utils-3.1.1.tar.gz/fbdaemon/fbdaemonconnection.h Added

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+#ifndef FBDAEMONCONNECTION_H
+#define FBDAEMONCONNECTION_H
+
+#include <QObject>
+#include <QFile>
+#include <QStringList>
+#include <kdatetime.h>
+#include <kjob.h>
+#include <kolabfreebusy.h>
+class FbDaemonThread;
+class ConnectionTest;
+
+struct Timeslot {
+    KDateTime start;
+    KDateTime end;
+};
+
+class FbDaemonConnection : public QObject
+{
+    Q_OBJECT
+    friend class ConnectionTest;
+public:
+    FbDaemonConnection(FbDaemonThread* parent);
+    virtual ~FbDaemonConnection();
+
+signals:
+    void sendData(const QByteArray&);
+    void close();
+
+protected:
+    void setJob(KJob*);
+
+private:
+    const QByteArray createStatusLine(const QByteArray &status, const QByteArray &additional);
+    void generateForUser(const QStringList);
+    void generateForFolder(const QStringList);
+
+    void sendError(const QByteArray&);
+
+    bool validateMethod(const QByteArray&);
+    bool validateGenerateForUser(const QString&);
+    bool validateGenerateForFolder(const QString&);
+    bool validateTimeslot(const QString&);
+    Timeslot parseTimeslot(const QString&);
+
+    QByteArray method;
+    KJob *job;
+    int defaultTimeslot;
+private slots:
+    void onNewLine(const QByteArray&);
+    void onGenerateUserDone(KJob*);
+    void onGenerateFolderDone(KJob*);
+    void onSendFbObject(const Kolab::Freebusy&);
+
+
+};
+
+#endif // FBDAEMONCONNECTION_H

kolab-utils-3.1.1.tar.gz/fbdaemon/fbdaemonserver.cpp Added

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+#include "fbdaemonserver.h"
+#include <QThread>
+
+FbDaemonServer::FbDaemonServer(QObject *parent)
+    : QTcpServer(parent)
+{
+}
+
+FbDaemonServer::~FbDaemonServer()
+{
+    foreach(QThread * thread, mThreads) {
+        thread->quit();
+    }
+    foreach(QThread * thread, mThreads) {
+        thread->wait();
+        delete thread;
+    }
+}
+
+void FbDaemonServer::workerFinished(QThread *workerThread)
+{
+    //The worker thread is no longer necessary, so let's clean up.
+    //The worker object is cleaned up by the signal connected to deleteLater().
+    mThreads.remove(mThreads.indexOf(workerThread));
+    workerThread->quit();
+    workerThread->wait();
+    delete workerThread;
+}
+
+void FbDaemonServer::incomingConnection(int socketDescriptor)
+{
+    /**
+     * The concept is:
+     * Hand off the worker QObject to the worker thread, and never again touch it.
+     * All interaction is potentially from the wrong thread, so we're safer by not touch it.
+     * Everything that is happening in the worker object is happening from the worker thread =>
+     * we don't need to pay attention.
+     *
+     * By managing the thread from outside the object we can again ignore threading issues inside the object
+     * and keep the doors open to recycle threads in a thread pool.
+     */
+    FbDaemonThread *worker = new FbDaemonThread(socketDescriptor);
+    QThread *workerThread = new QThread();
+    worker->moveToThread(workerThread);
+    //Makes sure the FBDaemonThread is freed once the thread finishes and that the destructor is called from the worker thread
+    connect(workerThread, SIGNAL(finished()), worker, SLOT(deleteLater()));
+    connect(worker, SIGNAL(finished(QThread*)), this, SLOT(workerFinished(QThread*)));
+    //Starts the work in the new thread
+    QMetaObject::invokeMethod(worker, "start", Qt::QueuedConnection);
+    mThreads << workerThread;
+    workerThread->start();
+}
\ No newline at end of file

kolab-utils-3.1.1.tar.gz/fbdaemon/fbdaemonserver.h Added

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+
+#ifndef FBDAEMONSERVER_H
+#define FBDAEMONSERVER_H
+
+#include "fbdaemonthread.h"
+
+#include <QTcpServer>
+
+class FbDaemonServer : public QTcpServer
+{
+    Q_OBJECT
+
+public:
+    FbDaemonServer(QObject *parent = 0);
+    virtual ~FbDaemonServer();
+
+protected:
+    void incomingConnection(int socketDescriptor);
+private slots:
+    void workerFinished(QThread*);
+private:
+    QVector<QThread*> mThreads;
+};
+
+#endif
\ No newline at end of file

kolab-utils-3.1.1.tar.gz/fbdaemon/fbdaemonthread.cpp Added

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+#include "fbdaemonthread.h"
+
+#include <QtNetwork>
+
+FbDaemonThread::FbDaemonThread(int socketDescriptor, QObject* parent)
+    : QObject(parent)
+    , socketDescriptor(socketDescriptor)
+    , tcpSocket(0)
+    , connection(0)
+{
+    //This is the only part running in the parent thread, don't do anything here.
+}
+
+FbDaemonThread::~FbDaemonThread()
+{
+    //Ensure this is executed in the worker thread
+    Q_ASSERT(QThread::currentThread() == thread());
+    delete tcpSocket;
+    delete connection;
+}
+
+void FbDaemonThread::start()
+{
+    Q_ASSERT(QThread::currentThread() == thread());
+    tcpSocket = new QTcpSocket(this);
+    connection = new FbDaemonConnection(this);
+
+    if (!tcpSocket->setSocketDescriptor(socketDescriptor)) {
+        emit error(tcpSocket->error());
+        emit finished(thread());
+        return;
+    }
+
+    connect(tcpSocket, SIGNAL(readyRead()), SLOT(onData()));
+    connect(tcpSocket, SIGNAL(disconnected()), SLOT(onDisconnected()));
+    connect(tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
+
+    connect(connection, SIGNAL(sendData(const QByteArray&)), SLOT(onSendData(const QByteArray&)));
+    connect(connection, SIGNAL(close()), SLOT(onClose()));
+
+    qDebug() << "New client from " <<  tcpSocket->peerAddress() << tcpSocket->peerPort();
+}
+
+void FbDaemonThread::onDisconnected()
+{
+    Q_ASSERT(QThread::currentThread() == thread());
+    qDebug() << "disconnected";
+    emit finished(thread());
+}
+
+void FbDaemonThread::onSocketError(QAbstractSocket::SocketError error)
+{
+    Q_ASSERT(QThread::currentThread() == thread());
+    qWarning() << "Socket error: " << error;
+    emit this->error(error);
+    //Never call disconnectFromHost in error state. It will result in an endless loop because it tries to write data.
+    onClose();
+}
+
+void FbDaemonThread::onData()
+{
+    Q_ASSERT(QThread::currentThread() == thread());
+    data += tcpSocket->readAll();
+    if (data.contains('\n')) {
+        int bytes = data.indexOf('\n') + 1;
+        QByteArray message = data.left(bytes);
+        data = data.mid(bytes);
+        emit newLine(message);
+    }
+}
+
+void FbDaemonThread::onSendData(const QByteArray& block)
+{
+    Q_ASSERT(QThread::currentThread() == thread());
+    tcpSocket->write(block);
+}
+
+void FbDaemonThread::onClose()
+{
+    Q_ASSERT(QThread::currentThread() == thread());
+    tcpSocket->close();
+}
+

kolab-utils-3.1.1.tar.gz/fbdaemon/fbdaemonthread.h Added

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+#ifndef FBDEAMONTHREAD_H
+#define FBDEAMONTHREAD_H
+
+#include "fbdaemonconnection.h"
+
+#include <QObject>
+#include <QTcpSocket>
+
+class FbDaemonThread : public QObject
+{
+    Q_OBJECT
+
+public:
+    FbDaemonThread(int socketDescriptor, QObject *parent = 0);
+    virtual ~FbDaemonThread();
+
+public slots:
+    void start();
+
+signals:
+    void error(QAbstractSocket::SocketError socketError);
+    void finished(QThread*);
+    void newLine(const QByteArray&);
+
+private:
+    int socketDescriptor;
+
+    QTcpSocket* tcpSocket;
+    FbDaemonConnection* connection;
+
+    QByteArray data;
+
+private slots:
+    void onData();
+    void onDisconnected();
+    void onSocketError(QAbstractSocket::SocketError);
+
+    void onSendData(const QByteArray &);
+    void onClose();
+};
+
+#endif
\ No newline at end of file

kolab-utils-3.1.1.tar.gz/fbdaemon/fbgeneratorfolderjob.cpp Added

@@ -0,0 +1,158 @@
+/*
+    Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+
+    This library 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 2.1 of the License, or (at your option) any later version.
+
+    This library 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 library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+
+#include "fbgeneratorfolderjob.h"
+
+#include "settings.h"
+#include "generatefbjob.h"
+#include <jobs/getuserlistjob.h>
+#include <kimap/setacljob.h>
+#include <kimap/myrightsjob.h>
+#include <kimap/listjob.h>
+#include <kolabdefinitions.h>
+#include <commonconversion.h>
+
+FBGeneratorFolderJob::FBGeneratorFolderJob(const SessionSettings &settings, QString folder, QObject* parent)
+    :   KolabJob(settings, parent),
+        mFolder(folder),
+        resetRights(false)
+{
+    mStartOfTimeFrame = KDateTime::currentUtcDateTime();
+    mEndOfTimeFrame = mStartOfTimeFrame.addDays(Settings::instance().getTimeframe());
+}
+
+void FBGeneratorFolderJob::startWork()
+{
+    KIMAP::MyRightsJob *rightsJob = new KIMAP::MyRightsJob(mSession);
+    rightsJob->setMailBox(mFolder);
+    connect(rightsJob, SIGNAL(result(KJob*)), this, SLOT(onMyRightsDone(KJob*)));
+    rightsJob->start();
+}
+
+void FBGeneratorFolderJob::onMyRightsDone(KJob* job)
+{
+    if (job->error()) {
+        qWarning() << job->errorString();
+        setError(KJob::UserDefinedError);
+        setErrorText(job->errorString());
+        logout();
+        return;
+    }
+
+    KIMAP::MyRightsJob *rightsJob = qobject_cast<KIMAP::MyRightsJob*>(job);
+    Q_ASSERT(rightsJob);
+
+    if (!rightsJob->hasRightEnabled(KIMAP::Acl::Lookup)
+            || !rightsJob->hasRightEnabled(KIMAP::Acl::Read)
+            || !rightsJob->hasRightEnabled(KIMAP::Acl::KeepSeen)) {
+
+        rights = rightsJob->rights();
+
+        KIMAP::SetAclJob * aclJob = new KIMAP::SetAclJob(mSession);
+        aclJob->setRights(KIMAP::AclJobBase::Add, KIMAP::Acl::Lookup | KIMAP::Acl::Read | KIMAP::Acl::KeepSeen);
+        aclJob->setMailBox(mFolder);
+        connect(aclJob, SIGNAL(result(KJob*)), this, SLOT(onSetAclDone(KJob*)));
+        aclJob->start();
+    } else {
+        startGenerateFBJob();
+    }
+}
+
+void FBGeneratorFolderJob::onSetAclDone(KJob* job)
+{
+    qDebug() << "setAclDone" ;
+    if (job->error()) {
+        qWarning() << job->errorString();
+        setError(KJob::UserDefinedError);
+        logout();
+        return;
+    }
+    resetRights = true;
+    startGenerateFBJob();
+
+}
+
+void FBGeneratorFolderJob::startGenerateFBJob()
+{
+    QStringList folders;
+    folders << mFolder;
+    GenerateFBJob *fbJob = new GenerateFBJob(folders, mStartOfTimeFrame, mEndOfTimeFrame, mSession, this);
+    QObject::connect(fbJob, SIGNAL(result(KJob*)), this, SLOT(onGenerateFBDone(KJob*)));
+    fbJob->start();
+}
+
+
+void FBGeneratorFolderJob::onGenerateFBDone(KJob* job)
+{
+    if (job->error()) {
+        qWarning() << "Error " << job->errorString();
+        setError(KJob::UserDefinedError);
+        logout();
+        return;
+    }
+    GenerateFBJob *fbJob = qobject_cast<GenerateFBJob*>(job);
+    Q_ASSERT(fbJob);
+
+    mFreebusy = fbJob->getFreebusy();
+
+    const Kolab::ContactReference org(Kolab::ContactReference::EmailReference, Kolab::Conversion::toStdString(QLatin1String("fbdaemon@localhost")));
+    mFreebusy.setOrganizer(org);
+
+    logout();
+}
+
+void FBGeneratorFolderJob::logout()
+{
+    if (resetRights) {
+        KIMAP::SetAclJob * aclJob = new KIMAP::SetAclJob(mSession);
+        aclJob->setRights(KIMAP::AclJobBase::Add, rights);
+        aclJob->setMailBox(mFolder);
+        connect(aclJob, SIGNAL(result(KJob*)), this, SLOT(onResetAclDone(KJob*)));
+        aclJob->start();
+    } else {
+        KolabJob::logout();
+    }
+}
+
+void FBGeneratorFolderJob::onResetAclDone(KJob* job)
+{
+    if (job->error()) {
+        qWarning() << "Error " << job->errorString();
+        setError(KJob::UserDefinedError);
+    }
+    KolabJob::logout();
+}
+
+
+void FBGeneratorFolderJob::setTimeFrame(const KDateTime& start, const KDateTime& end)
+{
+    mStartOfTimeFrame = start;
+    mEndOfTimeFrame = end;
+}
+
+Kolab::Freebusy FBGeneratorFolderJob::getFreebusy() const
+{
+    return mFreebusy;
+}
+
+const QString& FBGeneratorFolderJob::getFolder() const
+{
+    return mFolder;
+}
+

kolab-utils-3.1.1.tar.gz/fbdaemon/fbgeneratorfolderjob.h Added

@@ -0,0 +1,63 @@
+/*
+ *  Copyright (C) 2014 Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+
+#ifndef FBGENERATORFOLDERJOB_H
+#define FBGENERATORFOLDERJOB_H
+#include "kolabjob.h"
+
+#include <kdatetime.h>
+#include <kolabfreebusy.h>
+#include <kimap/acl.h>
+
+class FBGeneratorFolderTest;
+
+class FBGeneratorFolderJob: public KolabJob
+{
+    Q_OBJECT
+    friend class FBGeneratorFolderTest;
+public:
+    explicit FBGeneratorFolderJob(const SessionSettings &settings, QString folder, QObject* parent = 0);
+
+    virtual void startWork();
+    void setTimeFrame(const KDateTime&, const KDateTime&);
+    void setEventFolders(const QStringList &);
+    Kolab::Freebusy getFreebusy() const;
+    const QString& getFolder() const;
+private slots:
+    void onMyRightsDone(KJob*);
+    void onSetAclDone(KJob*);
+    void onGenerateFBDone(KJob*);
+    void onResetAclDone(KJob*);
+
+protected:
+    virtual void logout();
+
+private:
+    void startGenerateFBJob();
+
+    QString mFolder;
+
+    Kolab::Freebusy mFreebusy;
+    KIMAP::Acl::Rights rights;
+    bool resetRights;
+
+    KDateTime mStartOfTimeFrame;
+    KDateTime mEndOfTimeFrame;
+};
+
+#endif // FBGENERATORJOB_H

kolab-utils-3.1.tar.gz/fbdaemon/fbgeneratorjob.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/fbgeneratorjob.cpp Changed

@@ -35,12 +35,13 @@
 #include <kimap/logoutjob.h>
 #include <kimap/expungejob.h>
 
-
-FBGeneratorJob::FBGeneratorJob(const SessionSettings &settings, QObject* parent)
-:   KolabJob(settings, parent),
-    mOldImapUid(-1)
+FBGeneratorJob::FBGeneratorJob(const SessionSettings &settings, bool store, QObject* parent)
+    : KolabJob(settings, parent),
+      mOldImapUid(-1),
+      mStore(store)
 {
-
+    mStartOfTimeFrame = KDateTime::currentUtcDateTime();
+    mEndOfTimeFrame = mStartOfTimeFrame.addDays(Settings::instance().getTimeframe());
 }
 
 QStringList FBGeneratorJob::requiredFolders()
@@ -48,6 +49,12 @@
     return QStringList() << KOLAB_FOLDER_TYPE_FREEBUSY;
 }
 
+void FBGeneratorJob::startGenerateFBJob()
+{
+    GenerateFBJob *fbJob = new GenerateFBJob(mEventFolders, mStartOfTimeFrame, mEndOfTimeFrame, mSession, this);
+    QObject::connect(fbJob, SIGNAL(result(KJob*)), this, SLOT(onGenerateFBDone(KJob*)));
+    fbJob->start();
+}
 
 void FBGeneratorJob::startWork()
 {
@@ -65,9 +72,13 @@
         return;
     }
 
-    FetchMessagesJob *fetchJob = new FetchMessagesJob(mFreebusyFolder, mSession, this);
-    connect( fetchJob, SIGNAL(result(KJob*)), this, SLOT(onFetchFBDone(KJob*)) );
-    fetchJob->start();
+    if (mStore) {
+        FetchMessagesJob *fetchJob = new FetchMessagesJob(mFreebusyFolder, mSession, this);
+        connect(fetchJob, SIGNAL(result(KJob*)), this, SLOT(onFetchFBDone(KJob*)));
+        fetchJob->start();
+    } else {
+        startGenerateFBJob();
+    }
 }
 
 
@@ -87,8 +98,6 @@
         kDebug() << "existing fb object " << msg->subject()->asUnicodeString();
     }
 
-    KDateTime startOfTimeFrame = KDateTime::currentUtcDateTime();
-    const KDateTime endOfTimeFrame = startOfTimeFrame.addDays(Settings::instance().getTimeframe());
     int threshold = Settings::instance().getThreshold();
 
     /*
@@ -110,13 +119,13 @@
             const KDateTime start = Kolab::Conversion::toDate(oldFB.start());
             const KDateTime end = Kolab::Conversion::toDate(oldFB.end());
 
-            qDebug() << startOfTimeFrame << start << endOfTimeFrame << end << threshold;
-            if (!(startOfTimeFrame < start || endOfTimeFrame > end.addDays(threshold))) {
+            qDebug() << mStartOfTimeFrame << start << mEndOfTimeFrame << end << threshold;
+            if (!(mStartOfTimeFrame < start || mEndOfTimeFrame > end.addDays(threshold))) {
                 qDebug() << "within threshold, skipping";
                 // upToDate = true;
                 continue;
             }
-            
+
             if (mOldImapUid < 0) {
                 mOldImapUid = fetchJob->getImapUid(msg);
                 mOldFlags = fetchJob->getFlags(msg);
@@ -138,9 +147,7 @@
 */
 
 //     kDebug() << mEventFolder;
-    GenerateFBJob *fbJob = new GenerateFBJob(mEventFolders, startOfTimeFrame, endOfTimeFrame, mSession, this);
-    QObject::connect(fbJob, SIGNAL(result(KJob*)), this, SLOT(onGenerateFBDone(KJob*)));
-    fbJob->start();
+    startGenerateFBJob();
 }
 
 void FBGeneratorJob::onGenerateFBDone(KJob *job)
@@ -153,24 +160,37 @@
     GenerateFBJob *fbJob = qobject_cast<GenerateFBJob*>( job );
     Q_ASSERT(fbJob);
 
-    Kolab::Freebusy fb = fbJob->getFreebusy();
-    if (!fb.isValid()) {
-        Debug() << "did not generate a fb object";
-        //TODO generate empty fb object to mark time as free
-        logout();
-        return;
-    }
+    mFreebusy = fbJob->getFreebusy();
+
     const Kolab::ContactReference org(Kolab::ContactReference::EmailReference, Kolab::Conversion::toStdString(mSessionSettings.userName));
-    fb.setOrganizer(org);
-    if (!fb.organizer().isValid()) {
-//         fb.setOrganizer(/*mUserName, mUserName+QLatin1Char('@')+mHostName.remove("imap.")*/);
+    mFreebusy.setOrganizer(org);
+
+    if (!mFreebusy.organizer().isValid()) {
+//        mFreebusy.setOrganizer(/*mUserName, mUserName+QLatin1Char('@')+mHostName.remove("imap.")*/);
         Warning() << "no valid organizer";
         setError(KJob::UserDefinedError);
         logout();
         return;
     }
 
-    KMime::Message::Ptr message = Kolab::KolabObjectWriter::writeFreebusy(fb);
+    // We want only create the freebusy object and do not want to store it at the IMAP server
+    if (mStore) {
+        storeFBObject();
+    } else {
+        logout();
+    }
+}
+
+void FBGeneratorJob::storeFBObject()
+{
+    if (!mFreebusy.isValid()) {
+        Debug() << "did not generate a fb object";
+        //TODO generate empty fb object to mark time as free
+        logout();
+        return;
+    }
+
+    KMime::Message::Ptr message = Kolab::KolabObjectWriter::writeFreebusy(mFreebusy);
     if (Kolab::ErrorHandler::instance().error() > Kolab::ErrorHandler::Debug) {
         Warning() << "Error: " << Kolab::ErrorHandler::instance().errorMessage();
         setError(KJob::UserDefinedError);
@@ -181,7 +201,7 @@
     qint16 port;
     message->appendHeader( new KMime::Headers::Generic( X_ORIGIN_HEADER, message.get(), Settings::instance().getServerUri(port).toUtf8(), "utf-8" ) );
     message->assemble();
-    
+
 //     kDebug() << message->encodedContent();
     SequentialCompositeJob *seqJob = new SequentialCompositeJob(this);
     seqJob->addSubjob(new MessageModifyJob(message, mFreebusyFolder, mOldFlags, mOldImapUid, mSession, this));
@@ -198,3 +218,13 @@
     logout();
 }
 
+void FBGeneratorJob::setTimeFrame(const KDateTime &start, const KDateTime &end)
+{
+    mStartOfTimeFrame = start;
+    mEndOfTimeFrame = end;
+}
+
+Kolab::Freebusy FBGeneratorJob::getFreebusy()
+{
+    return mFreebusy;
+}

kolab-utils-3.1.tar.gz/fbdaemon/fbgeneratorjob.h -> kolab-utils-3.1.1.tar.gz/fbdaemon/fbgeneratorjob.h Changed

@@ -19,29 +19,44 @@
 #ifndef FBGENERATORJOB_H
 #define FBGENERATORJOB_H
 #include <kjob.h>
+#include <kdatetime.h>
 #include <kimap/session.h>
 #include <kimap/fetchjob.h>
+#include <kolabfreebusy.h>
 #include "kolabjob.h"
 
+class FBGeneratorTest;
+
 class FBGeneratorJob: public KolabJob
 {
     Q_OBJECT
+    friend class FBGeneratorTest;
 public:
-    explicit FBGeneratorJob(const SessionSettings &settings, QObject* parent = 0);
+    explicit FBGeneratorJob(const SessionSettings &settings, bool store, QObject* parent = 0);
+
+    Kolab::Freebusy getFreebusy();
+    void setTimeFrame(const KDateTime&, const KDateTime&);
 private Q_SLOTS:
     void onFetchFBDone(KJob *job);
     void onGenerateFBDone(KJob*);
     void onModDone(KJob*);
 protected:
     virtual QStringList requiredFolders();
+    void startGenerateFBJob();
 private:
     virtual void startWork();
+    void storeFBObject();
 
     QString mFreebusyFolder;
     QStringList mEventFolders;
 
+    Kolab::Freebusy mFreebusy;
+    bool mStore;
     qint64 mOldImapUid;
     KIMAP::MessageFlags mOldFlags;
+
+    KDateTime mStartOfTimeFrame;
+    KDateTime mEndOfTimeFrame;
 };
 
 #endif // FBGENERATORJOB_H

kolab-utils-3.1.tar.gz/fbdaemon/generatefbjob.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/generatefbjob.cpp Changed

kolab-utils-3.1.tar.gz/fbdaemon/kolabjob.h -> kolab-utils-3.1.1.tar.gz/fbdaemon/kolabjob.h Changed

kolab-utils-3.1.tar.gz/fbdaemon/main.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/main.cpp Changed

@@ -22,6 +22,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include "fbcoordinator.h"
+#include "fbdaemonserver.h"
 #include "settings.h"
 #include "kolabutils-version.h"
 
@@ -36,7 +37,7 @@
     options.add("c").add("configuration <file>", ki18n("Configuration file"), "/etc/kolab/kolab.conf");
     options.add("g").add("generate", ki18n("Generate partial f/b lists for user"));
     options.add("a").add("aggregate", ki18n("Aggregate partial f/b lists for user"));
-    options.add("d").add("daemon", ki18n("Run daemon (todo)"));
+    options.add("d").add("daemon", ki18n("Run daemon"));
     options.add("generateall", ki18n("Generate and aggregate for all users within domain"));
     options.add("+[user/filter]", ki18n("User for generation/aggregation | Contains-Filter for userlist for which freebusy is generated (leave empty to generate for all)"));
 
@@ -78,8 +79,14 @@
         }
         
     }
+    
     if (args->isSet("daemon")) {
-
+        FbDaemonServer *server(new FbDaemonServer(&app));
+        if (!server->listen(QHostAddress::Any, args->arg(0).toUInt())) {
+            kWarning() << "Can't start server";
+            return -1;
+        }
+        nothingTodo = false;
     }
     if (!nothingTodo) {
         app.exec();

kolab-utils-3.1.tar.gz/fbdaemon/settings.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/settings.cpp Changed

kolab-utils-3.1.tar.gz/fbdaemon/settings.h -> kolab-utils-3.1.1.tar.gz/fbdaemon/settings.h Changed

kolab-utils-3.1.tar.gz/fbdaemon/tests/CMakeLists.txt -> kolab-utils-3.1.1.tar.gz/fbdaemon/tests/CMakeLists.txt Changed

@@ -1,14 +1,34 @@
+add_definitions (-DSCENARIO_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-set(FBTEST_DEPENDENCIES ${COMMON_DEPENDENCIES} ${QT_QTTEST_LIBRARY} kolabutils fb_static)
+set(FBTEST_DEPENDENCIES ${COMMON_DEPENDENCIES} ${QT_QTTEST_LIBRARY} ${KDE_KIMAPTEST} kolabutils fb_static)
+
+set (FBTEST_SRCS
+    fbgeneratortest.cpp
+    fbgeneratorfoldertest.cpp
+    fbaggregatortest.cpp
+    cyrusfakeserver.cpp
+    daemonconnectiontest.cpp
+)
+
+QT4_AUTOMOC("${FBTEST_SRCS}")
+
+add_executable(fbaggregatortest fbaggregatortest.cpp cyrusfakeserver.cpp)
+target_link_libraries(fbaggregatortest ${FBTEST_DEPENDENCIES})
+add_test(fbaggregatortest fbaggregatortest)
 
-qt4_automoc(fbgeneratortest.cpp)
-add_executable(fbgeneratortest fbgeneratortest.cpp)
+add_executable(fbgeneratortest fbgeneratortest.cpp cyrusfakeserver.cpp)
 target_link_libraries(fbgeneratortest ${FBTEST_DEPENDENCIES})
+add_test(fbgeneratortest fbgeneratortest)
+
+add_executable(fbgeneratorfoldertest fbgeneratorfoldertest.cpp cyrusfakeserver.cpp)
+target_link_libraries(fbgeneratorfoldertest ${FBTEST_DEPENDENCIES})
+add_test(fbgeneratorfoldertest fbgeneratorfoldertest)
 
-qt4_automoc(fbaggregatortest.cpp)
-add_executable(fbaggregatortest fbaggregatortest.cpp)
-target_link_libraries(fbaggregatortest ${FBTEST_DEPENDENCIES})
\ No newline at end of file
+add_executable(daemonconnectiontest daemonconnectiontest.cpp cyrusfakeserver.cpp)
+target_link_libraries(daemonconnectiontest ${FBTEST_DEPENDENCIES})
+add_test(daemonconnectiontest daemonconnectiontest)

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/README Added

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/cyrusfakeserver.cpp Added

@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2014  Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+#include "cyrusfakeserver.h"
+
+#include <QDebug>
+#include <QRegExp>
+#include <QFile>
+#include <QTest>
+
+CyrusFakeServer::CyrusFakeServer(QObject* parent)
+    : FakeServer(parent)
+{
+
+}
+
+QByteArray tagReplace(QString line, int tagCount)
+{
+    QRegExp tag(" A[0-9]{6} ");
+    QRegExp tag2("\nA[0-9]{6} ");
+
+    line.replace(tag, " A" + QByteArray::number(tagCount).rightJustified(6, '0') + " ");
+    line.replace(tag2, "\nA" + QByteArray::number(tagCount).rightJustified(6, '0') + " ");
+    return line.toUtf8().trimmed();
+
+}
+
+void CyrusFakeServer::addScenarioFromFile(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.exists()) {
+        qWarning() << "File: " << fileName << "does not exist.";
+    }
+    file.open(QFile::ReadOnly);
+
+    QList<QByteArray> scenario;
+
+    // When loading from files we never have the authentication phase
+    // force jumping directly to authenticated state.
+    scenario << greeting()
+             << "C: A000001 AUTHENTICATE PLAIN"
+             << "S: A000001 OK";
+
+    QString line, newLine;
+    int tagCount = 1;
+    QString type;
+
+    QRegExp server("^>[0-9]{10}>");
+    QRegExp client("^<[0-9]{10}<");
+
+    while (!file.atEnd()) {
+        newLine = file.readLine();
+        if (client.indexIn(newLine) > -1) {
+            //qDebug() << line.trimmed();
+            if (!line.trimmed().isEmpty()) {
+                scenario << tagReplace(line, tagCount);
+            }
+            tagCount++;
+            type = "C: ";
+            line = newLine.replace(client, type);
+        } else if (server.indexIn(newLine) > -1) {
+            //qDebug() << line.trimmed();
+            if (!line.trimmed().isEmpty()) {
+                scenario << tagReplace(line, tagCount);
+            }
+            type = "S: ";
+            line = newLine.replace(server, type);
+        } else if (!type.isEmpty()) {
+            if (newLine.startsWith("* ")) {
+                line = line;
+                scenario << tagReplace(line, tagCount);
+                line = type;
+            }
+            line += newLine;
+        }
+
+    }
+    //qDebug() << line.trimmed();
+    if (!line.trimmed().isEmpty()) {
+        scenario << tagReplace(line, tagCount);
+    }
+
+    file.close();
+
+    addScenario(scenario);
+}
+
+void CyrusFakeServer::compareReceived(const QByteArray& received, const QByteArray& expected) const
+{
+    QRegExp append("^C: A[0-9]{6} APPEND \"Freebusy\"");
+    if (append.indexIn(expected) == 0) {
+        QVERIFY(append.indexIn(received) == 0);
+    } else {
+        FakeServer::compareReceived(received, expected);
+    }
+}
+
+
+#include "cyrusfakeserver.moc"
\ No newline at end of file

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/cyrusfakeserver.h Added

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014  Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+#ifndef CYRUSFAKESERVER_H
+#define CYRUSFAKESERVER_H
+
+#include <kimaptest/fakeserver.h>
+
+class CyrusFakeServer : public FakeServer
+{
+    Q_OBJECT
+public:
+    CyrusFakeServer(QObject* parent = 0);
+    void addScenarioFromFile(const QString &fileName);
+
+protected:
+    virtual void compareReceived(const QByteArray& received, const QByteArray& expected) const;
+
+};
+
+#endif // CYRUSFAKESERVER_H

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/daemonconnectiontest.cpp Added

@@ -0,0 +1,330 @@
+/*
+   Copyright (C) 2013 Christian Mollekopf <mollekopf@kolabsys.com>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 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
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include "daemonconnectiontest.h"
+#include "fbdaemonthread.h"
+#include "fbgeneratorjob.h"
+#include "fbgeneratorfolderjob.h"
+#include "cyrusfakeserver.h"
+#include "settings.h"
+
+#include <kcalcore/memorycalendar.h>
+#include <kcalcore/icalformat.h>
+
+#include <kimaptest/fakeserver.h>
+#include <xmlobject.h>
+#include <kcalconversion.h>
+#include <kolabformat.h>
+
+#include <QTcpSocket>
+#include <QtTest>
+#include <QDebug>
+
+ConnectionTest::ConnectionTest(QObject* parent): QObject(parent)
+{
+    Settings::instance().setAuthorizationUser("cyrus-admin");
+    Settings::instance().setTestMode(true);
+    Settings::instance().setPassword("admin");
+    Settings::instance().setServerUri("127.0.0.1:5989");
+    Settings::instance().setThreshold(10);
+    Settings::instance().setTimeframe(60);
+    Settings::instance().setAggregatedICalOutputDirectory(QDir::tempPath());
+}
+
+
+FbDaemonConnection* ConnectionTest::createConnection()
+{
+    FbDaemonThread* thread(new FbDaemonThread(0));
+    FbDaemonConnection* connection(new FbDaemonConnection(thread));
+    mSpySendData = new QSignalSpy(connection, SIGNAL(sendData(QByteArray)));
+    return connection;
+}
+
+
+void ConnectionTest::compareSendData(const QString& sendData)
+{
+    QCOMPARE(mSpySendData->count(), 1);
+    QList<QVariant> arguments = mSpySendData->takeFirst();
+    QCOMPARE(arguments.at(0).type(), QVariant::ByteArray);
+    QCOMPARE(arguments.at(0).toString(), sendData);
+}
+
+
+void ConnectionTest::testDoubleCommand()
+{
+    FbDaemonConnection* connection(createConnection());
+
+    SessionSettings settings = Settings::instance().getSessionSettings();
+    FBGeneratorJob *generator = new FBGeneratorJob(settings, false, this);
+    connection->setJob(generator);
+
+    connection->onNewLine("IFB USER test@example.com");
+
+    compareSendData("BAD Can only process one command after another\r\n\r\n");
+}
+
+void ConnectionTest::testBadCommand()
+{
+    FbDaemonConnection* connection(createConnection());
+    connection->onNewLine("IFB UNKNOWN test@example.com");
+    compareSendData("BAD IFB unknown command: UNKNOWN\r\n\r\n");
+    connection->onNewLine("IFB USER test@example.com asdfaesf");
+    compareSendData("BAD IFB unknown parameter\r\n\r\n");
+}
+
+void ConnectionTest::testBadMethod()
+{
+    FbDaemonConnection* connection(createConnection());
+    connection->onNewLine("UNKNOWN USER test@example.com");
+    compareSendData("BAD UNKNOWN method not valid\r\n\r\n");
+}
+
+void ConnectionTest::testBadUser()
+{
+    FbDaemonConnection* connection(createConnection());
+    connection->onNewLine("IFB USER qasdfaserdsfsar");
+    compareSendData("BAD IFB emailaddress not valid\r\n\r\n");
+}
+
+void ConnectionTest::testBadTimeslot()
+{
+    FbDaemonConnection* connection(createConnection());
+    connection->onNewLine("IFB USER test@example.com slot:asdsadf-xxxx");
+    compareSendData("BAD IFB malformed timeslot\r\n\r\n");
+}
+
+void ConnectionTest::testValidateTimeslot()
+{
+    FbDaemonConnection* connection(createConnection());
+    QCOMPARE(connection->validateTimeslot("slot:interval-1402593346"), true);
+    QCOMPARE(connection->validateTimeslot("slot:interval-interval"), true);
+    QCOMPARE(connection->validateTimeslot("slot:1402593346-interval"), true);
+    QCOMPARE(connection->validateTimeslot("slot:xxxx-ffff"), false);
+}
+
+void ConnectionTest::testParseTimeslot()
+{
+    FbDaemonConnection* connection(createConnection());
+    Timeslot slot;
+
+    slot = connection->parseTimeslot("");
+    QVERIFY(slot.start.secsTo(KDateTime::currentUtcDateTime()) < 2);  // $now
+    QCOMPARE(slot.start.daysTo(slot.end), Settings::instance().getTimeframe()); // $now+$defaultvalue
+
+    slot = connection->parseTimeslot("slot:interval-interval");
+    QVERIFY(slot.start.secsTo(KDateTime::currentUtcDateTime()) < 2);  // $now
+    QCOMPARE(slot.start.daysTo(slot.end), Settings::instance().getTimeframe()); // $now+$defaultvalue
+
+    slot = connection->parseTimeslot("slot:1402593346-interval");
+    QCOMPARE(slot.start.dateTime(), QDateTime::fromTime_t(1402593346));
+    QCOMPARE(slot.start.daysTo(slot.end), Settings::instance().getTimeframe()); // $now+$defaultvalue
+
+    slot = connection->parseTimeslot("slot:interval-1402593346");
+    QCOMPARE(slot.end.dateTime(), QDateTime::fromTime_t(1402593346));
+    QCOMPARE(slot.start.daysTo(slot.end), Settings::instance().getTimeframe());  // 1402593346 - $defaultvalue
+
+    slot = connection->parseTimeslot("slot:1402500000-1402593346");
+    QCOMPARE(slot.start.dateTime(), QDateTime::fromTime_t(1402500000));
+    QCOMPARE(slot.end.dateTime(), QDateTime::fromTime_t(1402593346));
+}
+
+void ConnectionTest::testGeneratorUserJob()
+{
+    CyrusFakeServer fakeServer;
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/generator/imap-6398.withoutattach");
+    fakeServer.startAndWait();
+
+    QEventLoop loop(this);
+    KDateTime start;
+    KDateTime end;
+    start.setTime_t(1400604981);
+    end.setTime_t(1405788981);
+    FbDaemonConnection* connection(createConnection());
+    connection->onNewLine("IFB USER john.doe@example.com slot:1400604981-1405788981");
+    connect(connection->job, SIGNAL(result(KJob*)),
+            &loop, SLOT(quit()));
+    loop.exec();
+
+    QRegExp ifb("\\* \$\\{([0-9]+)\\} \r\n(.*)\$");
+
+    QCOMPARE(mSpySendData->count(), 1);
+    QList<QVariant> arguments = mSpySendData->takeFirst();
+    QCOMPARE(arguments.at(0).type(), QVariant::ByteArray);
+    QCOMPARE(ifb.indexIn(arguments.at(0).toString()), 0);
+    QCOMPARE(ifb.cap(1).toInt(), ifb.cap(2).size());    // Object size == expected size
+    const QString sFb = ifb.cap(2);
+
+    KCalCore::ICalFormat format;
+    KCalCore::Calendar::Ptr cal(new KCalCore::MemoryCalendar(KDateTime::Spec::UTC()));
+    KCalCore::ScheduleMessage::Ptr msg = format.parseScheduleMessage(cal, sFb);
+    QVERIFY(msg);
+    QCOMPARE(msg->method(), KCalCore::iTIPPublish);
+    QCOMPARE(format.timeSpec(), KDateTime::Spec::UTC());
+    QVERIFY(msg->event());
+
+    KCalCore::FreeBusy::Ptr event = msg->event().staticCast<KCalCore::FreeBusy>();
+    QCOMPARE(event->organizer()->email(), QLatin1String("john.doe@example.com"));
+
+    QCOMPARE(event->dtStart(), start);
+    QCOMPARE(event->dtEnd(), end);
+
+    QVERIFY(!event->uid().isEmpty());
+
+    QVERIFY(fakeServer.isAllScenarioDone());
+    fakeServer.quit();
+}
+
+void ConnectionTest::testGeneratorFolderJob()
+{
+    CyrusFakeServer fakeServer;
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/generatefolder/normal.log");
+    fakeServer.startAndWait();
+

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/daemonconnectiontest.h Added

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data Added

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/aggregator Added

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/aggregator/imap-28470 Added

@@ -0,0 +1,360 @@
+---------- john.@example.com Thu May 22 11:29:51 2014
+
+<1400750991<A000004 CAPABILITY
+>1400750991>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400750991<A000005 NAMESPACE
+>1400750991>* NAMESPACE (("" "/")) (("Other Users/" "/")) (("Shared Folders/" "/"))
+A000005 OK Completed
+<1400750991<A000006 LIST "" "*"
+>1400750991>* LIST (\Noinferiors \HasNoChildren) "/" INBOX
+* LIST (\HasChildren) "/" Calendar
+* LIST (\HasNoChildren) "/" "Calendar/Personal Calendar"
+* LIST (\HasNoChildren) "/" Freebusy
+A000006 OK Completed (0.010 secs 4 calls)
+<1400750991<A000007 GETMETADATA "INBOX" (/shared/vendor/kolab/folder-type)
+>1400750991>* METADATA INBOX (/shared/vendor/kolab/folder-type NIL)
+A000007 OK Completed
+<1400750991<A000009 GETMETADATA "Calendar" (/shared/vendor/kolab/folder-type)
+>1400750991>* METADATA Calendar (/shared/vendor/kolab/folder-type "event")
+A000009 OK Completed
+<1400750991<A000010 GETMETADATA "Calendar/Personal Calendar" (/shared/vendor/kolab/folder-type)
+>1400750991>* METADATA "Calendar/Personal Calendar" (/shared/vendor/kolab/folder-type "event")
+A000010 OK Completed
+<1400750991<A000016 GETMETADATA "Freebusy" (/shared/vendor/kolab/folder-type)
+>1400750991>* METADATA Freebusy (/shared/vendor/kolab/folder-type "freebusy")
+A000016 OK Completed
+<1400750991<A000023 EXAMINE "Freebusy"
+>1400750991>* 3 EXISTS
+* 3 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UNSEEN 1] Ok
+* OK [UIDVALIDITY 1399892394] Ok
+* OK [UIDNEXT 5] Ok
+* OK [HIGHESTMODSEQ 5] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000023 OK [READ-ONLY] Completed
+<1400750991<A000024 FETCH 1:3 (RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] FLAGS UID)
+>1400750991>* 1 FETCH (FLAGS () UID 1 INTERNALDATE "12-May-2014 13:02:37 +0200" RFC822.SIZE 2427 BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {88}
+Date: Mon, 12 May 2014 11:02:39 +0000
+Subject: 54f648b6-1607-4839-b8da-3a918e895234
+
+)
+* 2 FETCH (FLAGS () UID 2 INTERNALDATE "12-May-2014 13:03:00 +0200" RFC822.SIZE 2897 BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {88}
+Date: Mon, 12 May 2014 11:03:02 +0000
+Subject: f5213a7a-274f-489f-9ddc-e626084723e0
+
+)
+* 3 FETCH (FLAGS () UID 3 INTERNALDATE "12-May-2014 13:38:50 +0200" RFC822.SIZE 3359 BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {88}
+Date: Mon, 12 May 2014 11:39:07 +0000
+Subject: 0b820eb3-cfb5-4ec9-ac31-4aa6174ad535
+
+)
+A000024 OK Completed (0.010 sec)
+<1400750991<A000025 UID FETCH 1,2,3 (RFC822.SIZE INTERNALDATE BODY.PEEK[] FLAGS UID)
+>1400750991>* 1 FETCH (FLAGS () UID 1 INTERNALDATE "12-May-2014 13:02:37 +0200" RFC822.SIZE 2427 BODY[] {2430}
+Date: Mon, 12 May 2014 11:02:39 +0000
+X-Kolab-Type: application/x-vnd.kolab.freebusy
+X-Kolab-Mime-Version: 3.0
+User-Agent: Libkolab-0.6
+Content-Type: multipart/mixed; boundary="nextPart2153659.LG6uWRnTG9"
+Subject: 54f648b6-1607-4839-b8da-3a918e895234
+MIME-Version: 1.0
+X-Freebusy-Origin: kolab.example.com
+
+
+--nextPart2153659.LG6uWRnTG9
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7Bit
+
+This is a Kolab Groupware object.
+To view this object you will need an email client that can understand the Kolab Groupware format.
+For a list of such email clients please visit
+http://www.kolab.org/get-kolab
+
+--nextPart2153659.LG6uWRnTG9
+Content-Type: application/calendar+xml; name="kolab.xml"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="kolab.xml"
+
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no" ?>
+<icalendar xmlns=3D"urn:ietf:params:xml:ns:icalendar-2.0">
+
+  <vcalendar>
+    <properties>
+      <prodid>
+        <text>Libkolab-0.6 Libkolabxml-1.1</text>
+      </prodid>
+      <version>
+        <text>2.0</text>
+      </version>
+      <x-kolab-version>
+        <text>3.1.0</text>
+      </x-kolab-version>
+    </properties>
+    <components>
+      <vfreebusy>
+        <properties>
+          <uid>
+            <text>54f648b6-1607-4839-b8da-3a918e895234</text>
+          </uid>
+          <dtstamp>
+            <date-time>2014-05-12T11:02:39Z</date-time>
+          </dtstamp>
+          <dtstart>
+            <date-time>2014-05-12T11:02:39Z</date-time>
+          </dtstart>
+          <dtend>
+            <date-time>2014-07-11T11:02:39Z</date-time>
+          </dtend>
+          <organizer>
+            <parameters/>
+            <cal-address>mailto:%3Cjohn.doe%40example.com%3E</cal-address>
+          </organizer>
+          <freebusy>
+            <parameters>
+              <fbtype>
+                <text>BUSY</text>
+              </fbtype>
+              <x-event>
+                <uid>uid1</uid>
+                <summary/>
+                <location/>
+              </x-event>
+            </parameters>
+            <period>
+              <start>2014-05-12T11:02:39Z</start>
+              <end>2014-05-12T12:02:38Z</end>
+            </period>
+          </freebusy>
+        </properties>
+      </vfreebusy>
+    </components>
+  </vcalendar>
+
+</icalendar>
+
+--nextPart2153659.LG6uWRnTG9--
+)
+* 2 FETCH (FLAGS () UID 2 INTERNALDATE "12-May-2014 13:03:00 +0200" RFC822.SIZE 2897 BODY[] {2900}
+Date: Mon, 12 May 2014 11:03:02 +0000
+X-Kolab-Type: application/x-vnd.kolab.freebusy
+X-Kolab-Mime-Version: 3.0
+User-Agent: Libkolab-0.6
+Content-Type: multipart/mixed; boundary="nextPart20900622.dmZn1H714V"
+Subject: f5213a7a-274f-489f-9ddc-e626084723e0
+MIME-Version: 1.0
+X-Freebusy-Origin: kolab.example.com
+
+
+--nextPart20900622.dmZn1H714V
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7Bit
+
+This is a Kolab Groupware object.
+To view this object you will need an email client that can understand the Kolab Groupware format.
+For a list of such email clients please visit
+http://www.kolab.org/get-kolab
+
+--nextPart20900622.dmZn1H714V
+Content-Type: application/calendar+xml; name="kolab.xml"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="kolab.xml"
+
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no" ?>
+<icalendar xmlns=3D"urn:ietf:params:xml:ns:icalendar-2.0">
+
+  <vcalendar>
+    <properties>
+      <prodid>
+        <text>Libkolab-0.6 Libkolabxml-1.1</text>
+      </prodid>
+      <version>
+        <text>2.0</text>
+      </version>
+      <x-kolab-version>
+        <text>3.1.0</text>
+      </x-kolab-version>
+    </properties>
+    <components>
+      <vfreebusy>
+        <properties>
+          <uid>
+            <text>f5213a7a-274f-489f-9ddc-e626084723e0</text>
+          </uid>
+          <dtstamp>
+            <date-time>2014-05-12T11:03:02Z</date-time>
+          </dtstamp>
+          <dtstart>
+            <date-time>2014-05-12T11:03:02Z</date-time>
+          </dtstart>
+          <dtend>
+            <date-time>2014-07-11T11:03:02Z</date-time>
+          </dtend>
+          <organizer>
+            <parameters/>
+            <cal-address>mailto:%3Cjohn.doe%40example.com%3E</cal-address>
+          </organizer>

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generatefolder Added

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generatefolder/empty.log Added

@@ -0,0 +1,34 @@
+---------- cyrus-admin Thu May 22 11:10:25 2014
+
+<1400749825<A000004 CAPABILITY
+>1400749825>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400749825<A000005 NAMESPACE
+>1400749825>* NAMESPACE NIL (("user/" "/")) (("" "/"))
+A000005 OK Completed
+<1400749825<A000006 LIST "" *
+>1400749825>* LIST (\HasNoChildren) "/" Freebusy
+* LIST (\HasNoChildren) "/" shared/Resources/berlin@example.com
+* LIST (\HasNoChildren) "/" "shared/Resources/mega 1000@example.com"
+* LIST (\HasNoChildren) "/" shared/Resources/mybeamer@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb@example.com
+* LIST (\HasNoChildren) "/" user/bmqvi.nbczhbxkbb/Archive@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb/Calendar@example.com
+A000006 OK Completed (0.030 secs 7 calls)
+<1400749825<A000007 MYRIGHTS "shared/Resources/mybeamer@example.com"
+>1400749825>* MYRIGHTS shared/Resources/mybeamer@example.com lrsa
+A000007 OK Completed
+<1400749825<A000008 EXAMINE "shared/Resources/mybeamer@example.com"
+>1400749825>* 0 EXISTS
+* 0 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UIDVALIDITY 1400675720] Ok
+* OK [UIDNEXT 1] Ok
+* OK [HIGHESTMODSEQ 1] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000008 OK [READ-ONLY] Completed
+<1400749825<A000009 LOGOUT
+>1400749825>* BYE LOGOUT received
+A000009 OK Completed

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generatefolder/normal.log Added

@@ -0,0 +1,115 @@
+---------- cyrus-admin Thu May 22 11:10:25 2014
+
+<1400749825<A000004 CAPABILITY
+>1400749825>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400749825<A000005 NAMESPACE
+>1400749825>* NAMESPACE NIL (("user/" "/")) (("" "/"))
+A000005 OK Completed
+<1400749825<A000006 LIST "" *
+>1400749825>* LIST (\HasNoChildren) "/" Freebusy
+* LIST (\HasNoChildren) "/" shared/Resources/berlin@example.com
+* LIST (\HasNoChildren) "/" "shared/Resources/mega 1000@example.com"
+* LIST (\HasNoChildren) "/" shared/Resources/mybeamer@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb@example.com
+* LIST (\HasNoChildren) "/" user/bmqvi.nbczhbxkbb/Archive@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb/Calendar@example.com
+A000006 OK Completed (0.030 secs 7 calls)
+<1400749825<A000007 MYRIGHTS "shared/Resources/mybeamer@example.com"
+>1400749825>* MYRIGHTS shared/Resources/mybeamer@example.com lrsa
+A000007 OK Completed
+<1400749825<A000008 EXAMINE "shared/Resources/mybeamer@example.com"
+>1400749825>* 1 EXISTS
+* 0 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UIDVALIDITY 1400675720] Ok
+* OK [UIDNEXT 2] Ok
+* OK [HIGHESTMODSEQ 2] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000008 OK [READ-ONLY] Completed
+<1400091057<A000009 FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {56}
+Date: Mon, 12 May 2014 11:02:38 +0000
+Subject: uid1
+
+)
+A000009 OK Completed (0.000 sec)
+<1400091057<A000010 UID FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[] {1968}
+Date: Mon, 12 May 2014 11:02:38 +0000
+X-Kolab-Type: application/x-vnd.kolab.event
+X-Kolab-Mime-Version: 3.0
+User-Agent: fbtest Libkolab-0.6
+Content-Type: multipart/mixed; boundary="nextPart1645803.C9AV0NgWoz"
+Subject: uid1
+MIME-Version: 1.0
+
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7Bit
+
+This is a Kolab Groupware object.
+To view this object you will need an email client that can understand the Kolab Groupware format.
+For a list of such email clients please visit
+http://www.kolab.org/get-kolab
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: application/calendar+xml; name="kolab.xml"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="kolab.xml"
+
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no" ?>
+<icalendar xmlns=3D"urn:ietf:params:xml:ns:icalendar-2.0">
+
+  <vcalendar>
+    <properties>
+      <prodid>
+        <text>fbtest Libkolab-0.6 Libkolabxml-1.1</text>
+      </prodid>
+      <version>
+        <text>2.0</text>
+      </version>
+      <x-kolab-version>
+        <text>3.1.0</text>
+      </x-kolab-version>
+    </properties>
+    <components>
+      <vevent>
+        <properties>
+          <uid>
+            <text>uid1</text>
+          </uid>
+          <created>
+            <date-time>2014-05-12T11:02:38Z</date-time>
+          </created>
+          <dtstamp>
+            <date-time>2014-05-12T11:02:38Z</date-time>
+          </dtstamp>
+          <sequence>
+            <integer>0</integer>
+          </sequence>
+          <class>
+            <text>PUBLIC</text>
+          </class>
+          <dtstart>
+            <date-time>2014-06-12T11:02:38Z</date-time>
+          </dtstart>
+          <dtend>
+            <date-time>2014-06-12T12:02:38Z</date-time>
+          </dtend>
+        </properties>
+      </vevent>
+    </components>
+  </vcalendar>
+
+</icalendar>
+
+--nextPart1645803.C9AV0NgWoz--
+)
+A000010 OK Completed (0.020 sec)
+<1400749825<A000011 LOGOUT
+>1400749825>* BYE LOGOUT received
+A000011 OK Completed

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generatefolder/notfound.log Added

@@ -0,0 +1,22 @@
+---------- cyrus-admin Thu May 22 11:18:49 2014
+
+<1400750329<A000004 CAPABILITY
+>1400750329>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400750329<A000005 NAMESPACE
+>1400750329>* NAMESPACE NIL (("user/" "/")) (("" "/"))
+A000005 OK Completed
+<1400750329<A000006 LIST "" *
+>1400750329>* LIST (\HasNoChildren) "/" Freebusy
+* LIST (\HasNoChildren) "/" shared/Resources/berlin@example.com
+* LIST (\HasNoChildren) "/" "shared/Resources/mega 1000@example.com"
+* LIST (\HasNoChildren) "/" shared/Resources/mybeamer@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb@example.com
+* LIST (\HasNoChildren) "/" user/bmqvi.nbczhbxkbb/Archive@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb/Calendar@example.com
+A000006 OK Completed (0.030 secs 7 calls)
+<1400750329<A000007 MYRIGHTS "shared/Resources/bla@example.com"
+>1400750329>A000007 NO Mailbox does not exist
+<1400750329<A000008 LOGOUT
+>1400750329>* BYE LOGOUT received
+A000008 OK Completed

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generatefolder/setrights.log Added

@@ -0,0 +1,119 @@
+---------- cyrus-admin Thu May 22 11:10:25 2014
+
+<1400749825<A000004 CAPABILITY
+>1400749825>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400749825<A000005 NAMESPACE
+>1400749825>* NAMESPACE NIL (("user/" "/")) (("" "/"))
+A000005 OK Completed
+<1400749825<A000006 LIST "" *
+>1400749825>* LIST (\HasNoChildren) "/" Freebusy
+* LIST (\HasNoChildren) "/" shared/Resources/berlin@example.com
+* LIST (\HasNoChildren) "/" "shared/Resources/mega 1000@example.com"
+* LIST (\HasNoChildren) "/" shared/Resources/mybeamer@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb@example.com
+* LIST (\HasNoChildren) "/" user/bmqvi.nbczhbxkbb/Archive@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb/Calendar@example.com
+A000006 OK Completed (0.030 secs 7 calls)
+<1400749825<A000007 MYRIGHTS "shared/Resources/mybeamer@example.com"
+>1400749825>* MYRIGHTS shared/Resources/mybeamer@example.com a
+A000007 OK Completed
+<1400749825<A000008 SETACL "shared/Resources/mybeamer@example.com" "" "+lrs"
+>1400749825>A000008 OK Completed
+<1400749825<A000009 EXAMINE "shared/Resources/mybeamer@example.com"
+>1400749825>* 1 EXISTS
+* 0 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UIDVALIDITY 1400675720] Ok
+* OK [UIDNEXT 2] Ok
+* OK [HIGHESTMODSEQ 2] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000009 OK [READ-ONLY] Completed
+<1400091057<A000010 FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {56}
+Date: Mon, 12 May 2014 11:02:38 +0000
+Subject: uid1
+
+)
+A000010 OK Completed (0.000 sec)
+<1400091057<A000011 UID FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[] {1968}
+Date: Mon, 12 May 2014 11:02:38 +0000
+X-Kolab-Type: application/x-vnd.kolab.event
+X-Kolab-Mime-Version: 3.0
+User-Agent: fbtest Libkolab-0.6
+Content-Type: multipart/mixed; boundary="nextPart1645803.C9AV0NgWoz"
+Subject: uid1
+MIME-Version: 1.0
+
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7Bit
+
+This is a Kolab Groupware object.
+To view this object you will need an email client that can understand the Kolab Groupware format.
+For a list of such email clients please visit
+http://www.kolab.org/get-kolab
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: application/calendar+xml; name="kolab.xml"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="kolab.xml"
+
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no" ?>
+<icalendar xmlns=3D"urn:ietf:params:xml:ns:icalendar-2.0">
+
+  <vcalendar>
+    <properties>
+      <prodid>
+        <text>fbtest Libkolab-0.6 Libkolabxml-1.1</text>
+      </prodid>
+      <version>
+        <text>2.0</text>
+      </version>
+      <x-kolab-version>
+        <text>3.1.0</text>
+      </x-kolab-version>
+    </properties>
+    <components>
+      <vevent>
+        <properties>
+          <uid>
+            <text>uid1</text>
+          </uid>
+          <created>
+            <date-time>2014-05-12T11:02:38Z</date-time>
+          </created>
+          <dtstamp>
+            <date-time>2014-05-12T11:02:38Z</date-time>
+          </dtstamp>
+          <sequence>
+            <integer>0</integer>
+          </sequence>
+          <class>
+            <text>PUBLIC</text>
+          </class>
+          <dtstart>
+            <date-time>2014-06-12T11:02:38Z</date-time>
+          </dtstart>
+          <dtend>
+            <date-time>2014-06-12T12:02:38Z</date-time>
+          </dtend>
+        </properties>
+      </vevent>
+    </components>
+  </vcalendar>
+
+</icalendar>
+
+--nextPart1645803.C9AV0NgWoz--
+)
+A000011 OK Completed (0.020 sec)
+<1400749825<A000012 SETACL "shared/Resources/mybeamer@example.com" "" "+a"
+>1400749825>A000012 OK Completed
+<1400749825<A000013 LOGOUT
+>1400749825>* BYE LOGOUT received
+A000013 OK Completed

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generatefolder/systemioerror.log Added

@@ -0,0 +1,25 @@
+---------- cyrus-admin Thu May 22 11:11:56 2014
+
+<1400749916<A000004 CAPABILITY
+>1400749916>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400749916<A000005 NAMESPACE
+>1400749916>* NAMESPACE NIL (("user/" "/")) (("" "/"))
+A000005 OK Completed
+<1400749916<A000006 LIST "" *
+>1400749916>* LIST (\HasNoChildren) "/" Freebusy
+* LIST (\HasNoChildren) "/" shared/Resources/berlin@example.com
+* LIST (\HasNoChildren) "/" "shared/Resources/mega 1000@example.com"
+* LIST (\HasNoChildren) "/" shared/Resources/mybeamer@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb@example.com
+* LIST (\HasNoChildren) "/" user/bmqvi.nbczhbxkbb/Archive@example.com
+* LIST (\HasChildren) "/" user/bmqvi.nbczhbxkbb/Calendar@example.com
+A000006 OK Completed (0.040 secs 7 calls)
+<1400749916<A000007 MYRIGHTS "shared/Resources/mega 1000@example.com"
+>1400749916>* MYRIGHTS "shared/Resources/mega 1000@example.com" lrsa
+A000007 OK Completed
+<1400749916<A000008 EXAMINE "shared/Resources/mega 1000@example.com"
+>1400749916>A000008 NO System I/O error
+<1400749916<A000009 LOGOUT
+>1400749916>* BYE LOGOUT received
+A000009 OK Completed

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generator Added

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generator/imap-6398 Added

@@ -0,0 +1,229 @@
+<1400091056<A000004 CAPABILITY
+>1400091056>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400091056<A000005 NAMESPACE
+>1400091056>* NAMESPACE (("" "/")) (("Other Users/" "/")) (("Shared Folders/" "/"))
+A000005 OK Completed
+<1400091056<A000006 LIST "" "*"
+>1400091056>* LIST (\Noinferiors \HasNoChildren) "/" INBOX
+* LIST (\HasChildren) "/" Calendar
+* LIST (\HasNoChildren) "/" "Calendar/Personal Calendar"
+* LIST (\HasNoChildren) "/" Freebusy
+A000006 OK Completed (0.010 secs 19 calls)
+<1400091056<A000007 GETMETADATA "INBOX" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA INBOX (/shared/vendor/kolab/folder-type NIL)
+A000007 OK Completed
+<1400091056<A000009 GETMETADATA "Calendar" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA Calendar (/shared/vendor/kolab/folder-type "event")
+A000009 OK Completed
+<1400091056<A000010 GETMETADATA "Calendar/Personal Calendar" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA "Calendar/Personal Calendar" (/shared/vendor/kolab/folder-type "event")
+A000010 OK Completed
+<1400091056<A000016 GETMETADATA "Freebusy" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA Freebusy (/shared/vendor/kolab/folder-type "freebusy")
+A000016 OK Completed
+<1400091056<A000023 EXAMINE "Freebusy"
+>1400091056>* 0 EXISTS
+* 0 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UNSEEN 1] Ok
+* OK [UIDVALIDITY 1399892394] Ok
+* OK [UIDNEXT 0] Ok
+* OK [HIGHESTMODSEQ 0] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000023 OK [READ-ONLY] Completed
+<1400091057<A000026 EXAMINE "Calendar/Personal Calendar"
+>1400091057>* OK [CLOSED] Ok
+* 0 EXISTS
+* 0 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UIDVALIDITY 1399478510] Ok
+* OK [UIDNEXT 1] Ok
+* OK [HIGHESTMODSEQ 1] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000026 OK [READ-ONLY] Completed
+<1400091057<A000027 EXAMINE "Calendar"
+>1400091057>* OK [CLOSED] Ok
+* 1 EXISTS
+* 1 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UNSEEN 1] Ok
+* OK [UIDVALIDITY 1399478510] Ok
+* OK [UIDNEXT 1] Ok
+* OK [HIGHESTMODSEQ 1] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000027 OK [READ-ONLY] Completed
+<1400091057<A000028 FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {56}
+Date: Mon, 12 May 2014 11:02:38 +0000
+Subject: uid1
+
+)
+A000028 OK Completed (0.000 sec)
+<1400091057<A000029 UID FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[] {1968}
+Date: Mon, 12 May 2014 11:02:38 +0000
+X-Kolab-Type: application/x-vnd.kolab.event
+X-Kolab-Mime-Version: 3.0
+User-Agent: fbtest Libkolab-0.6
+Content-Type: multipart/mixed; boundary="nextPart1645803.C9AV0NgWoz"
+Subject: uid1
+MIME-Version: 1.0
+
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7Bit
+
+This is a Kolab Groupware object.
+To view this object you will need an email client that can understand the Kolab Groupware format.
+For a list of such email clients please visit
+http://www.kolab.org/get-kolab
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: application/calendar+xml; name="kolab.xml"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="kolab.xml"
+
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no" ?>
+<icalendar xmlns=3D"urn:ietf:params:xml:ns:icalendar-2.0">
+
+  <vcalendar>
+    <properties>
+      <prodid>
+        <text>fbtest Libkolab-0.6 Libkolabxml-1.1</text>
+      </prodid>
+      <version>
+        <text>2.0</text>
+      </version>
+      <x-kolab-version>
+        <text>3.1.0</text>
+      </x-kolab-version>
+    </properties>
+    <components>
+      <vevent>
+        <properties>
+          <uid>
+            <text>uid1</text>
+          </uid>
+          <created>
+            <date-time>2014-06-12T11:02:38Z</date-time>
+          </created>
+          <dtstamp>
+            <date-time>2014-06-12T11:02:38Z</date-time>
+          </dtstamp>
+          <sequence>
+            <integer>0</integer>
+          </sequence>
+          <class>
+            <text>PUBLIC</text>
+          </class>
+          <dtstart>
+            <date-time>2014-06-12T11:02:38Z</date-time>
+          </dtstart>
+          <dtend>
+            <date-time>2014-06-12T12:02:38Z</date-time>
+          </dtend>
+        </properties>
+      </vevent>
+    </components>
+  </vcalendar>
+
+</icalendar>
+
+--nextPart1645803.C9AV0NgWoz--
+)
+A000029 OK Completed (0.020 sec)
+<1400091057<A000030 APPEND "Freebusy" {1932}
+Date: Wed, 14 May 2014 18:11:02 +0000
+X-Kolab-Type: application/x-vnd.kolab.freebusy
+X-Kolab-Mime-Version: 3.0
+User-Agent: Libkolab-0.6
+Content-Type: multipart/mixed; boundary="nextPart10956538.CFazvYchSy"
+Subject: 9b23003c-c31a-48e9-b6e9-f63564858663
+MIME-Version: 1.0
+X-Freebusy-Origin: kolab.example.com
+
+
+--nextPart10956538.CFazvYchSy
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7Bit
+
+This is a Kolab Groupware object.
+To view this object you will need an email client that can understand the Kolab Groupware format.
+For a list of such email clients please visit
+http://www.kolab.org/get-kolab
+
+--nextPart10956538.CFazvYchSy
+Content-Type: application/calendar+xml; name="kolab.xml"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="kolab.xml"
+
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no" ?>
+<icalendar xmlns=3D"urn:ietf:params:xml:ns:icalendar-2.0">
+
+  <vcalendar>
+    <properties>
+      <prodid>
+        <text>Libkolab-0.6 Libkolabxml-1.1</text>
+      </prodid>
+      <version>
+        <text>2.0</text>
+      </version>
+      <x-kolab-version>
+        <text>3.1.0</text>
+      </x-kolab-version>
+    </properties>
+    <components>
+      <vfreebusy>
+        <properties>
+          <uid>
+            <text>9b23003c-c31a-48e9-b6e9-f63564858663</text>
+          </uid>
+          <dtstamp>
+            <date-time>2014-05-14T18:11:02Z</date-time>
+          </dtstamp>
+          <dtstart>
+            <date-time>2014-05-14T18:11:01Z</date-time>
+          </dtstart>
+          <dtend>
+            <date-time>2014-07-13T18:11:01Z</date-time>
+          </dtend>
+          <organizer>
+            <parameters/>

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/data/generator/imap-6398.withoutattach Added

@@ -0,0 +1,133 @@
+<1400091056<A000004 CAPABILITY
+>1400091056>* CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE ACL RIGHTS=kxten QUOTA MAILBOX-REFERRALS NAMESPACE UIDPLUS NO_ATOMIC_RENAME UNSELECT CHILDREN MULTIAPPEND BINARY CATENATE CONDSTORE ESEARCH SEARCH=FUZZY SORT SORT=MODSEQ SORT=DISPLAY SORT=UID THREAD=ORDEREDSUBJECT THREAD=REFERENCES ANNOTATEMORE ANNOTATE-EXPERIMENT-1 METADATA LIST-EXTENDED LIST-STATUS LIST-MYRIGHTS WITHIN QRESYNC SCAN XLIST XMOVE MOVE SPECIAL-USE CREATE-SPECIAL-USE DIGEST=SHA1 URLAUTH URLAUTH=BINARY LOGINDISABLED COMPRESS=DEFLATE X-QUOTA=STORAGE X-QUOTA=MESSAGE X-QUOTA=X-ANNOTATION-STORAGE X-QUOTA=X-NUM-FOLDERS IDLE
+A000004 OK Completed
+<1400091056<A000005 NAMESPACE
+>1400091056>* NAMESPACE (("" "/")) (("Other Users/" "/")) (("Shared Folders/" "/"))
+A000005 OK Completed
+<1400091056<A000006 LIST "" "*"
+>1400091056>* LIST (\Noinferiors \HasNoChildren) "/" INBOX
+* LIST (\HasChildren) "/" Calendar
+* LIST (\HasNoChildren) "/" "Calendar/Personal Calendar"
+* LIST (\HasNoChildren) "/" Freebusy
+A000006 OK Completed (0.010 secs 19 calls)
+<1400091056<A000007 GETMETADATA "INBOX" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA INBOX (/shared/vendor/kolab/folder-type NIL)
+A000007 OK Completed
+<1400091056<A000009 GETMETADATA "Calendar" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA Calendar (/shared/vendor/kolab/folder-type "event")
+A000009 OK Completed
+<1400091056<A000010 GETMETADATA "Calendar/Personal Calendar" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA "Calendar/Personal Calendar" (/shared/vendor/kolab/folder-type "event")
+A000010 OK Completed
+<1400091056<A000016 GETMETADATA "Freebusy" (/shared/vendor/kolab/folder-type)
+>1400091056>* METADATA Freebusy (/shared/vendor/kolab/folder-type "freebusy")
+A000016 OK Completed
+<1400091057<A000026 EXAMINE "Calendar/Personal Calendar"
+>1400091057>* OK [CLOSED] Ok
+* 0 EXISTS
+* 0 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UIDVALIDITY 1399478510] Ok
+* OK [UIDNEXT 1] Ok
+* OK [HIGHESTMODSEQ 1] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000026 OK [READ-ONLY] Completed
+<1400091057<A000027 EXAMINE "Calendar"
+>1400091057>* OK [CLOSED] Ok
+* 1 EXISTS
+* 1 RECENT
+* FLAGS (\Answered \Flagged \Draft \Deleted \Seen)
+* OK [PERMANENTFLAGS ()] Ok
+* OK [UNSEEN 1] Ok
+* OK [UIDVALIDITY 1399478510] Ok
+* OK [UIDNEXT 1] Ok
+* OK [HIGHESTMODSEQ 1] Ok
+* OK [URLMECH INTERNAL] Ok
+* OK [ANNOTATIONS 65536] Ok
+A000027 OK [READ-ONLY] Completed
+<1400091057<A000028 FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {56}
+Date: Mon, 12 May 2014 11:02:38 +0000
+Subject: uid1
+
+)
+A000028 OK Completed (0.000 sec)
+<1400091057<A000029 UID FETCH 1 (RFC822.SIZE INTERNALDATE BODY.PEEK[] FLAGS UID)
+>1400091057>* 1 FETCH (FLAGS (\Recent) UID 1 INTERNALDATE "12-May-2014 13:02:36 +0200" RFC822.SIZE 1970 BODY[] {1968}
+Date: Mon, 12 May 2014 11:02:38 +0000
+X-Kolab-Type: application/x-vnd.kolab.event
+X-Kolab-Mime-Version: 3.0
+User-Agent: fbtest Libkolab-0.6
+Content-Type: multipart/mixed; boundary="nextPart1645803.C9AV0NgWoz"
+Subject: uid1
+MIME-Version: 1.0
+
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7Bit
+
+This is a Kolab Groupware object.
+To view this object you will need an email client that can understand the Kolab Groupware format.
+For a list of such email clients please visit
+http://www.kolab.org/get-kolab
+
+--nextPart1645803.C9AV0NgWoz
+Content-Type: application/calendar+xml; name="kolab.xml"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="kolab.xml"
+
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no" ?>
+<icalendar xmlns=3D"urn:ietf:params:xml:ns:icalendar-2.0">
+
+  <vcalendar>
+    <properties>
+      <prodid>
+        <text>fbtest Libkolab-0.6 Libkolabxml-1.1</text>
+      </prodid>
+      <version>
+        <text>2.0</text>
+      </version>
+      <x-kolab-version>
+        <text>3.1.0</text>
+      </x-kolab-version>
+    </properties>
+    <components>
+      <vevent>
+        <properties>
+          <uid>
+            <text>uid1</text>
+          </uid>
+          <created>
+            <date-time>2014-05-12T11:02:38Z</date-time>
+          </created>
+          <dtstamp>
+            <date-time>2014-05-12T11:02:38Z</date-time>
+          </dtstamp>
+          <sequence>
+            <integer>0</integer>
+          </sequence>
+          <class>
+            <text>PUBLIC</text>
+          </class>
+          <dtstart>
+            <date-time>2014-06-12T11:02:38Z</date-time>
+          </dtstart>
+          <dtend>
+            <date-time>2014-06-12T12:02:38Z</date-time>
+          </dtend>
+        </properties>
+      </vevent>
+    </components>
+  </vcalendar>
+
+</icalendar>
+
+--nextPart1645803.C9AV0NgWoz--
+)
+A000029 OK Completed (0.020 sec)
+<1400091057<A000033 LOGOUT
+>1400091057>* BYE LOGOUT received
+A000033 OK Completed

kolab-utils-3.1.tar.gz/fbdaemon/tests/fbaggregatortest.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/tests/fbaggregatortest.cpp Changed

@@ -33,15 +33,19 @@
 
 FBAggregatorTest::FBAggregatorTest(QObject* parent)
     : QObject(parent),
-        targethost("192.168.122.10"),
-        user("john.doe@example.org"),
-        admin("cyrus-admin"),
-        adminpw("admin"),
-        port(143)
+      user("john.doe@example.org")
 {
+    Settings::instance().setAuthorizationUser("cyrus-admin");
+    Settings::instance().setTestMode(true);
+    Settings::instance().setPassword("admin");
+    Settings::instance().setServerUri("127.0.0.1:5989");
+    Settings::instance().setThreshold(10);
+    Settings::instance().setTimeframe(60);
+    Settings::instance().setAggregatedICalOutputDirectory(QDir::tempPath());
+
     Object fbObj1;
     Kolab::Freebusy fb;
-    fb.setOrganizer(Kolab::ContactReference("mail@example.com", "john doe"));
+    fb.setOrganizer(Kolab::ContactReference(user.toAscii().data(), "john doe"));
     fb.setStart(Kolab::Conversion::fromDate(KDateTime::currentUtcDateTime()));
     fb.setEnd(Kolab::Conversion::fromDate(KDateTime::currentUtcDateTime().addDays(60)));
     fbObj1.object = QVariant::fromValue(Kolab::KolabObjectWriter::writeFreebusy(fb, Kolab::KolabV3, "fbtest"));
@@ -55,27 +59,8 @@
     folders << Folder("Freebusy", Kolab::FreebusyType, QList<Object>() << fbObj1 << fbObj2);
 }
 
-void FBAggregatorTest::setupTargetAccount()
-{
-    QObject obj;
-    KolabAccount *account = new KolabAccount(&obj);
-    account->setHost(targethost, port);
-    account->setCredentials(user, adminpw, admin);
-    account->setEncryptionMode(KIMAP::LoginJob::TlsV1);
-    QVERIFY(account->init());
-
-    account->cleanAccount();
-    createFolders(account, folders);
-}
-
 void FBAggregatorTest::executeAggregation()
 {
-    Settings::instance().setAuthorizationUser(admin);
-    Settings::instance().setPassword(adminpw);
-    Settings::instance().setServerUri(targethost);
-    Settings::instance().setThreshold(10);
-    Settings::instance().setTimeframe(60);
-    Settings::instance().setAggregatedICalOutputDirectory(QDir::tempPath());
     SessionSettings sessionSettings = Settings::instance().getSessionSettings();
     sessionSettings.userName = user;
 
@@ -89,12 +74,10 @@
 {
     QVERIFY(QFileInfo(generatedFile).exists());
     QFile file(generatedFile);
-    QVERIFY(file.open(QIODevice::ReadOnly|QIODevice::Text));
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream in(&file);
     QString data = in.readAll();
 
-    qDebug() << data;
-
     KCalCore::ICalFormat format;
     KCalCore::Calendar::Ptr cal(new KCalCore::MemoryCalendar(KDateTime::Spec::UTC()));
     KCalCore::ScheduleMessage::Ptr msg = format.parseScheduleMessage(cal, data);
@@ -102,20 +85,25 @@
     QCOMPARE(msg->method(), KCalCore::iTIPPublish);
     QCOMPARE(format.timeSpec(), KDateTime::Spec::UTC());
     QVERIFY(msg->event());
-    QCOMPARE(msg->event()->organizer()->email(), QLatin1String("john.doe@example.org"));
+    QCOMPARE(msg->event()->organizer()->email(), user);
     QVERIFY(!msg->event()->uid().isEmpty());
-    QVERIFY(msg->event()->lastModified().isValid());
-
-    //Check that aggregated fb object has been created
+    //QVERIFY(msg->event()->lastModified().isValid());
+    //TODO:test content of aggregated file
 }
-    
+
 void FBAggregatorTest::testGenerator()
 {
-    setupTargetAccount();
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/aggregator/imap-28470");
+    fakeServer.startAndWait();
+
     executeAggregation();
     checkFbObject();
+
+    QVERIFY(fakeServer.isAllScenarioDone());
+    fakeServer.quit();
 }
 
 QTEST_MAIN(FBAggregatorTest)
 
-#include "fbaggregatortest.moc"
\ No newline at end of file
+#include "fbaggregatortest.moc"

kolab-utils-3.1.tar.gz/fbdaemon/tests/fbaggregatortest.h -> kolab-utils-3.1.1.tar.gz/fbdaemon/tests/fbaggregatortest.h Changed

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/fbgeneratorfoldertest.cpp Added

@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2014  Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+#include "fbgeneratorfoldertest.h"
+#include "cyrusfakeserver.h"
+
+#include <QTest>
+#include <QDebug>
+#include <QDir>
+#include <iostream>
+
+#include <xmlobject.h>
+#include <kolabobject.h>
+#include <freebusy.h>
+#include <kcalconversion.h>
+#include "settings.h"
+#include "kolabaccount.h"
+#include "fbdaemon/fbgeneratorfolderjob.h"
+
+FBGeneratorFolderTest::FBGeneratorFolderTest(QObject* parent)
+    : QObject(parent),
+      user("john.doe@example.org")
+{
+    Settings::instance().setAuthorizationUser("cyrus-admin");
+    Settings::instance().setTestMode(true);
+    Settings::instance().setPassword("admin");
+    Settings::instance().setServerUri("127.0.0.1:5989");
+    Settings::instance().setThreshold(10);
+    Settings::instance().setTimeframe(60);
+    Settings::instance().setAggregatedICalOutputDirectory(QDir::tempPath());
+}
+
+Kolab::Freebusy FBGeneratorFolderTest::executeGeneration(const QString &folder, KDateTime start, KDateTime end)
+{
+
+    SessionSettings sessionSettings = Settings::instance().getSessionSettings();
+    sessionSettings.userName = user;
+
+    QObject obj;
+    FBGeneratorFolderJob *job = new FBGeneratorFolderJob(sessionSettings, folder , &obj);
+    job->setTimeFrame(start, end);
+    job->exec();
+
+    return job->getFreebusy();
+}
+
+void FBGeneratorFolderTest::executeGenerationError(const QString &folder, KDateTime start, KDateTime end, QString expected)
+{
+
+    SessionSettings sessionSettings = Settings::instance().getSessionSettings();
+    sessionSettings.userName = user;
+
+    QObject obj;
+    FBGeneratorFolderJob *job = new FBGeneratorFolderJob(sessionSettings, folder , &obj);
+    job->setTimeFrame(start, end);
+    job->exec();
+
+    QVERIFY(job->error());
+    QCOMPARE(job->errorString(), expected);
+}
+
+void FBGeneratorFolderTest::compareFreeBusy(Kolab::Freebusy fb1, Kolab::Freebusy fb2)
+{
+    QCOMPARE((int)fb1.periods().size(), (int)fb2.periods().size());
+    QCOMPARE(fb1.organizer(), fb2.organizer());
+    QCOMPARE(fb1.start(), fb2.start());
+    QCOMPARE(fb1.end(), fb2.end());
+    for (std::size_t i = 0; i < fb1.periods().size(); i++) {
+        std::cout << i;
+        QCOMPARE(fb1.periods().at(i), fb2.periods().at(i));
+    }
+}
+
+void FBGeneratorFolderTest::testGenerator()
+{
+    CyrusFakeServer fakeServer;
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/generatefolder/normal.log");
+    fakeServer.addScenarioFromFile(dir.path() + "/generatefolder/setrights.log");
+    fakeServer.startAndWait();
+
+    KDateTime start;
+    KDateTime end;
+    Kolab::cDateTime s(2014, 6, 12, 11, 2, 38, true);
+    Kolab::cDateTime e(2014, 6, 12, 12, 2, 38, true);
+    Kolab::Period period(s, e);
+    start.setTime_t(1400604981);
+    end.setTime_t(1405788981);
+
+    Kolab::Freebusy fb1 = executeGeneration("shared/Resources/mybeamer@example.com", start, end);
+    Kolab::Freebusy fb2 = executeGeneration("shared/Resources/mybeamer@example.com", start, end);
+
+    QCOMPARE((int)fb1.periods().size(), 1);
+    QCOMPARE(fb1.organizer(), Kolab::ContactReference(QString("fbdaemon@localhost").toUtf8().constData()));
+    QCOMPARE(Kolab::Conversion::toDate(fb1.start()), start);
+    QCOMPARE(Kolab::Conversion::toDate(fb1.end()), end);
+    QCOMPARE((int)fb1.periods().at(0).periods().size(), 1);
+    QCOMPARE(fb1.periods().at(0).periods().at(0), period);
+    QVERIFY(!fb1.uid().empty());
+    QVERIFY(!fb2.uid().empty());
+
+    compareFreeBusy(fb2, fb1);
+
+    QVERIFY(fakeServer.isAllScenarioDone());
+    fakeServer.quit();
+}
+
+void FBGeneratorFolderTest::testGeneratorEmpty()
+{
+    CyrusFakeServer fakeServer;
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/generatefolder/empty.log");
+    fakeServer.startAndWait();
+
+    KDateTime start;
+    KDateTime end;
+    Kolab::cDateTime s(2014, 6, 12, 11, 2, 38, true);
+    Kolab::cDateTime e(2014, 6, 12, 12, 2, 38, true);
+    Kolab::Period period(s, e);
+    start.setTime_t(1400604981);
+    end.setTime_t(1405788981);
+
+    Kolab::Freebusy fb1 = executeGeneration("shared/Resources/mybeamer@example.com", start, end);
+
+    QCOMPARE((int)fb1.periods().size(), 0);
+    QCOMPARE(fb1.organizer(), Kolab::ContactReference(QString("fbdaemon@localhost").toUtf8().constData()));
+    QCOMPARE(Kolab::Conversion::toDate(fb1.start()), start);
+    QCOMPARE(Kolab::Conversion::toDate(fb1.end()), end);
+    QVERIFY(!fb1.uid().empty());
+
+    QVERIFY(fakeServer.isAllScenarioDone());
+    fakeServer.quit();
+}
+
+void FBGeneratorFolderTest::testFailedNotFound()
+{
+    CyrusFakeServer fakeServer;
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/generatefolder/notfound.log");
+    fakeServer.startAndWait();
+
+    KDateTime start;
+    KDateTime end;
+    start.setTime_t(1400604981);
+    end.setTime_t(1405788981);
+
+    QString errString = QString("MyRights failed, server replied: A000005 NO Mailbox does not exist ");
+    executeGenerationError("shared/Resources/bla@example.com", start, end, errString);
+
+    QVERIFY(fakeServer.isAllScenarioDone());
+    fakeServer.quit();
+}
+
+void FBGeneratorFolderTest::testFailedSystemIoError()
+{
+    CyrusFakeServer fakeServer;
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/generatefolder/systemioerror.log");
+    fakeServer.startAndWait();
+
+    KDateTime start;
+    KDateTime end;
+    start.setTime_t(1400604981);
+    end.setTime_t(1405788981);
+
+    executeGenerationError("shared/Resources/mega 1000@example.com", start, end, "");
+
+    QVERIFY(fakeServer.isAllScenarioDone());
+    fakeServer.quit();
+}
+
+
+void FBGeneratorFolderTest::testSetTimeframe()
+{
+    SessionSettings sessionSettings = Settings::instance().getSessionSettings();
+    QObject obj;
+    FBGeneratorFolderJob job(sessionSettings, "", &obj);
+
+    QVERIFY(job.mStartOfTimeFrame.secsTo(KDateTime::currentUtcDateTime()) < 2);  // $now
+    QCOMPARE(job.mStartOfTimeFrame.daysTo(job.mEndOfTimeFrame), Settings::instance().getTimeframe()); // $now+$defaultvalue
+
+    KDateTime start;
+    KDateTime end;
+    start.setTime_t(12345);
+    end.setTime_t(67890);
+    job.setTimeFrame(start, end);

kolab-utils-3.1.1.tar.gz/fbdaemon/tests/fbgeneratorfoldertest.h Added

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2014  Sandro Knauß <knauss@kolabsys.com>
+ *
+ * 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/>.
+ */
+#ifndef FBGENERATORFOLDERTEST_H
+#define FBGENERATORFOLDERTEST_H
+
+#include <QObject>
+
+#include "testlib/testutils.h"
+
+class KolabAccount;
+class KDateTime;
+
+class FBGeneratorFolderTest: public QObject
+{
+    Q_OBJECT
+public:
+    explicit FBGeneratorFolderTest(QObject* parent = 0);
+
+private slots:
+    void testGenerator();
+    void testGeneratorEmpty();
+    void testFailedNotFound();
+    void testFailedSystemIoError();
+    void testSetTimeframe();
+private:
+    Kolab::Freebusy executeGeneration(const QString&, KDateTime, KDateTime);
+    void executeGenerationError(const QString&, KDateTime, KDateTime, QString);
+    void compareFreeBusy(Kolab::Freebusy fb1, Kolab::Freebusy fb2);
+
+    QString user;
+
+};
+
+#endif
\ No newline at end of file

kolab-utils-3.1.tar.gz/fbdaemon/tests/fbgeneratortest.cpp -> kolab-utils-3.1.1.tar.gz/fbdaemon/tests/fbgeneratortest.cpp Changed

@@ -19,107 +19,104 @@
 #include <QTest>
 #include <QDebug>
 #include <QDir>
+#include <iostream>
+
+#include <xmlobject.h>
 #include <kolabobject.h>
 #include <freebusy.h>
 #include <kcalconversion.h>
-#include "fbdaemon/fbgeneratorjob.h"
 #include "settings.h"
 #include "kolabaccount.h"
 
 FBGeneratorTest::FBGeneratorTest(QObject* parent)
     : QObject(parent),
-        targethost("192.168.122.10"),
-        user("john.doe@example.org"),
-        admin("cyrus-admin"),
-        adminpw("admin"),
-        port(143)
+      user("john.doe@example.org")
 {
-    Object calObj1;
-    KCalCore::Event::Ptr event(new KCalCore::Event());
-    event->setUid("uid1");
-    event->setDtStart(KDateTime::currentUtcDateTime());
-    event->setDtEnd(KDateTime::currentUtcDateTime().addSecs(3600));
-    calObj1.object = QVariant::fromValue(Kolab::KolabObjectWriter::writeEvent(event, Kolab::KolabV3, "fbtest"));
-    folders << Folder("Calendar", Kolab::EventType, QList<Object>() << calObj1);
-
-//         folders << Folder("Freebusy", Kolab::FreebusyType, QList<Object>()/* << fbObj1*/);
+    Settings::instance().setAuthorizationUser("cyrus-admin");
+    Settings::instance().setTestMode(true);
+    Settings::instance().setPassword("admin");
+    Settings::instance().setServerUri("127.0.0.1:5989");
+    Settings::instance().setThreshold(10);
+    Settings::instance().setTimeframe(60);
+    Settings::instance().setAggregatedICalOutputDirectory(QDir::tempPath());
 }
 
-void FBGeneratorTest::setupTargetAccount()
+Kolab::Freebusy FBGeneratorTest::executeGeneration(bool saveObject, KDateTime start, KDateTime end)
 {
-    QObject obj;
-    KolabAccount *account = new KolabAccount(&obj);
-    account->setHost(targethost, port);
-    account->setCredentials(user, adminpw, admin);
-    QVERIFY(account->init());
-
-    account->cleanAccount();
-    createFolders(account, folders);
-}
 
-void FBGeneratorTest::executeGeneration()
-{
-    Settings::instance().setAuthorizationUser(admin);
-    Settings::instance().setPassword(adminpw);
-    Settings::instance().setServerUri(targethost);
-    Settings::instance().setThreshold(10);
-    Settings::instance().setTimeframe(60);
-    Settings::instance().setAggregatedICalOutputDirectory(QDir::tempPath());
     SessionSettings sessionSettings = Settings::instance().getSessionSettings();
     sessionSettings.userName = user;
 
     QObject obj;
-    FBGeneratorJob *job = new FBGeneratorJob(sessionSettings, &obj);
+    FBGeneratorJob *job = new FBGeneratorJob(sessionSettings, saveObject, &obj);
+    job->setTimeFrame(start, end);
     job->exec();
+
+    return job->getFreebusy();
 }
-    
-void FBGeneratorTest::checkFolders(KolabAccount *account, const QList<Folder> &folders)
+
+void FBGeneratorTest::compareFreeBusy(Kolab::Freebusy fb1, Kolab::Freebusy fb2)
 {
-    const QStringList &receivedFolders = account->lookupFolderList();
-    qDebug() << receivedFolders;
-    foreach(const Folder &folder, folders) {
-        qDebug() << folder.name;
-        QVERIFY(receivedFolders.contains(folder.name));
-        const QList<Object> &objects = account->getObjects(folder.name);
-        QCOMPARE(objects.size(), folder.objects.size());
-
-        QList<Object>::const_iterator recObjIt = objects.constBegin();
-        QList<Object>::const_iterator objIt = folder.objects.constBegin();
-        for (;objIt != folder.objects.constEnd() && recObjIt != objects.constEnd(); ++objIt, ++recObjIt) {
-            //TODO Check fb objects
-        }
+    QCOMPARE((int)fb1.periods().size(), (int)fb2.periods().size());
+    QCOMPARE(fb1.organizer(), fb2.organizer());
+    QCOMPARE(fb1.start(), fb2.start());
+    QCOMPARE(fb1.end(), fb2.end());
+    for (std::size_t i = 0; i < fb1.periods().size(); i++) {
+        std::cout << i;
+        QCOMPARE(fb1.periods().at(i), fb2.periods().at(i));
     }
 }
 
-void FBGeneratorTest::checkTargetAccount()
+
+
+void FBGeneratorTest::testGenerator()
 {
-    //Check that fb-object and aggregated fb object has been created
-    QObject obj;
-    KolabAccount *account = new KolabAccount(&obj);
-    account->setHost(targethost, port);
-    account->setCredentials(user, adminpw, admin);
-    account->init();
-
-
-    Object fbObj1;
-    Kolab::Freebusy fb;
-    fb.setStart(Kolab::Conversion::fromDate(KDateTime::currentUtcDateTime()));
-    fb.setEnd(Kolab::Conversion::fromDate(KDateTime::currentUtcDateTime().addDays(60)));
-    fbObj1.object = QVariant(Kolab::KolabObjectWriter::writeFreebusy(fb, Kolab::KolabV3, "fbtest"));
-
-    QList<Folder> targetFolders;
-    targetFolders << Folder("Freebusy", Kolab::FreebusyType, QList<Object>() << fbObj1);
-    checkFolders(account, targetFolders);
-    account->logout();
+    QDir dir(QLatin1String(SCENARIO_DATA_DIR));
+    fakeServer.addScenarioFromFile(dir.path() + "/generator/imap-6398");
+    fakeServer.addScenarioFromFile(dir.path() + "/generator/imap-6398.withoutattach");
+    fakeServer.startAndWait();
+
+    KDateTime start;
+    KDateTime end;
+    Kolab::cDateTime s(2014, 6, 12, 11, 2, 38, true);
+    Kolab::cDateTime e(2014, 6, 12, 12, 2, 38, true);
+    Kolab::Period period(s, e);
+    start.setTime_t(1400604981);
+    end.setTime_t(1405788981);
+    Kolab::Freebusy fb1 = executeGeneration(true, start, end);
+    Kolab::Freebusy fb2 = executeGeneration(false, start, end);
+
+    QCOMPARE(fb1.organizer(), Kolab::ContactReference(user.toUtf8().constData()));
+    QCOMPARE(Kolab::Conversion::toDate(fb1.start()), start);
+    QCOMPARE(Kolab::Conversion::toDate(fb1.end()), end);
+    QCOMPARE((int)fb1.periods().size(), 1);
+    QCOMPARE((int)fb1.periods().at(0).periods().size(), 1);
+    QCOMPARE(fb1.periods().at(0).periods().at(0), period);
+    compareFreeBusy(fb2, fb1);
+
+    QVERIFY(fakeServer.isAllScenarioDone());
+    fakeServer.quit();
 }
-    
-void FBGeneratorTest::testGenerator()
+
+void FBGeneratorTest::testSetTimeframe()
 {
-    setupTargetAccount();
-    executeGeneration();
-    checkTargetAccount();
+    SessionSettings sessionSettings = Settings::instance().getSessionSettings();
+    QObject obj;
+    FBGeneratorJob job(sessionSettings, true, &obj);
+
+    QVERIFY(job.mStartOfTimeFrame.secsTo(KDateTime::currentUtcDateTime()) < 2);  // $now
+    QCOMPARE(job.mStartOfTimeFrame.daysTo(job.mEndOfTimeFrame), Settings::instance().getTimeframe()); // $now+$defaultvalue
+
+    KDateTime start;
+    KDateTime end;
+    start.setTime_t(12345);
+    end.setTime_t(67890);
+    job.setTimeFrame(start, end);
+
+    QCOMPARE(job.mStartOfTimeFrame, start);
+    QCOMPARE(job.mEndOfTimeFrame, end);
 }
 
-QTEST_MAIN( FBGeneratorTest )
+QTEST_MAIN(FBGeneratorTest)
 
-#include "fbgeneratortest.moc"
\ No newline at end of file
+#include "fbgeneratortest.moc"

kolab-utils-3.1.tar.gz/fbdaemon/tests/fbgeneratortest.h -> kolab-utils-3.1.1.tar.gz/fbdaemon/tests/fbgeneratortest.h Changed

kolab-utils-3.1.tar.gz/migrationutility/sourceserver.h -> kolab-utils-3.1.1.tar.gz/migrationutility/sourceserver.h Changed

kolab-utils-3.1.tar.gz/upgradetool/imapupgradejob.cpp -> kolab-utils-3.1.1.tar.gz/upgradetool/imapupgradejob.cpp Changed

@@ -54,9 +54,9 @@
 
 }
 
-void ImapUpgradeJob::setOverrideObjectType(const Kolab::ObjectType type)
+void ImapUpgradeJob::setUpgradeOptions(const Kolab::Upgrade::UpgradeOptions &options)
 {
-    m_overrideObjectType = type;
+    m_upgradeOptions = options;
 }
 
 void ImapUpgradeJob::setFolderToUpgrade(const QString &folder)
@@ -128,7 +128,7 @@
     } else {
         SequentialCompositeJob *seqJob = new SequentialCompositeJob(this);
         KolabFormatUpgradeJob *upgradeJob = new KolabFormatUpgradeJob(m_folderToUpgrade, m_session, this);
-        upgradeJob->setOverrideObjectType(m_overrideObjectType);
+        upgradeJob->setUpgradeOptions(m_upgradeOptions);
         seqJob->addSubjob(upgradeJob);
         seqJob->addSubjob(new KIMAP::LogoutJob(m_session));
         connect(seqJob, SIGNAL(result(KJob*)), this, SLOT(modifyDone(KJob*)));
@@ -155,8 +155,6 @@
         }
         seqJob->addSubjob(new KolabFormatUpgradeJob(it.value(), m_session, this));
     }
-    //Logout after we're done
-    seqJob->addSubjob(new KIMAP::LogoutJob(m_session));
     
     connect(seqJob, SIGNAL(result(KJob*)), this, SLOT(modifyDone(KJob*)));
     seqJob->start();
@@ -164,9 +162,22 @@
 
 void ImapUpgradeJob::modifyDone( KJob *job )
 {
-    Debug() << "all done";
+    Debug() << "all done, logging out";
     if ( job->error() ) {
         Error() << job->errorString();
     }
+    //Logout after we're done
+    if (m_session->state() != KIMAP::Session::Disconnected) {
+        KIMAP::LogoutJob *logoutJob = new KIMAP::LogoutJob(m_session);
+        connect(logoutJob, SIGNAL(result(KJob*)), this, SLOT(logoutDone(KJob*)));
+        logoutJob->start();
+    } else {
+        Debug() << "session is down, not logging out.";
+        emitResult();
+    }
+}
+
+void ImapUpgradeJob::logoutDone( KJob *job )
+{
     emitResult();
 }

kolab-utils-3.1.tar.gz/upgradetool/imapupgradejob.h -> kolab-utils-3.1.1.tar.gz/upgradetool/imapupgradejob.h Changed

@@ -26,6 +26,7 @@
 #include <kolabobject.h>
 #include <kimap/session.h>
 #include <kimap/loginjob.h>
+#include "upgradeutilities.h"
 
 namespace KIMAP {
 struct MailBoxDescriptor;
@@ -39,6 +40,7 @@
     virtual ~ImapUpgradeJob();
 
     void setOverrideObjectType(const Kolab::ObjectType type);
+    void setUpgradeOptions(const Kolab::Upgrade::UpgradeOptions &upgradeOptions);
     void setFolderToUpgrade(const QString &);
     void connectToAccount(const QString &hostName, qint16 port, const QString &username, const QString &proxyauth, const QString &pw, KIMAP::LoginJob::EncryptionMode, KIMAP::LoginJob::AuthenticationMode);
 
@@ -48,12 +50,13 @@
     void onLoginDone( KJob *job );
     void onProbeDone( KJob *job );
     void modifyDone( KJob *job );
+    void logoutDone( KJob *job );
 private:
 
     KIMAP::Session *m_session;
     bool m_requireEncryption;
     QString m_folderToUpgrade;
-    Kolab::ObjectType m_overrideObjectType;
+    Kolab::Upgrade::UpgradeOptions m_upgradeOptions;
 };
 
 #endif // IMAPUPGRADER_H

kolab-utils-3.1.tar.gz/upgradetool/kolabformatupgradejob.cpp -> kolab-utils-3.1.1.tar.gz/upgradetool/kolabformatupgradejob.cpp Changed

@@ -35,20 +35,24 @@
 :   KJob(parent),
     m_session(session),
     m_folder(folder),
-    seqJob(new SequentialCompositeJob(this)),
-    m_overrideObjectType(Kolab::InvalidObject)
+    seqJob(new SequentialCompositeJob(this))
 {
 
 }
 
-void KolabFormatUpgradeJob::setOverrideObjectType(Kolab::ObjectType type)
+void KolabFormatUpgradeJob::setUpgradeOptions(const Kolab::Upgrade::UpgradeOptions &upgradeOptions)
 {
-    m_overrideObjectType = type;
+    m_upgradeOptions = upgradeOptions;
 }
 
 void KolabFormatUpgradeJob::start()
 {
     Debug() << "Processing Mailbox....... " << m_folder;
+    if (m_session->state() == KIMAP::Session::Disconnected) {
+        Warning() << "Session is not connected, skipping";
+        emitResult();
+        return;
+    }
     
     KIMAP::SelectJob *select = new KIMAP::SelectJob( m_session );
     select->setMailBox( m_folder );
@@ -101,7 +105,8 @@
 //         Debug() << "preparing for upgrade " << uids[number];
         const KMime::Message::Ptr &message = messages[number];
         //TODO implement different target folder
-        KMime::Message::Ptr msg = Kolab::Upgrade::upgradeMessage(message, m_overrideObjectType);
+        KMime::Message::Ptr msg = Kolab::Upgrade::upgradeMessage(message, m_upgradeOptions);
+        //Skip messages that we're already kolabv3
         if (!msg.get()) {
             Error() << "failed to convert message with uid " << QString::number(uids[number]);
             continue;

kolab-utils-3.1.tar.gz/upgradetool/kolabformatupgradejob.h -> kolab-utils-3.1.1.tar.gz/upgradetool/kolabformatupgradejob.h Changed

kolab-utils-3.1.tar.gz/upgradetool/upgradetool.cpp -> kolab-utils-3.1.1.tar.gz/upgradetool/upgradetool.cpp Changed

@@ -55,6 +55,7 @@
     options.add("t").add("type <type>", ki18n("force the type (EVENT, TODO, JOURNAL, CONTACT). Applies only when upgrading a single file or a specific folder."));
     
     options.add("a").add("auth <mode>", ki18n("Authentication mode to be used (PLAIN, LOGIN, CRAMMD5, DIGESTMD5, NTLM, GSSAPI, ANONYMOUS, CLEARTEXT)"), "PLAIN");
+    options.add("fix-utc-incidences", ki18n("Converts all incidences from UTC to floating time."));
 //     options.add("f").add
     options.add("+[server/file]", ki18n("IMAP Server/File"));
     KCmdLineArgs::addCmdLineOptions( options );
@@ -79,6 +80,12 @@
         }
     }
 
+    const bool fixUtcIncidences = args->isSet("fix-utc-incidences");
+    Kolab::Upgrade::UpgradeOptions upgradeOptions;
+    upgradeOptions.fixUtcIncidences = fixUtcIncidences;
+    upgradeOptions.overrideObjectType = overrideType;
+    
+
     QString folderToUpgrade;
     if (args->isSet("folder")) {
         folderToUpgrade = args->getOption("folder");
@@ -90,7 +97,7 @@
             return -1;
         }
         ImapUpgradeJob *upgrader = new ImapUpgradeJob(&app);
-        upgrader->setOverrideObjectType(overrideType);
+        upgrader->setUpgradeOptions(upgradeOptions);
         upgrader->setFolderToUpgrade(folderToUpgrade);
         QObject::connect(upgrader, SIGNAL(result(KJob*)), &app, SLOT(quit()));
         
@@ -142,7 +149,7 @@
     s.setCodec( "UTF-8" );
     QTextStream stream(stdin);
     stream.setCodec( "UTF-8" );
-    
+
     if (args->isSet("mime")) {        
         if (args->count() > 0) {
             const QString &filename = args->arg(0);
@@ -153,9 +160,10 @@
             }
             const QByteArray data = file.readAll();
             Q_ASSERT( !data.isEmpty() );
-            s << Kolab::Upgrade::upgradeMime(data, overrideType);
+
+            s << Kolab::Upgrade::upgradeMime(data, upgradeOptions);
         } else {
-            s << Kolab::Upgrade::upgradeMime(stream.readAll().toUtf8(), overrideType);
+            s << Kolab::Upgrade::upgradeMime(stream.readAll().toUtf8(), upgradeOptions);
         }
     }
     if (Kolab::ErrorHandler::instance().error() >= Kolab::ErrorHandler::Error) {

kolab-utils-3.1.tar.gz/upgradetool/upgradeutilities.cpp -> kolab-utils-3.1.1.tar.gz/upgradetool/upgradeutilities.cpp Changed

@@ -24,58 +24,91 @@
 #include <kolabevent.h>
 #include <kolabformat.h>
 #include <errorhandler.h>
+#include <KCalCore/Event>
+#include <KDateTime>
 
 namespace Kolab {
     namespace Upgrade {
 
-KMime::Message::Ptr upgradeMessage(KMime::Message::Ptr msg, Kolab::ObjectType overrideObjectType)
+static void fixupIncidence(const KCalCore::Incidence::Ptr &incidence, UpgradeOptions upgradeOptions)
 {
+    if (upgradeOptions.fixUtcIncidences) {
+        if (incidence->dtStart().isUtc()) {
+            incidence->shiftTimes(KDateTime::Spec::LocalZone(), KDateTime::Spec::ClockTime());
+        }
+    }
+}
+
+KMime::Message::Ptr upgradeMessage(KMime::Message::Ptr msg, UpgradeOptions upgradeOptions)
+{
+    Kolab::ObjectType overrideObjectType = upgradeOptions.overrideObjectType;
     Kolab::KolabObjectReader reader;
     if (overrideObjectType != Kolab::InvalidObject) {
         reader.setObjectType(overrideObjectType);
     }
     const Kolab::ObjectType type = reader.parseMimeMessage(msg);
     if (Kolab::ErrorHandler::errorOccured()) {
-        Error() << "error while parsing message";
+        Error() << "Error while parsing message.";
         return KMime::Message::Ptr();
     }
+    KMime::Message::Ptr convertedMessage;
     switch (type) {
-        case Kolab::EventObject:
-            return Kolab::KolabObjectWriter::writeEvent(reader.getEvent());
-        case Kolab::TodoObject:
-            return Kolab::KolabObjectWriter::writeTodo(reader.getTodo());
-        case Kolab::JournalObject:
-            return Kolab::KolabObjectWriter::writeJournal(reader.getJournal());
+        case Kolab::EventObject: {
+            KCalCore::Event::Ptr event = reader.getEvent();
+            fixupIncidence(event, upgradeOptions);
+            convertedMessage = Kolab::KolabObjectWriter::writeEvent(event);
+        }
+            break;
+        case Kolab::TodoObject: {
+            KCalCore::Todo::Ptr todo = reader.getTodo();
+            fixupIncidence(todo, upgradeOptions);
+            convertedMessage = Kolab::KolabObjectWriter::writeTodo(todo);
+        }
+            break;
+        case Kolab::JournalObject: {
+            KCalCore::Journal::Ptr journal = reader.getJournal();
+            fixupIncidence(journal, upgradeOptions);
+            convertedMessage = Kolab::KolabObjectWriter::writeJournal(journal);
+        }
+            break;
         case Kolab::ContactObject:
-            return Kolab::KolabObjectWriter::writeContact(reader.getContact());
+            convertedMessage = Kolab::KolabObjectWriter::writeContact(reader.getContact());
+            break;
         case Kolab::DistlistObject:
-            return Kolab::KolabObjectWriter::writeDistlist(reader.getDistlist());
+            convertedMessage = Kolab::KolabObjectWriter::writeDistlist(reader.getDistlist());
+            break;
         case Kolab::NoteObject:
-            return Kolab::KolabObjectWriter::writeNote(reader.getNote());
+            convertedMessage = Kolab::KolabObjectWriter::writeNote(reader.getNote());
+            break;
         case Kolab::DictionaryConfigurationObject: {
             QString lang;
             const QStringList &dict = reader.getDictionary(lang);
-            return Kolab::KolabObjectWriter::writeDictionary(dict, lang);
+            convertedMessage = Kolab::KolabObjectWriter::writeDictionary(dict, lang);
         }
+            break;
         case Kolab::InvalidObject:
         default:
             //TODO handle configuration objects
             Error() << "failed to read mime file";
     }
-    return KMime::Message::Ptr();
+    if (Kolab::ErrorHandler::errorOccured()) {
+        Error() << "Error while writing out converted message.";
+        return KMime::Message::Ptr();
+    }
+    return convertedMessage;
 }
         
 /**
  * Upgrades the format of a complete mime message containing a kolab object
  */
-QString upgradeMime(const QByteArray &input, Kolab::ObjectType overrideObjectType)
+QString upgradeMime(const QByteArray &input, UpgradeOptions upgradeOptions)
 {
     KMime::Message::Ptr msg = KMime::Message::Ptr(new KMime::Message);
     msg->setContent( KMime::CRLFtoLF(input) );
     msg->parse();
     msg->content(KMime::ContentIndex());
         
-    KMime::Message::Ptr message = upgradeMessage(msg, overrideObjectType);
+    KMime::Message::Ptr message = upgradeMessage(msg, upgradeOptions);
     if (!message) {
         return QString();
     }

kolab-utils-3.1.tar.gz/upgradetool/upgradeutilities.h -> kolab-utils-3.1.1.tar.gz/upgradetool/upgradeutilities.h Changed

kolab-utils.dsc Changed

Changes of Revision 18