Kolab Groupware OBS

kolab-utils.spec Changed

debian.changelog Changed

kolab-utils-3.1.2.tar.gz/CMakeLists.txt -> kolab-utils-3.1.3.tar.gz/CMakeLists.txt Changed

kolab-utils-3.1.2.tar.gz/fbdaemon/tests/CMakeLists.txt -> kolab-utils-3.1.3.tar.gz/fbdaemon/tests/CMakeLists.txt Changed

kolab-utils-3.1.2.tar.gz/lib/jobs/findkolabfoldersjob.cpp -> kolab-utils-3.1.3.tar.gz/lib/jobs/findkolabfoldersjob.cpp Changed

kolab-utils-3.1.2.tar.gz/lib/jobs/findkolabfoldersjob.h -> kolab-utils-3.1.3.tar.gz/lib/jobs/findkolabfoldersjob.h Changed

kolab-utils-3.1.2.tar.gz/lib/jobs/probekolabserverjob.cpp -> kolab-utils-3.1.3.tar.gz/lib/jobs/probekolabserverjob.cpp Changed

kolab-utils-3.1.2.tar.gz/lib/jobs/probekolabserverjob.h -> kolab-utils-3.1.3.tar.gz/lib/jobs/probekolabserverjob.h Changed

kolab-utils-3.1.2.tar.gz/upgradetool/imapupgradejob.cpp -> kolab-utils-3.1.3.tar.gz/upgradetool/imapupgradejob.cpp Changed

@@ -121,19 +121,9 @@
         return;
     }
 
-    if (m_folderToUpgrade.isEmpty()) {
-        ProbeKolabServerJob *probeJob = new ProbeKolabServerJob(m_session, this);
-        connect(probeJob, SIGNAL(result(KJob*)), this, SLOT(onProbeDone(KJob*)));
-        probeJob->start();
-    } else {
-        SequentialCompositeJob *seqJob = new SequentialCompositeJob(this);
-        KolabFormatUpgradeJob *upgradeJob = new KolabFormatUpgradeJob(m_folderToUpgrade, m_session, this);
-        upgradeJob->setUpgradeOptions(m_upgradeOptions);
-        seqJob->addSubjob(upgradeJob);
-        seqJob->addSubjob(new KIMAP::LogoutJob(m_session));
-        connect(seqJob, SIGNAL(result(KJob*)), this, SLOT(modifyDone(KJob*)));
-        seqJob->start();
-    }
+    ProbeKolabServerJob *probeJob = new ProbeKolabServerJob(m_session, this);
+    connect(probeJob, SIGNAL(result(KJob*)), this, SLOT(onProbeDone(KJob*)));
+    probeJob->start();
 }
 
 void ImapUpgradeJob::onProbeDone(KJob* job)
@@ -147,13 +137,26 @@
     Q_ASSERT(capabilitiesJob);
     
     SequentialCompositeJob *seqJob = new SequentialCompositeJob(this);
+
+    QMultiHash<QString,QString> folders;
+    if (!m_upgradeOptions.validateMode) {
+         folders = capabilitiesJob->kolabFolders();
+    } else {
+        folders = capabilitiesJob->allFolders();
+    }
     QMultiHash<QString, QString>::const_iterator it;
