Merge lp:~online-accounts/signon-plugin-sasl/packaging into lp:signon-plugin-sasl

[Alberto Mardegan]

No change rebuild

No change rebuild

[lp:~online-accounts/signon-plugin-sasl/packaging]

12. By Alberto Mardegan on 2015-12-03

Rebase on trunk

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2015-12-03 07:31:19 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2015-12-03 07:31:19 +0000
@@ -0,0 +1,8 @@
+*.moc
+*.o
+.*.swp
+Makefile
+moc_*
+src/libsaslplugin.so
+tests/tst_plugin
+

=== added file '.qmake.conf'
--- .qmake.conf	1970-01-01 00:00:00 +0000
+++ .qmake.conf	2015-12-03 07:31:19 +0000
@@ -0,0 +1,2 @@
+TOP_SRC_DIR = $$PWD
+TOP_BUILD_DIR = $$shadowed($$PWD)

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2012-03-27 12:29:57 +0000
+++ common-project-config.pri	2015-12-03 07:31:19 +0000
@@ -10,11 +10,13 @@
 # Disable RTTI
 QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
 
-TOP_SRC_DIR     = $$PWD
-TOP_BUILD_DIR   = $${TOP_SRC_DIR}/$(BUILD_DIR)
+!defined(TOP_SRC_DIR, var) {
+    TOP_SRC_DIR = $$PWD
+    TOP_BUILD_DIR = $${TOP_SRC_DIR}/$(BUILD_DIR)
+}
 
 DEFINES		+= DEBUG_ENABLED
-EFINES		+= SIGNON_TRACE
+DEFINES		+= SIGNON_TRACE
 
 #-----------------------------------------------------------------------------
 # setup the installation prefix
@@ -32,18 +34,7 @@
     message("==== install prefix set to `$${INSTALL_PREFIX}'")
 }
 
-# Setup the library installation directory
-exists( meego-release ) {
-    ARCH = $$system(tail -n1 meego-release)
-} else {
-    ARCH = $$system(uname -m)
-}
-
-contains( ARCH, x86_64 ) {
-    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
-} else {
-    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
-}
+INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
 
 # default library directory can be overriden by defining LIBDIR when
 # running qmake
@@ -64,4 +55,3 @@
 } else {
     SIGNON_PLUGINS_DIR = $$_PLUGINS
 }
-SIGNON_PLUGINS_DIR_QUOTED = \\\"$$SIGNON_PLUGINS_DIR\\\"

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-15 14:31:54 +0000
+++ debian/changelog	2015-12-03 07:31:19 +0000
@@ -1,5 +1,6 @@
-signon-plugin-sasl (0.1-0ubuntu1) UNRELEASED; urgency=medium
+signon-plugin-sasl (0.1-0ubuntu2) vivid; urgency=medium
 
   * Initial release.
+  * No change build for CI.
 
- -- Alberto Mardegan <[e-mail]>  Thu, 15 Oct 2015 17:22:15 +0300
+ -- Alberto Mardegan <[e-mail]>  Tue, 24 Nov 2015 09:53:39 +0200

=== modified file 'debian/control'
--- debian/control	2015-10-15 14:31:54 +0000
+++ debian/control	2015-12-03 07:31:19 +0000
@@ -5,22 +5,24 @@
 Build-Depends: dbus-test-runner,
                debhelper (>= 9),
                libsasl2-dev,
+               libsasl2-modules,
                libsignon-qt5-dev,
                pkg-config,
                qt5-default,
                signon-plugins-dev (>> 8.57+14.10.20140827-0ubuntu1),
                xvfb,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: https://gitlab.com/accounts-sso/signon-plugin-sasl
 # If you aren't a member of ~online-accounts but need to upload packaging changes,
 # just go ahead.  ~online-accounts will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~online-accounts/signon-plugin-sasl/trunk
+Vcs-Bzr: lp:signon-plugin-sasl
 
 Package: signon-plugin-sasl
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libsasl2-modules,
 Description: Single Signon SASL plugin
  SASL plugin for the Single Signon framework
 

=== modified file 'signon-plugin-sasl.pro'
--- signon-plugin-sasl.pro	2015-09-18 13:52:42 +0000
+++ signon-plugin-sasl.pro	2015-12-03 07:31:19 +0000
@@ -8,13 +8,3 @@
 include( common-installs-config.pri )
 
 #include( doc/doc.pri )
-
-DISTNAME = $${PROJECT_NAME}-$${PROJECT_VERSION}
-EXCLUDES = \
-    --exclude-vcs \
-    --exclude=.* \
-    --exclude=$${DISTNAME}.tar.bz2 \
-    --exclude-from .gitignore
-dist.commands = "tar -cvjf $${DISTNAME}.tar.bz2 $$EXCLUDES --transform='s,^,$$DISTNAME/,' *"
-dist.depends = distclean
-QMAKE_EXTRA_TARGETS += dist

=== modified file 'src/sasldata.h'
--- src/sasldata.h	2012-03-16 08:53:07 +0000
+++ src/sasldata.h	2015-12-03 07:31:19 +0000
@@ -2,8 +2,9 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2015 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -47,6 +48,14 @@
         CONTINUE,       /*!< Authentication in progress */
     };
 
+    SaslData(const QVariantMap &data = QVariantMap()) { m_data = data; }
+
+    /*!
+     * The list of mechanisms received from the remote server, separated with
+     * whitespace or punctuation characters.
+     */
+    SIGNON_SESSION_DECLARE_PROPERTY(QByteArray, MechList);
+
     /*!
      * The challenge received from the remote server.
      */
@@ -60,7 +69,7 @@
     /*!
      * SASL authentication name.
      */
-    SIGNON_SESSION_DECLARE_PROPERTY(QString, Authname);
+    SIGNON_SESSION_DECLARE_PROPERTY(QString, AuthName);
 
     /*!
      * SASL realm.

=== modified file 'src/saslplugin.cpp'
--- src/saslplugin.cpp	2015-09-18 14:35:00 +0000
+++ src/saslplugin.cpp	2015-12-03 07:31:19 +0000
@@ -2,8 +2,9 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2015 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -169,7 +170,7 @@
 
     using SignOn::Error;
 
-    if (!check_and_fix_parameters(d->m_input)) {
+    if (!check_and_fix_parameters(d->m_input, mechanism.toUtf8())) {
         TRACE() << "missing parameters";
         emit error(Error::MissingData);
         return;
@@ -208,7 +209,7 @@
         }
 
         res = sasl_client_start(d->m_conn,
-                                mechanism.toUtf8().constData(),
+                                d->m_input.MechList().constData(),
                                 NULL,
                                 &data,
                                 &len,
@@ -306,7 +307,7 @@
             *len = self->d->m_username.count();
         break;
     case SASL_CB_AUTHNAME:
-        self->d->m_authname = self->d->m_input.Authname().toUtf8();
+        self->d->m_authname = self->d->m_input.AuthName().toUtf8();
         *result = self->d->m_authname.constData();
         if (len)
             *len = self->d->m_authname.count();
@@ -432,7 +433,8 @@
 
 }
 
-bool SaslPlugin::check_and_fix_parameters(SaslData &input)
+bool SaslPlugin::check_and_fix_parameters(SaslData &input,
+                                          const QByteArray &mechanism)
 {
     TRACE();
     if (input.UserName().isEmpty())
@@ -440,7 +442,7 @@
 
     //set default parameters
     if (input.Service().isEmpty()) input.setService(QByteArray("default"));
-    if (input.Authname().isEmpty()) input.setAuthname(input.UserName());
+    if (input.AuthName().isEmpty()) input.setAuthName(input.UserName());
     if (input.Fqdn().isEmpty()) {
         if (!input.Realm().isEmpty())
             input.setFqdn(input.Realm());
@@ -449,6 +451,7 @@
     }
     if (input.IpLocal().isEmpty()) input.setIpLocal(QByteArray("127.0.0.1"));
     if (input.IpRemote().isEmpty()) input.setIpRemote(QByteArray("127.0.0.1"));
+    if (input.MechList().isEmpty()) input.setMechList(mechanism);
 
     return true;
 }

=== modified file 'src/saslplugin.h'
--- src/saslplugin.h	2012-03-16 08:53:07 +0000
+++ src/saslplugin.h	2015-12-03 07:31:19 +0000
@@ -66,7 +66,8 @@
                                int id, sasl_secret_t **psecret);
     static int sasl_log(void *context, int priority, const char *message);
     void set_callbacks();
-    bool check_and_fix_parameters(SaslData &input);
+    bool check_and_fix_parameters(SaslData &input,
+                                  const QByteArray &mechanism);
     Private *d; // Owned.
 };
 

=== modified file 'src/src.pro'
--- src/src.pro	2015-09-18 13:52:42 +0000
+++ src/src.pro	2015-12-03 07:31:19 +0000
@@ -10,8 +10,10 @@
 	link_pkgconfig
 DEFINES += SIGNON_PLUGIN_TRACE
 
-public_headers += sasldata.h saslplugin.h
-private_headers =
+public_headers += \
+    sasldata.h
+private_headers += \
+    saslplugin.h
 HEADERS += $$public_headers $$private_headers
 
 SOURCES += saslplugin.cpp

=== removed file 'tests/saslplugintest.cpp'
--- tests/saslplugintest.cpp	2015-09-18 14:35:00 +0000
+++ tests/saslplugintest.cpp	1970-01-01 00:00:00 +0000
@@ -1,559 +0,0 @@
-/* -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of signon
- *
- * Copyright (C) 2009-2010 Nokia Corporation.
- *
- * Contact: Aurel Popirtac <[e-mail]>
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-#include <QtTest/QtTest>
-#include <sasl/sasl.h>
-
-#include "saslplugin.h"
-#include "sasldata.h"
-#include "saslplugin.cpp"
-
-#include "saslplugintest.h"
-
-using namespace SaslPluginNS;
-
-void SaslPluginTest::initTestCase()
-{
-    qRegisterMetaType<SignOn::SessionData>();
-}
-
-void SaslPluginTest::cleanupTestCase()
-{
-    sasl_done();
-}
-
-//prepare each test by creating new plugin
-void SaslPluginTest::init()
-{
-    m_testPlugin = new SaslPlugin();
-}
-
-//finnish each test by deleting plugin
-void SaslPluginTest::cleanup()
-{
-    delete m_testPlugin;
-    m_testPlugin=NULL;
-}
-
-//slot for receiving result
-void SaslPluginTest::result(const SignOn::SessionData& data)
-{
-    qDebug() << "got result";
-    m_response = data;
-    m_loop.exit();
-}
-
-//slot for receiving error
-void SaslPluginTest::pluginError(const SignOn::Error &error)
-{
-    qDebug() << "got error" << error.type();
-    m_errorType = error.type();
-    m_loop.exit();
-}
-
-//test cases
-
-void SaslPluginTest::testPlugin()
-{
-    QVERIFY(m_testPlugin);
-}
-
-void SaslPluginTest::testPluginType()
-{
-    QCOMPARE(m_testPlugin->type(), QString("sasl"));
-}
-
-void SaslPluginTest::testPluginMechanisms()
-{
-    QStringList mechs = m_testPlugin->mechanisms();
-    QVERIFY(!mechs.isEmpty());
-    QVERIFY(mechs.contains(QString("PLAIN")));
-}
-
-void SaslPluginTest::testPluginCancel()
-{
-    //no functionality to test
-}
-
-void SaslPluginTest::testPluginProcess()
-{
-    using SignOn::Error;
-
-    SaslData info;
-
-    QObject::connect(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)),
-                  this,  SLOT(result(const SignOn::SessionData&)),Qt::QueuedConnection);
-    QObject::connect(m_testPlugin, SIGNAL(error(const SignOn::Error&)),
-                  this,  SLOT(pluginError(const SignOn::Error&)),Qt::QueuedConnection);
-    QTimer::singleShot(10*1000, &m_loop, SLOT(quit()));
-
-    //try without username
-    m_testPlugin->process(info, QString("ANONYMOUS"));
-    m_loop.exec();
-    QVERIFY(m_errorType == Error::MissingData);
-
-    //try without mechanism
-    info.setUserName(QString("test"));
-    m_testPlugin->process(info);
-    m_loop.exec();
-    QVERIFY(m_errorType == Error::MechanismNotAvailable);
-
-    //rest of process is tested with real authentication mechanisms
-}
-
-void SaslPluginTest::testPluginChallengePlain()
-{
-    SaslData info;
-
-    QObject::connect(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)),
-                  this,  SLOT(result(const SignOn::SessionData&)),Qt::QueuedConnection);
-    QObject::connect(m_testPlugin, SIGNAL(error(const SignOn::Error & )),
-                  this,  SLOT(pluginError(const SignOn::Error & )),Qt::QueuedConnection);
-    QTimer::singleShot(10*1000, &m_loop, SLOT(quit()));
-
-    info.setUserName(QString("idmtestuser"));
-    info.setSecret(QString("abc123"));
-    info.setAuthname(QString("authn"));
-
-    //give challenge to plugin
-    m_testPlugin->process(info, QString("PLAIN"));
-    m_loop.exec();
-
-    //test response here
-    SaslData result =  m_response.data<SaslData>();
-    QByteArray token=result.Response();
-    token.replace('\0',':');
-    QCOMPARE(result.Response(), QByteArray("idmtestuser\0authn\0abc123",11+5+6+2));
-
-
-    //create connection to server to get initial challenge
-    SaslServer* server = new SaslServer();
-    QByteArray reply;
-    server->init(QString("PLAIN"),reply);
-
-   //check that authentication server is happy about answer
-    int retval=server->step(result.Response());
-    QCOMPARE(retval, SASL_NOUSER);
-
-    delete server;
-}
-
-void SaslPluginTest::testPluginChallengeDigestMd5()
-{
-    SaslData info;
-
-    QObject::connect(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)),
-                  this,  SLOT(result(const SignOn::SessionData&)),Qt::QueuedConnection);
-    QObject::connect(m_testPlugin, SIGNAL(error(const SignOn::Error & )),
-                  this,  SLOT(pluginError(const SignOn::Error & )),Qt::QueuedConnection);
-    QTimer::singleShot(10*1000, &m_loop, SLOT(quit()));
-
-    info.setUserName(QString("idmtestuser"));
-    info.setSecret(QString("abc123"));
-    info.setAuthname(QString("authn"));
-    info.setRealm(QString("realm"));
-    info.setService(QByteArray("sample"));
-
-    //create connection to server to get initial challenge
-    SaslServer* server = new SaslServer();
-
-    QByteArray challenge;
-    server->init(QString("DIGEST-MD5"), challenge);
-    info.setChallenge(challenge);
-
-    //give challenge to plugin
-    m_testPlugin->process(info, QString("DIGEST-MD5"));
-    m_loop.exec();
-
-    //test response here
-    SaslData result = m_response.data<SaslData>();
-
-    int retval=server->step(result.Response());
-    QCOMPARE(retval, SASL_NOUSER);
-
-    delete server;
-}
-
-void SaslPluginTest::testPluginChallengeCramMd5()
-{
-    SaslData info;
-
-    QObject::connect(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)),
-                  this,  SLOT(result(const SignOn::SessionData&)),Qt::QueuedConnection);
-    QObject::connect(m_testPlugin, SIGNAL(error(const SignOn::Error & )),
-                  this,  SLOT(pluginError(const SignOn::Error & )),Qt::QueuedConnection);
-    QTimer::singleShot(10*1000, &m_loop, SLOT(quit()));
-
-    info.setUserName(QString("idmtestuser"));
-    info.setSecret(QString("abc123"));
-    info.setAuthname(QString("authn"));
-    info.setRealm(QString("realm"));
-    info.setService(QByteArray("sample"));
-
-    //create connection to server to get initial challenge
-    SaslServer *server = new SaslServer();
-
-    QByteArray challenge;
-    int serret = server->init(QString("CRAM-MD5"), challenge); //fails sometimes
-    if (serret!=SASL_OK)
-    {
-        QSKIP("sasl server init for CRAM-MD5 failed",SkipSingle);
-    }
-
-    qDebug() <<challenge;
-    info.setChallenge(challenge);
-
-    //give challenge to plugin
-    m_testPlugin->process(info, QString("CRAM-MD5"));
-    m_loop.exec();
-
-    //test response here
-    SaslData result =  m_response.data<SaslData>();
-
-    int retval=server->step(result.Response()); //fails, check server impl.
-    QCOMPARE(retval, SASL_NOUSER);
-
-    delete server;
-}
-
-//private funcs
-
-void SaslPluginTest::testPluginsasl_callback()
-{
-    int ret=0;
-    const char* res;
-    unsigned len;
-    ret=m_testPlugin->sasl_callback(NULL,0,&res,&len);
-    QVERIFY(ret==SASL_BADPARAM);
-    ret=m_testPlugin->sasl_callback(m_testPlugin,0,NULL,&len);
-    QVERIFY(ret==SASL_BADPARAM);
-
-    m_testPlugin->d->m_input.setUserName(QString("user"));
-
-    ret=m_testPlugin->sasl_callback(m_testPlugin,SASL_CB_USER,&res,&len);
-    QVERIFY(ret==SASL_OK);
-    QCOMPARE(QByteArray(res),QByteArray("user"));
-    QVERIFY(len == 4);
-
-    m_testPlugin->d->m_input.setAuthname(QString("auth"));
-
-    ret=m_testPlugin->sasl_callback(m_testPlugin,SASL_CB_AUTHNAME,&res,&len);
-    QVERIFY(ret==SASL_OK);
-    QCOMPARE(QByteArray(res),QByteArray("auth"));
-    QVERIFY(len == 4);
-
-    ret=m_testPlugin->sasl_callback(m_testPlugin,SASL_CB_LANGUAGE,&res,&len);
-    QVERIFY(ret==SASL_OK);
-    QVERIFY(res == NULL);
-    QVERIFY(len == 0);
-
-    ret=m_testPlugin->sasl_callback(m_testPlugin,45643,&res,&len);
-    QVERIFY(ret==SASL_BADPARAM);
-}
-
-void SaslPluginTest::testPluginsasl_get_realm()
-{
-    int ret=0;
-    const char* res;
-
-    ret=m_testPlugin->sasl_get_realm(NULL, 0, NULL, NULL);
-    QVERIFY(ret==SASL_FAIL);
-    ret=m_testPlugin->sasl_get_realm(NULL, SASL_CB_GETREALM, NULL, NULL);
-    QVERIFY(ret==SASL_BADPARAM);
-    ret=m_testPlugin->sasl_get_realm(m_testPlugin, SASL_CB_GETREALM, NULL, NULL);
-    QVERIFY(ret==SASL_BADPARAM);
-
-    ret=m_testPlugin->sasl_get_realm(m_testPlugin, SASL_CB_GETREALM, NULL, &res);
-    QVERIFY(ret==SASL_OK);
-
-    m_testPlugin->d->m_input.setRealm(QString("real"));
-
-    ret=m_testPlugin->sasl_get_realm(m_testPlugin, SASL_CB_GETREALM, NULL, &res);
-    QVERIFY(ret==SASL_OK);
-    QCOMPARE(QByteArray(res),QByteArray("real"));
-}
-
-void SaslPluginTest::testPluginsasl_get_secret()
-{
-    int ret=0;
-    sasl_secret_t *secret=NULL;
-
-    ret=m_testPlugin->sasl_get_secret(m_testPlugin->d->m_conn,NULL,0, &secret);
-    QVERIFY(ret==SASL_BADPARAM);
-
-    m_testPlugin->d->m_input.setSecret(QString("password"));
-
-    ret=m_testPlugin->sasl_get_secret(m_testPlugin->d->m_conn,m_testPlugin,SASL_CB_PASS, NULL);
-    QVERIFY(ret==SASL_BADPARAM);
-    ret=m_testPlugin->sasl_get_secret(m_testPlugin->d->m_conn,m_testPlugin,SASL_CB_PASS, &secret);
-    qDebug("err: %d",ret);
-    QVERIFY(ret==SASL_OK);
-    QCOMPARE(QByteArray("password"),QByteArray((const char*)secret->data,(int)secret->len));
-}
-
-void SaslPluginTest::testPluginsasl_log()
-{
-    int ret=0;
-
-    ret=m_testPlugin->sasl_log(m_testPlugin, 0, NULL);
-    QVERIFY(ret==SASL_BADPARAM);
-
-    ret=m_testPlugin->sasl_log(m_testPlugin, 0, "test debug");
-    QVERIFY(ret==SASL_OK);
-}
-
-void SaslPluginTest::testPluginset_callbacks()
-{
-    m_testPlugin->set_callbacks();
-    sasl_callback_t *callback;
-    callback = m_testPlugin->d->m_callbacks;
-    QVERIFY(callback != NULL);
-    QVERIFY(callback->id == SASL_CB_LOG);
-    QVERIFY(callback->context == m_testPlugin);
-    ++callback;
-    QVERIFY(callback != NULL);
-    QVERIFY(callback->id == SASL_CB_USER);
-    QVERIFY(callback->context == m_testPlugin);
-    ++callback;
-    QVERIFY(callback != NULL);
-    QVERIFY(callback->id == SASL_CB_AUTHNAME);
-    QVERIFY(callback->context == m_testPlugin);
-    ++callback;
-    QVERIFY(callback != NULL);
-    QVERIFY(callback->id == SASL_CB_PASS);
-    QVERIFY(callback->context == m_testPlugin);
-    ++callback;
-    QVERIFY(callback != NULL);
-    QVERIFY(callback->id == SASL_CB_GETREALM);
-    QVERIFY(callback->context == m_testPlugin);
-    ++callback;
-    QVERIFY(callback != NULL);
-    QVERIFY(callback->id == SASL_CB_LIST_END);
-    QVERIFY(callback->context == NULL);
-}
-
-void SaslPluginTest::testPlugincheck_and_fix_parameters()
-{
-    bool ret;
-    SaslData input;
-    ret=m_testPlugin->check_and_fix_parameters(input);
-    QVERIFY(ret==false); //m_user not defined
-    QVERIFY(input.Service().isEmpty());
-    input.setUserName(QString("user"));
-
-    ret=m_testPlugin->check_and_fix_parameters(input);
-    QVERIFY(ret); //user valid
-    QCOMPARE(input.UserName(), QString("user"));
-    QCOMPARE(input.Service(), QString("default"));
-    QCOMPARE(input.Fqdn(), QString("default"));
-    QCOMPARE(input.IpLocal(), QString("127.0.0.1"));
-    QCOMPARE(input.IpRemote(), QString("127.0.0.1"));
-}
-
-// sasl server implementation for response verification
-
-int sasl_log(void *context,
-            int priority,
-            const char *message)
-{
-    Q_UNUSED(context);
-    Q_UNUSED(priority);
-    if (! message)
-        return SASL_BADPARAM;
-
-    TRACE() << message;
-    return SASL_OK;
-}
-
-static sasl_callback_t callbacks[] = {
-    {
-        SASL_CB_LOG, (int(*)())(&sasl_log), NULL
-    }, {
-        SASL_CB_LIST_END, NULL, NULL
-    }
-};
-
-void saslfail(int why, const char *what, const char *errstr)
-{
-    qDebug() << why << what << errstr;
-}
-
-#define SAMPLE_SEC_BUF_SIZE (2048)
-
-char buf[SAMPLE_SEC_BUF_SIZE];
-
-SaslServer::SaslServer()
-{
-    service="sample";
-    localdomain="loc";
-    userdomain="realm";
-    iplocal="127.0.0.1";
-    ipremote="127.0.0.1";
-    searchpath=".";
-    memset(&buf, 0L, SAMPLE_SEC_BUF_SIZE);
-}
-
-SaslServer::~SaslServer()
-{
-    sasl_dispose(&conn);
-    //sasl_done(); //cannot be called, as plugin also runs this
-}
-
-int SaslServer::init(const QString &mech, QByteArray &challenge)
-{
-    const char *ext_authid = NULL;
-
-    /* Init defaults... */
-    memset(&secprops, 0L, sizeof(secprops));
-    secprops.maxbufsize = SAMPLE_SEC_BUF_SIZE;
-    secprops.max_ssf = UINT_MAX;
-
-    result = sasl_server_init(callbacks, "sample");
-    if (result != SASL_OK)
-        saslfail(result, "Initializing libsasl", NULL);
-
-    result = sasl_server_new(service,
-                             localdomain,
-                             userdomain,
-                             iplocal,
-                             ipremote,
-                             NULL,
-                             serverlast,
-                             &conn);
-    if (result != SASL_OK)
-        saslfail(result, "Allocating sasl connection state", NULL);
-
-    if (!mech.isEmpty()) {
-        printf("Forcing use of mechanism %s\n", mech.toLatin1().constData());
-        data = strdup(mech.toLatin1().constData());
-        len = (unsigned) strlen(data);
-        count = 1;
-    } else {
-        puts("Generating client mechanism list...");
-        result = sasl_listmech(conn,
-                               ext_authid,
-                               NULL,
-                               " ",
-                               NULL,
-                               &data,
-                               &len,
-                               (int*)&count);
-        if (result != SASL_OK)
-            saslfail(result, "Generating client mechanism list", NULL);
-    }
-
-    printf("Sending list of %d mechanism(s)\n", count);
-
-    if (!mech.isEmpty()) {
-        free((void *)data);
-    }
-
-    puts("Waiting for client mechanism...");
-    strcpy(buf, mech.toLatin1().constData());
-    len=strlen(buf);
-
-    if (!mech.isEmpty() && strcasecmp(mech.toLatin1().constData(), buf))
-    {
-        qDebug("Client chose something other than the mandatory mechanism");
-        return SASL_FAIL;
-    }
-
-    if (strlen(buf) < len) {
-        qDebug(" Hmm, there's an initial response here ");
-        data = buf + strlen(buf) + 1;
-        len = len - strlen(buf) - 1;
-    } else {
-        qDebug("no initial data");
-        data = NULL;
-        len = 0;
-    }
-    qDebug("start");
-    result = sasl_server_start(conn,
-                               buf,
-                               data,
-                               len,
-                               &data,
-                               &len);
-    if (result != SASL_OK && result != SASL_CONTINUE)
-    {
-        saslfail(result, "Starting SASL negotiation", sasl_errstring(result,NULL,NULL));
-        return result;
-    }
-    if (len) {
-        qDebug("gotl data");
-        qDebug()<< data;
-        challenge=QByteArray(data,len);
-        qDebug()<< challenge;
-    }
-    return result;
-}
-
-int SaslServer::step(const QByteArray &response)
-{
-    if (data) {
-        puts("Sending response...");
-    } else {
-        qDebug("No data to send--something's wrong");
-    }
-    puts("Waiting for client reply...");
-    QByteArray resp=response;
-    resp.replace('\0',':');
-
-    qDebug()<<resp;
-    qDebug()<<response;
-    qDebug()<<response.count();
-
-    for(int i=0; i<response.count(); i++) buf[i]=(char)(response.constData()[i]);
-    len=response.count();
-    buf[len]=0;
-
-    data = NULL;
-    result = sasl_server_step(conn, buf, len,
-                              &data, &len);
-    if (result != SASL_OK && result != SASL_CONTINUE)
-    {
-        saslfail(result, "Performing SASL negotiation", sasl_errstring(result,NULL,NULL));
-        return result;
-    }
-
-    if(result == SASL_CONTINUE) {
-        qDebug("continue");
-        return result;
-    }
-
-    puts("Negotiation complete");
-
-    if(serverlast&&data) {
-        printf("might need additional send:\n");
-    }
-
-    result = sasl_getprop(conn, SASL_USERNAME, (const void **)&data);
-
-    return SASL_OK;
-}
-
-//end test cases
-
-QTEST_MAIN(SaslPluginTest)