-    QMultiHash<QString, QString>::const_iterator end = capabilitiesJob->kolabFolders().constEnd();
-    for (it = capabilitiesJob->kolabFolders().constBegin(); it != end; ++it) {
-        if (it.key() == QLatin1String(KOLAB_FOLDER_TYPE_FREEBUSY)) {
+    QMultiHash<QString, QString>::const_iterator end = folders.constEnd();
+    for (it = folders.constBegin(); it != end; ++it) {
+        if (!m_upgradeOptions.validateMode && it.key() == QLatin1String(KOLAB_FOLDER_TYPE_FREEBUSY)) {
+            continue;
+        }
+        if (!m_folderToUpgrade.isEmpty() && it.value() != m_folderToUpgrade) {
             continue;
         }
-        seqJob->addSubjob(new KolabFormatUpgradeJob(it.value(), m_session, this));
+        KolabFormatUpgradeJob *upgradeJob = new KolabFormatUpgradeJob(it.value(), m_session, this);
+        upgradeJob->setUpgradeOptions(m_upgradeOptions);
+        upgradeJob->setFolderType(it.key());
+        seqJob->addSubjob(upgradeJob);
     }
     
     connect(seqJob, SIGNAL(result(KJob*)), this, SLOT(modifyDone(KJob*)));

kolab-utils-3.1.2.tar.gz/upgradetool/kolabformatupgradejob.cpp -> kolab-utils-3.1.3.tar.gz/upgradetool/kolabformatupgradejob.cpp Changed

@@ -23,13 +23,20 @@
 #include "jobs/sequentialcompositejob.h"
 #include "jobs/messagemodifyjob.h"
 #include <kolabobject.h>
+#include <kolabdefinitions.h>
+#include <formathelpers.h>
 #include <errorhandler.h>
 
 #include <kimap/selectjob.h>
 #include <kimap/fetchjob.h>
 #include <kimap/expungejob.h>
+#include <kimap/storejob.h>
 
 #include <QStringList>
+#include <QFile>
+#include <QDir>
+
+const char* FlagDeleted = "\\Deleted";
 
 KolabFormatUpgradeJob::KolabFormatUpgradeJob(const QString& folder, KIMAP::Session* session, QObject* parent)
 :   KJob(parent),
@@ -45,9 +52,14 @@
     m_upgradeOptions = upgradeOptions;
 }
 
+void KolabFormatUpgradeJob::setFolderType(const QString &folderType)
+{
+    m_folderType = folderType;
+}
+
 void KolabFormatUpgradeJob::start()
 {
-    Debug() << "Processing Mailbox....... " << m_folder;
+    Debug() << "Processing Mailbox....... " << m_folder << " of type: " << m_folderType;
     if (m_session->state() == KIMAP::Session::Disconnected) {
         Warning() << "Session is not connected, skipping";
         emitResult();
@@ -94,24 +106,89 @@
     fetch->start();
 }
 
+static QList<Kolab::ObjectType> getExpectedTypeFromFolderType(const QString &folderType)
+{
+    switch(Kolab::folderTypeFromString(folderType.toStdString())) {
+        case Kolab::MailType:
+            return QList<Kolab::ObjectType>();
+        case Kolab::ContactType:
+            return QList<Kolab::ObjectType>() << Kolab::ContactObject << Kolab::DistlistObject;
+        case Kolab::EventType:
+            return QList<Kolab::ObjectType>() << Kolab::EventObject;
+        case Kolab::TaskType:
+            return QList<Kolab::ObjectType>() << Kolab::TodoObject;
+        case Kolab::JournalType:
+            return QList<Kolab::ObjectType>() << Kolab::JournalObject;
+        case Kolab::NoteType:
+            return QList<Kolab::ObjectType>() << Kolab::NoteObject;
+        case Kolab::ConfigurationType:
+            return QList<Kolab::ObjectType>() << Kolab::DictionaryConfigurationObject << Kolab::RelationConfigurationObject;
+        case Kolab::FreebusyType:
+            return QList<Kolab::ObjectType>() << Kolab::FreebusyObject;
+        case Kolab::FileType:
+            return QList<Kolab::ObjectType>();
+        case Kolab::LastType:
+            break;
+    }
+    return QList<Kolab::ObjectType>();
+}
+
 void KolabFormatUpgradeJob::onHeadersReceived( const QString &mailBox, 
                                            const QMap<qint64, qint64> &uids,
                                            const QMap<qint64, qint64> &/*sizes*/,
                                            const QMap<qint64, KIMAP::MessageFlags> &flags,
                                            const QMap<qint64, KIMAP::MessagePtr> &messages )
-{    
-//     Debug() << mailBox;
+{
     foreach ( qint64 number, uids.keys() ) {
-//         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_upgradeOptions);
-        //Skip messages that we're already kolabv3
-        if (!msg.get()) {
-            Error() << "failed to convert message with uid " << QString::number(uids[number]);
-            continue;
+        if (m_upgradeOptions.validateMode) {
+            const qint64 uid = uids[number];
+            if (m_folderType.isEmpty() || m_folderType.contains("mail")) {
+                //TODO validate emails if possible?
+            } else {
+                if (Kolab::Upgrade::validateMessage(message, getExpectedTypeFromFolderType(m_folderType))) {
+                    Debug() << "Checked the message with the uid " << uid;
+                } else {
+                    Error() << "The message with the uid " << uid << " in the folder: " << m_folder << " is invalid!";
+                    if (!m_upgradeOptions.saveTo.isEmpty()) {
+                        const QString directory = m_upgradeOptions.saveTo + "/" + m_folder;
+                        const QString path = directory + "/" + QString::number(uid) + ".eml";
+                        Debug() << "Saving message to: " << path;
+                        QDir dir;
+                        if (!dir.mkpath(directory)) {
+                            Warning() << "Failed to create the directory " << directory;
+                        }
+                        QFile file(path);
+                        if (!file.open(QIODevice::WriteOnly|QIODevice::Text)) {
+                            Warning() << "Failed to store the message" << uid;
+                        } else {
+                            QTextStream out(&file);
+                            out << message->encodedContent();
+                        }
+                    }
+                    if (!m_upgradeOptions.noDelete) {
+                        Debug() << "Deleting message " << uid;
+
+                        KIMAP::StoreJob *store = new KIMAP::StoreJob( m_session );
+                        store->setUidBased( true );
+                        store->setSequenceSet( KIMAP::ImapSet(uid) );
+                        store->setFlags( QList<QByteArray>() << FlagDeleted );
+                        store->setMode( KIMAP::StoreJob::AppendFlags );
+                        seqJob->addSubjob(store);
+                    }
+                }
+            }
+        } else {
+            Debug() << "Upgrading message";
+            //TODO implement different target folder
+            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;
+            }
+            seqJob->addSubjob(new MessageModifyJob(msg, mailBox, flags[number], uids[number], m_session, this));
         }
-        seqJob->addSubjob(new MessageModifyJob(msg, mailBox, flags[number], uids[number], m_session, this));
     }
 }
 
@@ -122,11 +199,15 @@
         emitResult();
         return;
     }
-    
+
+    if (m_upgradeOptions.validateMode) {
+        Debug() << "Finished validating the folder: " << m_folder;
+    }
+
     //Run expunge after every modify, while the folder is still selected
     Q_ASSERT(m_session->state() & KIMAP::Session::Selected);
     seqJob->addSubjob(new KIMAP::ExpungeJob(m_session));
-    
+
     connect(seqJob, SIGNAL(finished(KJob*)), this, SLOT(onModifyFinished(KJob*)));
     seqJob->start();
 }

kolab-utils-3.1.2.tar.gz/upgradetool/kolabformatupgradejob.h -> kolab-utils-3.1.3.tar.gz/upgradetool/kolabformatupgradejob.h Changed

kolab-utils-3.1.2.tar.gz/upgradetool/upgradetool.cpp -> kolab-utils-3.1.3.tar.gz/upgradetool/upgradetool.cpp Changed

@@ -18,7 +18,10 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/QStringList>
 #include <QtCore/qfile.h>
+#include <QtCore/QDir>
 #include <kdebug.h>
+#include <kglobal.h>
+#include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <errorhandler.h>
 
@@ -60,9 +63,14 @@
 //     options.add("f").add
     options.add("fix-utc-incidences-offset <offset>", ki18n("Uses a UTC offset to convert the times. If not provided the local timezone get's used instead. The offset is in seconds."), "0");
     options.add("fix-utc-incidences-timezone <timezone>", ki18n("Uses the specified timezone to convert the times. If not provided the local timezone get's used instead. Timezones are read from zone.tab"));
+
+    options.add("validate", ki18n("Validate all kolab-objects and mails, and delete the ones that are invalid."));
+    options.add("delete", ki18n("Delete invalid objects from the server. Applies to validate mode."));
+    options.add("save-to <folder>", ki18n("Store invalid objects under the given path. Applies to validate mode."));
+
     options.add("+[server/file]", ki18n("IMAP Server/File"));
     KCmdLineArgs::addCmdLineOptions( options );
-    QCoreApplication app(argc, argv);
+    KApplication app;
     
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
@@ -94,14 +102,37 @@
         upgradeOptions.fixUtcIncidencesTimezone = KSystemTimeZones::readZone(args->getOption("fix-utc-incidences-timezone"));
     }
     upgradeOptions.overrideObjectType = overrideType;