=== removed file 'tests/saslplugintest.h'
--- tests/saslplugintest.h	2015-09-18 13:33:21 +0000
+++ tests/saslplugintest.h	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of signon
- *
- * Copyright (C) 2009-2010 Nokia Corporation.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef SASL_PLUGINS_TEST
-#define SASL_PLUGINS_TEST
-
-#include <sasl/sasl.h>
-#include <QString>
-#include "saslplugin.h"
-#include "SignOn/authpluginif.h"
-
-using namespace SaslPluginNS;
-
-class SaslPluginTest : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void result(const SignOn::SessionData& data);
-    void pluginError(const SignOn::Error &error);
-
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-    //test cases
-    void testPlugin();
-    void testPluginType();
-    void testPluginMechanisms();
-    void testPluginCancel();
-    void testPluginProcess();
-    void testPluginChallengePlain();
-    void testPluginChallengeDigestMd5();
-    void testPluginChallengeCramMd5();
-    void testPluginsasl_callback();
-    void testPluginsasl_get_realm();
-    void testPluginsasl_get_secret();
-    void testPluginsasl_log();
-    void testPluginset_callbacks();
-    void testPlugincheck_and_fix_parameters();
-    //end test cases
-
-private:
-    SaslPlugin* m_testPlugin;
-    int m_errorType;
-    SignOn::SessionData m_response;
-    QEventLoop m_loop;
-};
-
-class SaslServer {
-public:
-    SaslServer();
-    ~SaslServer();
-    int  init(const QString& mech, QByteArray &challenge);
-    int step(const QByteArray &response);
-
-    int c;
-    int errflag ;
-    int result;
-    sasl_security_properties_t secprops;
-    sasl_ssf_t extssf ;
-    char *options, *value;
-    unsigned len, count;
-    const char *data;
-    int serverlast ;
-    sasl_ssf_t *ssf;
-
-    const char *mech,
-    *iplocal ,
-    *ipremote ,
-    *searchpath,
-    *service ,
-    *localdomain ,
-    *userdomain ;
-    sasl_conn_t *conn ;
-};
-
-#endif //SASL_PLUGINS_TEST

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2015-09-18 14:35:00 +0000
+++ tests/tests.pro	2015-12-03 07:31:19 +0000
@@ -1,36 +1,28 @@
 include( ../common-project-config.pri )
 include( ../common-vars.pri )
 
-QMAKE_EXTRA_TARGETS += check
-
-TARGET = signon-saslplugin-tests
+TARGET = tst_plugin
 
 QT += \
     core \
     testlib
 QT -= gui
-CONFIG += qtestlib \
+CONFIG += \
     link_pkgconfig \
 
-SOURCES += saslplugintest.cpp
-
-HEADERS += saslplugintest.h \
-           $${TOP_SRC_DIR}/src/saslplugin.h
-
-INCLUDEPATH += $${TOP_SRC_DIR}/src
+SOURCES += tst_plugin.cpp
+
+HEADERS += \
+    $${TOP_SRC_DIR}/src/saslplugin.h
+
+INCLUDEPATH += . \
+    $${TOP_SRC_DIR}/src
 
 PKGCONFIG += \
     libsasl2 \
     libsignon-qt5 \
     signon-plugins
 
-QMAKE_CXXFLAGS += -fno-exceptions \
-                  -fno-rtti
-                  
-target.path = /usr/bin
-
-INSTALLS += target
-
 check.depends = $$TARGET
 check.commands = ./$$TARGET
 QMAKE_EXTRA_TARGETS += check

=== added file 'tests/tst_plugin.cpp'
--- tests/tst_plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/tst_plugin.cpp	2015-12-03 07:31:19 +0000
@@ -0,0 +1,611 @@
+/* -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of signon
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include "saslplugin.h"
+#include "sasldata.h"
+#include "saslplugin.cpp"
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QSignalSpy>
+#include <QTest>
+#include <sasl/sasl.h>
+
+using namespace SaslPluginNS;
+
+namespace QTest {
+template<> char *toString(const QVariantMap &map)
+{
+    QJsonDocument doc(QJsonObject::fromVariantMap(map));
+    return qstrdup(doc.toJson(QJsonDocument::Compact).data());
+}
+} // QTest namespace
+
+// sasl server implementation for response verification
+
+class SaslServer {
+public:
+    SaslServer();
+    ~SaslServer();
+    int init(const QString &mech, QByteArray &challenge);
+    int step(const QByteArray &response);
+
+    int c;
+    int errflag;
+    int result;
+    sasl_security_properties_t secprops;
+    sasl_ssf_t extssf;
+    char *options, *value;
+    unsigned len, count;
+    const char *data;
+    int serverlast;
+    sasl_ssf_t *ssf;
+
+    const char *mech;
+    const char *iplocal;
+    const char *ipremote;
+    const char *searchpath;
+    const char *service;
+    const char *localdomain;
+    const char *userdomain;
+    sasl_conn_t *conn;
+};
+
+int sasl_log(void *context, int priority, const char *message)
+{
+    Q_UNUSED(context);
+    Q_UNUSED(priority);
+    if (!message)
+        return SASL_BADPARAM;
+
+    TRACE() << message;
+    return SASL_OK;
+}
+
+static sasl_callback_t callbacks[] = {
+    {
+        SASL_CB_LOG, (int(*)())(&sasl_log), NULL
+    }, {
+        SASL_CB_LIST_END, NULL, NULL
+    }
+};
+
+void saslfail(int why, const char *what, const char *errstr)
+{
+    qDebug() << why << what << errstr;
+}
+
+#define SAMPLE_SEC_BUF_SIZE (2048)
+
+char buf[SAMPLE_SEC_BUF_SIZE];
+
+SaslServer::SaslServer()
+{
+    service = "sample";
+    localdomain = "loc";
+    userdomain = "realm";
+    iplocal = "127.0.0.1";
+    ipremote = "127.0.0.1";
+    searchpath = ".";
+    memset(&buf, 0L, SAMPLE_SEC_BUF_SIZE);
+}
+
+SaslServer::~SaslServer()
+{
+    sasl_dispose(&conn);
+    //sasl_done(); //cannot be called, as plugin also runs this
+}
+
+int SaslServer::init(const QString &mech, QByteArray &challenge)
+{
+    const char *ext_authid = NULL;
+
+    /* Init defaults... */
+    memset(&secprops, 0L, sizeof(secprops));
+    secprops.maxbufsize = SAMPLE_SEC_BUF_SIZE;
+    secprops.max_ssf = UINT_MAX;
+
+    result = sasl_server_init(callbacks, "sample");
+    if (result != SASL_OK)
+        saslfail(result, "Initializing libsasl", NULL);
+
+    result = sasl_server_new(service,
+                             localdomain,
+                             userdomain,
+                             iplocal,
+                             ipremote,
+                             NULL,
+                             0,
+                             &conn);
+    if (result != SASL_OK)
+        saslfail(result, "Allocating sasl connection state", NULL);
+
+    if (!mech.isEmpty()) {
+        data = strdup(mech.toLatin1().constData());
+        len = (unsigned) strlen(data);
+        count = 1;
+    } else {
+        result = sasl_listmech(conn,
+                               ext_authid,
+                               NULL,
+                               " ",
+                               NULL,
+                               &data,
+                               &len,
+                               (int*)&count);
+        if (result != SASL_OK)
+            saslfail(result, "Generating client mechanism list", NULL);
+    }
+
+    if (!mech.isEmpty()) {
+        free((void *)data);
+    }
+
+    strcpy(buf, mech.toLatin1().constData());
+    len = strlen(buf);
+
+    if (!mech.isEmpty() && strcasecmp(mech.toLatin1().constData(), buf))
+    {
+        qDebug("Client chose something other than the mandatory mechanism");
+        return SASL_FAIL;
+    }
+
+    if (strlen(buf) < len) {
+        data = buf + strlen(buf) + 1;
+        len = len - strlen(buf) - 1;
+    } else {
+        data = NULL;
+        len = 0;
+    }
+    result = sasl_server_start(conn, buf, data, len,
+                               &data, &len);
+    if (result != SASL_OK && result != SASL_CONTINUE) {
+        saslfail(result, "Starting SASL negotiation",
+                 sasl_errstring(result, NULL, NULL));
+        return result;
+    }
+    if (len) {
+        challenge = QByteArray(data, len);
+    }
+    return result;
+}
+
+int SaslServer::step(const QByteArray &response)
+{
+    if (!data) {
+        qDebug("No data to send--something's wrong");
+    }
+    QByteArray resp = response;
+    resp.replace('\0', ':');
+
+    for (int i = 0; i < response.count(); i++) {
+        buf[i] = (char)(response.constData()[i]);
+    }
+    len = response.count();
+    buf[len] = 0;
+
+    data = NULL;
+    result = sasl_server_step(conn, buf, len,
+                              &data, &len);
+    if (result != SASL_OK && result != SASL_CONTINUE) {
+        saslfail(result, "Performing SASL negotiation",
+                 sasl_errstring(result, NULL, NULL));
+        return result;
+    }
+
+    if (result == SASL_CONTINUE) {
+        return result;
+    }
+
+    result = sasl_getprop(conn, SASL_USERNAME, (const void **)&data);
+
+    return SASL_OK;
+}
+class SaslPluginTest: public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+    //test cases
+    void testPlugin();
+    void testPluginType();
+    void testPluginMechanisms();
+    void testProcess();
+    void testChallengePlain();
+    void testChallengeDigestMd5();
+    void testChallengeCramMd5();
+    void testPluginsasl_callback();
+    void testPluginsasl_get_realm();
+    void testPluginsasl_get_secret();
+    void testPluginsasl_log();
+    void testPluginset_callbacks();
+    void testParameters_data();
+    void testParameters();
+    //end test cases
+
+private:
+    SaslPlugin *m_testPlugin;
+};
+
+void SaslPluginTest::initTestCase()
+{
+    qRegisterMetaType<SignOn::SessionData>();
+}
+
+void SaslPluginTest::cleanupTestCase()
+{
+    sasl_done();
+}
+
+void SaslPluginTest::init()
+{
+    m_testPlugin = new SaslPlugin();
+}
+
+void SaslPluginTest::cleanup()
+{
+    delete m_testPlugin;
+    m_testPlugin = 0;
+}
+
+void SaslPluginTest::testPlugin()
+{
+    QVERIFY(m_testPlugin);
+}
+
+void SaslPluginTest::testPluginType()
+{
+    QCOMPARE(m_testPlugin->type(), QString("sasl"));
+}
+
+void SaslPluginTest::testPluginMechanisms()
+{
+    QStringList mechs = m_testPlugin->mechanisms();
+    QVERIFY(!mechs.isEmpty());
+    QVERIFY(mechs.contains(QString("PLAIN")));
+}
+
+void SaslPluginTest::testProcess()
+{
+    SaslData info;
+
+    QSignalSpy resultSpy(m_testPlugin,
+                         SIGNAL(result(const SignOn::SessionData&)));
+    QSignalSpy errorSpy(m_testPlugin, SIGNAL(error(const SignOn::Error&)));
+
+    //try without username
+    m_testPlugin->process(info, QString("ANONYMOUS"));
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorSpy.at(0).at(0).value<SignOn::Error>().type(),
+             int(SignOn::Error::MissingData));
+    QCOMPARE(resultSpy.count(), 0);
+
+    //try without mechanism
+    errorSpy.clear();
+    info.setUserName(QString("test"));
+    m_testPlugin->process(info);
+    QCOMPARE(errorSpy.count(), 1);
+    QCOMPARE(errorSpy.at(0).at(0).value<SignOn::Error>().type(),
+             int(SignOn::Error::MechanismNotAvailable));
+    QCOMPARE(resultSpy.count(), 0);
+}
+
+void SaslPluginTest::testChallengePlain()
+{
+    SaslData info;
+
+    QSignalSpy resultSpy(m_testPlugin,
+                         SIGNAL(result(const SignOn::SessionData&)));
+    QSignalSpy errorSpy(m_testPlugin, SIGNAL(error(const SignOn::Error&)));
+
+    info.setUserName(QString("idmtestuser"));
+    info.setSecret(QString("abc123"));
+    info.setAuthName(QString("authn"));
+
+    //give challenge to plugin
+    m_testPlugin->process(info, QString("PLAIN"));
+
+    //test response here
+    QCOMPARE(errorSpy.count(), 0);
+    QCOMPARE(resultSpy.count(), 1);
+    SaslData result =
+        resultSpy.at(0).at(0).value<SignOn::SessionData>().data<SaslData>();
+    QByteArray token=result.Response();
+    token.replace('\0',':');
+    QCOMPARE(result.Response(), QByteArray("idmtestuser\0authn\0abc123",11+5+6+2));
+
+    //create connection to server to get initial challenge
+    SaslServer *server = new SaslServer();
+    QByteArray reply;
+    server->init(QString("PLAIN"), reply);
+
+    //check that authentication server is happy about answer
+    int retval = server->step(result.Response());
+    QCOMPARE(retval, SASL_NOUSER);
+
+    delete server;
+}
+
+void SaslPluginTest::testChallengeDigestMd5()
+{
+    SaslData info;
+
+    QSignalSpy resultSpy(m_testPlugin,
+                         SIGNAL(result(const SignOn::SessionData&)));
+    QSignalSpy errorSpy(m_testPlugin, SIGNAL(error(const SignOn::Error&)));
+
+    info.setUserName(QString("idmtestuser"));
+    info.setSecret(QString("abc123"));
+    info.setAuthName(QString("authn"));
+    info.setRealm(QString("realm"));
+    info.setService(QByteArray("sample"));
+
+    //create connection to server to get initial challenge
+    SaslServer *server = new SaslServer();
+
+    QByteArray challenge;
+    server->init(QString("DIGEST-MD5"), challenge);
+    info.setChallenge(challenge);
+
+    //give challenge to plugin
+    m_testPlugin->process(info, QString("DIGEST-MD5"));
+
+    //test response here
+    QCOMPARE(errorSpy.count(), 0);
+    QCOMPARE(resultSpy.count(), 1);
+    SaslData result =
+        resultSpy.at(0).at(0).value<SignOn::SessionData>().data<SaslData>();
+
+    int retval = server->step(result.Response());
+    QCOMPARE(retval, SASL_NOUSER);
+
+    delete server;
+}
+
+void SaslPluginTest::testChallengeCramMd5()
+{
+    SaslData info;
+
+    QSignalSpy resultSpy(m_testPlugin,
+                         SIGNAL(result(const SignOn::SessionData&)));
+    QSignalSpy errorSpy(m_testPlugin, SIGNAL(error(const SignOn::Error&)));
+
+    info.setUserName(QString("idmtestuser"));
+    info.setSecret(QString("abc123"));
+    info.setAuthName(QString("authn"));
+    info.setRealm(QString("realm"));
+    info.setService(QByteArray("sample"));
+
+    //create connection to server to get initial challenge
+    SaslServer *server = new SaslServer();
+
+    QByteArray challenge;
+    int serret = server->init(QString("CRAM-MD5"), challenge); //fails sometimes
+    if (serret != SASL_OK) {
+        QSKIP("sasl server init for CRAM-MD5 failed", SkipSingle);
+    }
+
+    info.setChallenge(challenge);
+
+    //give challenge to plugin
+    m_testPlugin->process(info, QString("CRAM-MD5"));
+
+    //test response here
+    QCOMPARE(errorSpy.count(), 0);
+    QCOMPARE(resultSpy.count(), 1);
+    SaslData result =
+        resultSpy.at(0).at(0).value<SignOn::SessionData>().data<SaslData>();
+
+    int retval = server->step(result.Response()); //fails, check server impl.
+    QCOMPARE(retval, SASL_NOUSER);
+
+    delete server;
+}
+
+//private funcs
+
+void SaslPluginTest::testPluginsasl_callback()
+{
+    int ret;
+    const char *res;
+    unsigned len;
+    ret = m_testPlugin->sasl_callback(NULL, 0, &res, &len);
+    QCOMPARE(ret, SASL_BADPARAM);
+    ret = m_testPlugin->sasl_callback(m_testPlugin, 0, NULL, &len);
+    QCOMPARE(ret, SASL_BADPARAM);
+
+    m_testPlugin->d->m_input.setUserName(QString("user"));
+
+    ret = m_testPlugin->sasl_callback(m_testPlugin, SASL_CB_USER, &res, &len);
+    QCOMPARE(ret, SASL_OK);
+    QCOMPARE(QByteArray(res), QByteArray("user"));
+    QCOMPARE(len, uint(4));
+
+    m_testPlugin->d->m_input.setAuthName(QString("auth"));
+
+    ret = m_testPlugin->sasl_callback(m_testPlugin, SASL_CB_AUTHNAME, &res, &len);
+    QCOMPARE(ret, SASL_OK);
+    QCOMPARE(QByteArray(res), QByteArray("auth"));
+    QCOMPARE(len, uint(4));
+
+    ret = m_testPlugin->sasl_callback(m_testPlugin, SASL_CB_LANGUAGE, &res, &len);
+    QCOMPARE(ret, SASL_OK);
+    QVERIFY(!res);
+    QCOMPARE(len, uint(0));
+
+    ret = m_testPlugin->sasl_callback(m_testPlugin, 45643, &res, &len);
+    QCOMPARE(ret, SASL_BADPARAM);
+}
+
+void SaslPluginTest::testPluginsasl_get_realm()
+{
+    int ret;
+    const char *res;
+
+    ret = m_testPlugin->sasl_get_realm(NULL, 0, NULL, NULL);
+    QCOMPARE(ret, SASL_FAIL);
+    ret = m_testPlugin->sasl_get_realm(NULL, SASL_CB_GETREALM, NULL, NULL);
+    QCOMPARE(ret, SASL_BADPARAM);
+    ret = m_testPlugin->sasl_get_realm(m_testPlugin, SASL_CB_GETREALM, NULL, NULL);
+    QCOMPARE(ret, SASL_BADPARAM);
+
+    ret = m_testPlugin->sasl_get_realm(m_testPlugin, SASL_CB_GETREALM, NULL, &res);
+    QCOMPARE(ret, SASL_OK);
+
+    m_testPlugin->d->m_input.setRealm(QString("real"));
+
+    ret = m_testPlugin->sasl_get_realm(m_testPlugin, SASL_CB_GETREALM, NULL, &res);
+    QCOMPARE(ret, SASL_OK);
+    QCOMPARE(QByteArray(res), QByteArray("real"));
+}
+
+void SaslPluginTest::testPluginsasl_get_secret()
+{
+    int ret;
+    sasl_secret_t *secret = 0;
+
+    ret = m_testPlugin->sasl_get_secret(m_testPlugin->d->m_conn, NULL,
+                                        0, &secret);
+    QCOMPARE(ret, SASL_BADPARAM);
+
+    m_testPlugin->d->m_input.setSecret(QString("password"));
+
+    ret = m_testPlugin->sasl_get_secret(m_testPlugin->d->m_conn, m_testPlugin,
+                                        SASL_CB_PASS, NULL);
+    QCOMPARE(ret, SASL_BADPARAM);
+    ret = m_testPlugin->sasl_get_secret(m_testPlugin->d->m_conn, m_testPlugin,
+                                        SASL_CB_PASS, &secret);
+    QCOMPARE(ret, SASL_OK);
+    QCOMPARE(QByteArray("password"),
+             QByteArray((const char*)secret->data, (int)secret->len));
+}
+
+void SaslPluginTest::testPluginsasl_log()
+{
+    int ret;
+
+    ret = m_testPlugin->sasl_log(m_testPlugin, 0, NULL);
+    QCOMPARE(ret, SASL_BADPARAM);
+
+    ret = m_testPlugin->sasl_log(m_testPlugin, 0, "test debug");
+    QCOMPARE(ret, SASL_OK);
+}
+
+void SaslPluginTest::testPluginset_callbacks()
+{
+    m_testPlugin->set_callbacks();
+    sasl_callback_t *callback;
+    callback = m_testPlugin->d->m_callbacks;
+    QVERIFY(callback != NULL);
+    QVERIFY(callback->id == SASL_CB_LOG);
+    QVERIFY(callback->context == m_testPlugin);
+    ++callback;
+    QVERIFY(callback != NULL);
+    QVERIFY(callback->id == SASL_CB_USER);
+    QVERIFY(callback->context == m_testPlugin);
+    ++callback;
+    QVERIFY(callback != NULL);
+    QVERIFY(callback->id == SASL_CB_AUTHNAME);
+    QVERIFY(callback->context == m_testPlugin);
+    ++callback;
+    QVERIFY(callback != NULL);
+    QVERIFY(callback->id == SASL_CB_PASS);
+    QVERIFY(callback->context == m_testPlugin);
+    ++callback;
+    QVERIFY(callback != NULL);
+    QVERIFY(callback->id == SASL_CB_GETREALM);
+    QVERIFY(callback->context == m_testPlugin);
+    ++callback;
+    QVERIFY(callback != NULL);
+    QVERIFY(callback->id == SASL_CB_LIST_END);
+    QVERIFY(callback->context == NULL);
+}
+
+void SaslPluginTest::testParameters_data()
+{
+    qDebug() << "Called!";
+    QTest::addColumn<QVariantMap>("parameters");
+    QTest::addColumn<QString>("mechanism");
+    QTest::addColumn<bool>("isValid");
+    QTest::addColumn<QVariantMap>("expectedParams");
+
+    QVariantMap parameters;
+    QVariantMap expectedParams;
+    QTest::newRow("empty") <<
+        parameters << QString() << false << expectedParams;
+
+    parameters["UserName"] = "user";
+    expectedParams["AuthName"] = "user";
+    expectedParams["UserName"] = "user";
+    expectedParams["Service"] = "default";
+    expectedParams["Fqdn"] = "default";
+    expectedParams["IpLocal"] = "127.0.0.1";
+    expectedParams["IpRemote"] = "127.0.0.1";
+    expectedParams["MechList"] = "PLAIN";
+    QTest::newRow("only user") <<
+        parameters <<
+        "PLAIN" <<
+        true <<
+        expectedParams;
+    parameters.clear();
+    expectedParams.clear();
+
+    parameters["UserName"] = "user";
+    parameters["MechList"] = "MECH1 MECH2";
+    expectedParams["AuthName"] = "user";
+    expectedParams["UserName"] = "user";
+    expectedParams["Service"] = "default";
+    expectedParams["Fqdn"] = "default";
+    expectedParams["IpLocal"] = "127.0.0.1";
+    expectedParams["IpRemote"] = "127.0.0.1";
+    expectedParams["MechList"] = "MECH1 MECH2";
+    QTest::newRow("with mechlist") <<
+        parameters <<
+        "PLAIN" <<
+        true <<
+        expectedParams;
+}
+
+void SaslPluginTest::testParameters()
+{
+    QFETCH(QVariantMap, parameters);
+    QFETCH(QString, mechanism);
+    QFETCH(bool, isValid);
+    QFETCH(QVariantMap, expectedParams);
+
+    SaslData input(parameters);
+    bool ret =
+        m_testPlugin->check_and_fix_parameters(input, mechanism.toUtf8());
+    QCOMPARE(ret, isValid);
+
+    QCOMPARE(input.toMap(), expectedParams);
+}
+
+QTEST_MAIN(SaslPluginTest)
+#include "tst_plugin.moc"