-    
 
     QString folderToUpgrade;
     if (args->isSet("folder")) {
         folderToUpgrade = args->getOption("folder");
     }
-    
-    if (!args->isSet("mime")) {
+
+    if (args->isSet("validate")) {
+        kDebug() << "Running in validation mode.";
+        upgradeOptions.validateMode = true;
+        Q_ASSERT(upgradeOptions.validateMode);
+    }
+    if (!args->isSet("delete")) {
+        kDebug() << "Running in no-delete mode.";
+        upgradeOptions.noDelete = true;
+    } else {
+        kDebug() << "Running in delete mode.";
+        upgradeOptions.noDelete = false;
+    }
+
+    if (args->isSet("save-to")) {
+        kDebug() << "Saving faulty messages to: " << args->getOption("save-to");
+        upgradeOptions.saveTo = args->getOption("save-to");
+        QDir dir;
+        if (!dir.mkpath(upgradeOptions.saveTo)) {
+            kWarning() << "Failed to create the given folder: " << upgradeOptions.saveTo;
+            return -1;
+        }
+    }
+
+    const bool operatingOnMimeFile = args->isSet("mime");
+    if (!operatingOnMimeFile) {
         if (args->count() == 0) {
             kWarning() << "specify imap server";
             return -1;
@@ -152,32 +183,31 @@
         if (app.exec() || Kolab::ErrorHandler::instance().error() >= Kolab::ErrorHandler::Error) {
             return -1;
         }
-        return 0;
-    }
-    
-    QTextStream s(stdout);
-    s.setCodec( "UTF-8" );
-    QTextStream stream(stdin);
-    stream.setCodec( "UTF-8" );
+    } else {
+        QTextStream s(stdout);
+        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);
-            QFile file( filename );
-            if (!file.open( QFile::ReadOnly )) {
-                kWarning() << "failed to open the file: " << filename;
-                return -1;
-            }
-            const QByteArray data = file.readAll();
-            Q_ASSERT( !data.isEmpty() );
+        if (operatingOnMimeFile) {
+            if (args->count() > 0) {
+                const QString &filename = args->arg(0);
+                QFile file( filename );
+                if (!file.open( QFile::ReadOnly )) {
+                    kWarning() << "failed to open the file: " << filename;
+                    return -1;
+                }
+                const QByteArray data = file.readAll();
+                Q_ASSERT( !data.isEmpty() );
 
-            s << Kolab::Upgrade::upgradeMime(data, upgradeOptions);
-        } else {
-            s << Kolab::Upgrade::upgradeMime(stream.readAll().toUtf8(), upgradeOptions);
+                s << Kolab::Upgrade::upgradeMime(data, upgradeOptions);
+            } else {
+                s << Kolab::Upgrade::upgradeMime(stream.readAll().toUtf8(), upgradeOptions);
+            }
+        }
+        if (Kolab::ErrorHandler::instance().error() >= Kolab::ErrorHandler::Error) {
+            return -1;
         }
-    }
-    if (Kolab::ErrorHandler::instance().error() >= Kolab::ErrorHandler::Error) {
-        return -1;
     }
     return 0;
 }

kolab-utils-3.1.2.tar.gz/upgradetool/upgradeutilities.cpp -> kolab-utils-3.1.3.tar.gz/upgradetool/upgradeutilities.cpp Changed

kolab-utils-3.1.2.tar.gz/upgradetool/upgradeutilities.h -> kolab-utils-3.1.3.tar.gz/upgradetool/upgradeutilities.h Changed

Changes of Revision 24