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

[Alberto Mardegan]

New upstream release:

- Remove Qt4 support
- Lib: add more defines for SignOnUi password dialog
- signond: inform SignOnUI when a session finishes
- signond: add configure option to enable backup
- signond: minor code simplifications and cleanups
- plugins: don't use custom proxy implementation on Qt 5.5 and later
- RemotePluginProcess: don't use a thread for cancel
- Build: use qmake's DBUS_ADAPTORS to build the backup adaptor
- Build: support implicit out-of-tree builds
- Build: enable CI in gitlab
- Tests: add tst_signond using QtDBusMock
- Doc: don't build signond documentation
- Escape quotation marks in ConfigVersion.cmake.in files

Merge from upstream
- Tests: fix AuthSession's "invocation of process() from another process"
  test (bug 1608822)

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

636. By Alberto Mardegan on 2016-06-07

Remove symbols files

Getting random symbols added/removed in different distros :-(

637. By Alberto Mardegan on 2016-08-24

Merge from upstream

  - Tests: fix AuthSession's "invocation of process() from another process"
    test (LP: #1608822)

638. By Alberto Mardegan on 2016-08-24

Increase tests timeout

=== added file '.gitlab-ci.yml'
--- .gitlab-ci.yml	1970-01-01 00:00:00 +0000
+++ .gitlab-ci.yml	2016-08-24 14:26:52 +0000
@@ -0,0 +1,51 @@
+image: ubuntu:xenial
+
+cache:
+  key: apt-cache
+  paths:
+  - apt-cache/
+
+before_script:
+  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev
+  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev
+  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y lcov gcovr
+
+build_amd64:
+  stage: build
+  script:
+    - export QT_SELECT=qt5
+    - mkdir build
+    - cd build
+    - qmake CONFIG+=debug CONFIG+=coverage CONFIG+=enable-backup CONFIG+=enable-p2p ..
+    - make -j 4
+  artifacts:
+    paths:
+      - build/
+
+test_amd64:
+  stage: test
+  script:
+    - find build | xargs touch # Avoid rebuilding
+    - cd build
+    - make coverage-html
+  dependencies:
+    - build_amd64
+  artifacts:
+    paths:
+      - ./
+
+pages:
+  stage: deploy
+  script:
+    - cd build
+    - make install INSTALL_ROOT=$(pwd)/out
+    - cd ..
+    - mkdir public
+    - cp -a build/coverage-html public/coverage
+    - cp -a build/out/usr/share/doc/libsignon-qt/html/* public
+  dependencies:
+    - test_amd64
+  artifacts:
+    paths:
+      - public

=== added file '.qmake.conf'
--- .qmake.conf	1970-01-01 00:00:00 +0000
+++ .qmake.conf	2016-08-24 14:26:52 +0000
@@ -0,0 +1,2 @@
+TOP_SRC_DIR = $$PWD
+TOP_BUILD_DIR = $$shadowed($$PWD)

=== modified file 'README.md'
--- README.md	2015-09-11 15:01:25 +0000
+++ README.md	2016-08-24 14:26:52 +0000
@@ -21,3 +21,10 @@
 make
 make install
 ```
+
+Resources
+---------
+
+[libsignon-qt API reference documentation](http://accounts-sso.gitlab.io/signond/index.html)
+
+[Official source code repository](https://gitlab.com/accounts-sso/signond)

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2015-10-27 09:58:39 +0000
+++ common-project-config.pri	2016-08-24 14:26:52 +0000
@@ -15,32 +15,22 @@
 QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
 # Disable RTTI
 QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+# Use C++11
+QMAKE_CXXFLAGS += -std=c++11
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    # Qt5: use C++11. This is used to avoid the source incompatibility
-    # with the QSKIP macro, as described in:
-    # http://www.kdab.com/porting-from-qt-4-to-qt-5/
-    QMAKE_CXXFLAGS += -std=c++11
+isEmpty(TOP_SRC_DIR) {
+    TOP_SRC_DIR = $$PWD
+    TOP_BUILD_DIR = $${TOP_SRC_DIR}/$${BUILD_DIR}
 }
 
-TOP_SRC_DIR     = $$PWD
-TOP_BUILD_DIR   = $${TOP_SRC_DIR}/$${BUILD_DIR}
-
 #DEFINES += QT_NO_DEBUG_OUTPUT
 DEFINES += DEBUG_ENABLED
 #TODO comment this to restrict plugins to run under signon user
 DEFINES += NO_SIGNON_USER
 
-# Qt4/Qt5 common checks
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBSIGNON = libsignon-qt5
-    CMAKE_BASENAME = SignOnQt5
-    LIBQTCORE = Qt5Core
-} else {
-    LIBSIGNON = libsignon-qt
-    CMAKE_BASENAME = SignOnQt
-    LIBQTCORE = QtCore
-}
+# Library name for CMake and pkg-config
+LIBSIGNON = libsignon-qt5
+CMAKE_BASENAME = SignOnQt5
 
 #-----------------------------------------------------------------------------
 # setup the installation prefix

=== modified file 'common-vars.pri'
--- common-vars.pri	2015-09-28 14:43:07 +0000
+++ common-vars.pri	2016-08-24 14:26:52 +0000
@@ -14,7 +14,7 @@
 # Project version
 # remember to update debian/* files if you changes this
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 8.58
+PROJECT_VERSION = 8.59
 
 #-----------------------------------------------------------------------------
 # Library version

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-06 09:56:25 +0000
+++ debian/changelog	2016-08-24 14:26:52 +0000
@@ -1,3 +1,27 @@
+signon (8.59-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/control, debian/libsignon-qt{1,-dev}.install, debian/rules:
+    Don't build Qt4 packages.
+  * New upstream release
+    - Remove Qt4 support
+    - Lib: add more defines for SignOnUi password dialog
+    - signond: inform SignOnUI when a session finishes
+    - signond: add configure option to enable backup
+    - signond: minor code simplifications and cleanups
+    - plugins: don't use custom proxy implementation on Qt 5.5 and later
+    - RemotePluginProcess: don't use a thread for cancel
+    - Build: use qmake's DBUS_ADAPTORS to build the backup adaptor
+    - Build: support implicit out-of-tree builds
+    - Build: enable CI in gitlab
+    - Tests: add tst_signond using QtDBusMock
+    - Doc: don't build signond documentation
+    - Escape quotation marks in ConfigVersion.cmake.in files
+  * Merge from upstream
+    - Tests: fix AuthSession's "invocation of process() from another process"
+      test (LP: #1608822)
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 24 Aug 2016 16:40:59 +0300
+
 signon (8.58+16.04.20151106-0ubuntu1) xenial; urgency=medium
 
   [ Alberto Mardegan ]

=== modified file 'debian/control'
--- debian/control	2015-10-01 09:29:07 +0000
+++ debian/control	2016-08-24 14:26:52 +0000
@@ -9,13 +9,9 @@
                graphviz,
                libdbus-1-dev,
                libproxy-dev,
-               libqt4-dev (>= 4.6),
-               libqt4-sql-sqlite,
                libqt5sql5-sqlite,
                libssl-dev,
                pkg-config,
-               qt4-dev-tools,
-               qt4-qmake,
                qt5-qmake,
                qtbase5-dev,
                qtchooser,
@@ -26,27 +22,6 @@
 # upstream branch
 Vcs-Bzr: lp:signon
 
-Package: libsignon-qt1
-Architecture: any
-Section: libs
-Priority: optional
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Multi-Arch: same
-Description: Single Sign On framework
- Framework to provide credential storage and authentication service.
-
-Package: libsignon-qt-dev
-Architecture: any
-Priority: optional
-Section: libdevel
-Depends: libqt4-dev (>= 4.5),
-         libsignon-qt1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Development files for libsignon-qt
- Headers and static libraries for the libsignon-qt library.
-
 Package: libsignon-qt5-1
 Architecture: any
 Section: libs

=== removed file 'debian/libsignon-qt-dev.install'
--- debian/libsignon-qt-dev.install	2015-10-01 09:29:07 +0000
+++ debian/libsignon-qt-dev.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/include/signon-qt/SignOn/*
-usr/lib/*/cmake/SignOnQt4/
-usr/lib/*/libsignon-qt.so
-usr/lib/*/pkgconfig/libsignon-qt.pc

=== removed file 'debian/libsignon-qt1.install'
--- debian/libsignon-qt1.install	2014-08-25 10:49:45 +0000
+++ debian/libsignon-qt1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libsignon-qt.so.*

=== modified file 'debian/rules'
--- debian/rules	2015-01-28 15:29:02 +0000
+++ debian/rules	2016-08-24 14:26:52 +0000
@@ -9,34 +9,14 @@
 export NO_DOCS := no
 export QMAKE_LIBDIR=/usr/lib
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+export QT_SELECT=qt5
 
 override_dh_auto_configure:
-	mkdir -p build/qt4 build/qt5
-	QT_SELECT=qt4 \
-	dh_auto_configure -Bbuild/qt4 -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		BUILD_DIR=build/qt4 \
-		"QMAKE_CXXFLAGS=$(CFLAGS)" ../../signon.pro
-	QT_SELECT=qt5 \
-	dh_auto_configure -Bbuild/qt5 -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		BUILD_DIR=build/qt5 \
+	mkdir -p build
+	dh_auto_configure -Bbuild -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		BUILD_DIR=build \
 		CONFIG+=enable-p2p \
-		"QMAKE_CXXFLAGS=$(CFLAGS)" ../../signon.pro
-
-override_dh_auto_build:
-	QT_SELECT=qt4 dh_auto_build -Bbuild/qt4
-	QT_SELECT=qt5 dh_auto_build -Bbuild/qt5
-
-override_dh_auto_clean:
-	dh_auto_clean -Bbuild/qt4
-	dh_auto_clean -Bbuild/qt5
-
-override_dh_auto_install:
-	dh_auto_install -Bbuild/qt4 -plibsignon-qt1
-	dh_auto_install -Bbuild/qt4 -plibsignon-qt-dev
-	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4
-	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQtConfig.cmake debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQt4Config.cmake
-	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQtConfigVersion.cmake debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/SignOnQt4/SignOnQt4ConfigVersion.cmake
-	dh_auto_install -Bbuild/qt5
+		"QMAKE_CXXFLAGS=$(CFLAGS)" ../signon.pro
 
 override_dh_install:
 	rm -f debian/tmp/usr/include/signon-plugins/*example*.h
@@ -46,4 +26,4 @@
 	dh_install --fail-missing
 
 %:
-	dh $@ -Bbuild/qt5 --parallel --with migrations
+	dh $@ -Bbuild --parallel --with migrations

=== modified file 'doc/doc.pri'
--- doc/doc.pri	2013-02-28 09:56:31 +0000
+++ doc/doc.pri	2016-08-24 14:26:52 +0000
@@ -18,7 +18,6 @@
 # extra build targets for generating and cleaning documentation
 #-----------------------------------------------------------------------------
 DOC_INPUT += $${_PRO_FILE_PWD_}/doc/src
-DOC_INPUT += $${_PRO_FILE_PWD_}/src
 
 # target for generating documentation
 doctarget.target     = docs

=== modified file 'lib/SignOn/SignOnQt5ConfigVersion.cmake.in'
--- lib/SignOn/SignOnQt5ConfigVersion.cmake.in	2014-03-14 10:51:51 +0000
+++ lib/SignOn/SignOnQt5ConfigVersion.cmake.in	2016-08-24 14:26:52 +0000
@@ -1,10 +1,10 @@
 set(PACKAGE_VERSION $${PROJECT_VERSION})
 
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+if(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+else(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
    set(PACKAGE_VERSION_COMPATIBLE TRUE)
-   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+   if( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
       set(PACKAGE_VERSION_EXACT TRUE)
-   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
\ No newline at end of file
+   endif( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
+endif(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )

=== removed file 'lib/SignOn/SignOnQtConfig.cmake.in'
--- lib/SignOn/SignOnQtConfig.cmake.in	2014-02-13 14:18:31 +0000
+++ lib/SignOn/SignOnQtConfig.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#  SIGNONQT_INCLUDE_DIRS - The libsignon-qt include directories
-#  SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
-#  SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt
-
-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
-set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a)
-set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})
\ No newline at end of file

=== removed file 'lib/SignOn/SignOnQtConfigVersion.cmake.in'
--- lib/SignOn/SignOnQtConfigVersion.cmake.in	2014-02-13 14:18:31 +0000
+++ lib/SignOn/SignOnQtConfigVersion.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-set(PACKAGE_VERSION $${PROJECT_VERSION})
-
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-   set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-   set(PACKAGE_VERSION_COMPATIBLE TRUE)
-   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-      set(PACKAGE_VERSION_EXACT TRUE)
-   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
\ No newline at end of file

=== modified file 'lib/SignOn/async-dbus-proxy.cpp'
--- lib/SignOn/async-dbus-proxy.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/async-dbus-proxy.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/async-dbus-proxy.h'
--- lib/SignOn/async-dbus-proxy.h	2013-07-29 13:52:21 +0000
+++ lib/SignOn/async-dbus-proxy.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/authservice.cpp'
--- lib/SignOn/authservice.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/authservice.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011-2015 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/authservice.h'
--- lib/SignOn/authservice.h	2012-04-18 13:03:21 +0000
+++ lib/SignOn/authservice.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/authserviceimpl.cpp'
--- lib/SignOn/authserviceimpl.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/authserviceimpl.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/authserviceimpl.h'
--- lib/SignOn/authserviceimpl.h	2013-07-29 09:23:36 +0000
+++ lib/SignOn/authserviceimpl.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/authsession.cpp'
--- lib/SignOn/authsession.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/authsession.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011-2015 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/authsession.h'
--- lib/SignOn/authsession.h	2015-06-12 11:11:06 +0000
+++ lib/SignOn/authsession.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011-2015 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/authsessionimpl.cpp'
--- lib/SignOn/authsessionimpl.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/authsessionimpl.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/authsessionimpl.h'
--- lib/SignOn/authsessionimpl.h	2013-07-29 11:42:18 +0000
+++ lib/SignOn/authsessionimpl.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/connection-manager.cpp'
--- lib/SignOn/connection-manager.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/connection-manager.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -30,9 +30,7 @@
 #include <QDBusPendingCallWatcher>
 #include <QPointer>
 #include <QProcessEnvironment>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QStandardPaths>
-#endif
 
 using namespace SignOn;
 
@@ -86,12 +84,8 @@
         return SocketConnectionUnavailable;
     }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     QString runtimeDir =
         QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
-#else
-    QString runtimeDir = environment.value(QLatin1String("XDG_RUNTIME_DIR"));
-#endif
     if (runtimeDir.isEmpty()) return SocketConnectionUnavailable;
 
     QString socketFileName =

=== modified file 'lib/SignOn/connection-manager.h'
--- lib/SignOn/connection-manager.h	2013-07-29 13:52:21 +0000
+++ lib/SignOn/connection-manager.h	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/dbusinterface.cpp'
--- lib/SignOn/dbusinterface.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/dbusinterface.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
- * Copyright (C) 2011-2015 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/dbusinterface.h'
--- lib/SignOn/dbusinterface.h	2012-04-18 13:06:27 +0000
+++ lib/SignOn/dbusinterface.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/debug.cpp'
--- lib/SignOn/debug.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/debug.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2015-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/debug.h'
--- lib/SignOn/debug.h	2015-10-27 09:58:39 +0000
+++ lib/SignOn/debug.h	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2015-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/identity.cpp'
--- lib/SignOn/identity.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/identity.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011-2015 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/identity.h'
--- lib/SignOn/identity.h	2012-04-18 13:06:27 +0000
+++ lib/SignOn/identity.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/identityimpl.cpp'
--- lib/SignOn/identityimpl.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/identityimpl.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/identityimpl.h'
--- lib/SignOn/identityimpl.h	2013-09-06 06:33:01 +0000
+++ lib/SignOn/identityimpl.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/identityinfo.cpp'
--- lib/SignOn/identityinfo.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/identityinfo.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011-2015 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/identityinfo.h'
--- lib/SignOn/identityinfo.h	2013-04-10 09:55:32 +0000
+++ lib/SignOn/identityinfo.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/identityinfoimpl.cpp'
--- lib/SignOn/identityinfoimpl.cpp	2015-10-27 09:58:39 +0000
+++ lib/SignOn/identityinfoimpl.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011-2015 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/identityinfoimpl.h'
--- lib/SignOn/identityinfoimpl.h	2013-11-22 14:46:01 +0000
+++ lib/SignOn/identityinfoimpl.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/SignOn/libsignon-qt.pri'
--- lib/SignOn/libsignon-qt.pri	2015-10-27 09:58:39 +0000
+++ lib/SignOn/libsignon-qt.pri	2016-08-24 14:26:52 +0000
@@ -2,11 +2,7 @@
 include( ../../common-vars.pri )
 TEMPLATE = lib
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    TARGET = signon-qt5
-} else {
-    TARGET = signon-qt
-}
+TARGET = signon-qt5
 
 # Input
 public_headers += \

=== modified file 'lib/SignOn/libsignoncommon.h'
--- lib/SignOn/libsignoncommon.h	2015-10-27 09:58:39 +0000
+++ lib/SignOn/libsignoncommon.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2015-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/sessiondata.h'
--- lib/SignOn/sessiondata.h	2012-10-25 15:54:22 +0000
+++ lib/SignOn/sessiondata.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/signon.h'
--- lib/SignOn/signon.h	2012-04-18 13:06:27 +0000
+++ lib/SignOn/signon.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/SignOn/signonerror.h'
--- lib/SignOn/signonerror.h	2013-01-21 13:50:42 +0000
+++ lib/SignOn/signonerror.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'lib/plugins/SignOn/authpluginif.h'
--- lib/plugins/SignOn/authpluginif.h	2012-04-18 13:06:27 +0000
+++ lib/plugins/SignOn/authpluginif.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/plugins/SignOn/signonplugincommon.h'
--- lib/plugins/SignOn/signonplugincommon.h	2012-04-18 13:06:27 +0000
+++ lib/plugins/SignOn/signonplugincommon.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/plugins/SignOn/uisessiondata.h'
--- lib/plugins/SignOn/uisessiondata.h	2015-09-28 11:55:23 +0000
+++ lib/plugins/SignOn/uisessiondata.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/plugins/SignOn/uisessiondata_priv.h'
--- lib/plugins/SignOn/uisessiondata_priv.h	2014-10-10 13:11:26 +0000
+++ lib/plugins/SignOn/uisessiondata_priv.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -26,11 +27,20 @@
 #define SSOUI_KEY_CAPTION         QLatin1String("Caption")
 #define SSOUI_KEY_MESSAGEID       QLatin1String("QueryMessageId")
 #define SSOUI_KEY_MESSAGE         QLatin1String("QueryMessage")
+#define SSOUI_KEY_ERROR_MESSAGE   QLatin1String("ErrorMessage")
 #define SSOUI_KEY_QUERYUSERNAME   QLatin1String("QueryUserName")
 #define SSOUI_KEY_USERNAME        QLatin1String("UserName")
+#define SSOUI_KEY_USERNAME_TEXT   QLatin1String("UserNameText")
 #define SSOUI_KEY_QUERYPASSWORD   QLatin1String("QueryPassword")
 #define SSOUI_KEY_PASSWORD        QLatin1String("Secret")
+#define SSOUI_KEY_PASSWORD_TEXT   QLatin1String("PasswordText")
 #define SSOUI_KEY_REMEMBER        QLatin1String("RememberPassword")
+/* 2 factor authentication field */
+#define SSOUI_KEY_QUERY2FA        QLatin1String("Query2fa")
+#define SSOUI_KEY_2FA             QLatin1String("2fa")
+#define SSOUI_KEY_2FA_TEXT        QLatin1String("2faText")
+/* Text for the login button */
+#define SSOUI_KEY_LOGIN_TEXT      QLatin1String("LoginText")
 #define SSOUI_KEY_SHOWREALM       QLatin1String("ShowRealm")
 #define SSOUI_KEY_REALM           QLatin1String("Realm")
 #define SSOUI_KEY_NETWORKPROXY    QLatin1String("NetworkProxy")

=== modified file 'lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp'
--- lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp	2015-04-23 11:34:19 +0000
+++ lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
@@ -41,7 +41,8 @@
     m_readChannel(readChannel),
     m_writeChannel(writeChannel),
     m_readNotifier(0),
-    m_blobSize(-1)
+    m_blobSize(-1),
+    m_isReading(false)
 {
 }
 
@@ -73,9 +74,9 @@
 
 void BlobIOHandler::setReadNotificationEnabled(bool enabled)
 {
+    m_isReading = enabled;
     if (enabled) {
         if (m_readNotifier != 0) {
-            m_readNotifier->setEnabled(true);
             connect(m_readNotifier, SIGNAL(activated(int)),
                     this, SLOT(readBlob()));
         } else {
@@ -86,7 +87,6 @@
         if (m_readNotifier != 0) {
             disconnect(m_readNotifier, SIGNAL(activated(int)),
                        this, SLOT(readBlob()));
-            m_readNotifier->setEnabled(false);
         } else {
             disconnect(m_readChannel, SIGNAL(readyRead()),
                        this, SLOT(readBlob()));

=== modified file 'lib/plugins/signon-plugins-common/SignOn/blobiohandler.h'
--- lib/plugins/signon-plugins-common/SignOn/blobiohandler.h	2012-04-18 13:06:27 +0000
+++ lib/plugins/signon-plugins-common/SignOn/blobiohandler.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
@@ -45,6 +45,7 @@
     void receiveData(int expectedDataSize);
 
     void setReadChannelSocketNotifier(QSocketNotifier *notifier);
+    bool isReading() const { return m_isReading; }
 
 public Q_SLOTS:
     void readBlob();
@@ -66,6 +67,7 @@
     QByteArray m_blobBuffer;
     QSocketNotifier *m_readNotifier;
     int m_blobSize;
+    bool m_isReading;
 };
 
 }

=== modified file 'lib/plugins/signon-plugins-common/SignOn/ipc.h'
--- lib/plugins/signon-plugins-common/SignOn/ipc.h	2012-04-18 13:06:27 +0000
+++ lib/plugins/signon-plugins-common/SignOn/ipc.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/plugins/signon-plugins-common/signon-plugins-common.pc.in'
--- lib/plugins/signon-plugins-common/signon-plugins-common.pc.in	2013-03-19 08:37:03 +0000
+++ lib/plugins/signon-plugins-common/signon-plugins-common.pc.in	2016-08-24 14:26:52 +0000
@@ -6,5 +6,5 @@
 Name: signon-plugins-common
 Description: SignonPluginsCommon
 Version: $$PROJECT_VERSION
-Libs.private: -L/usr/lib -l$${LIBQTCORE}
+Libs.private: -L/usr/lib -lQt5Core
 Cflags:  -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn

=== modified file 'lib/plugins/signon-plugins.pc.in'
--- lib/plugins/signon-plugins.pc.in	2013-03-19 08:37:03 +0000
+++ lib/plugins/signon-plugins.pc.in	2016-08-24 14:26:52 +0000
@@ -8,6 +8,6 @@
 Description: SignonPlugins
 Version: $$PROJECT_VERSION
 Requires: $${LIBSIGNON}
-Libs.private: -L/usr/lib -l$${LIBQTCORE}
+Libs.private: -L/usr/lib -lQt5Core
 Cflags:  -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn
 Libs: -lsignon-plugins

=== modified file 'lib/signond/SignOn/SignOnExtension.pc.in'
--- lib/signond/SignOn/SignOnExtension.pc.in	2013-04-26 10:54:33 +0000
+++ lib/signond/SignOn/SignOnExtension.pc.in	2016-08-24 14:26:52 +0000
@@ -7,6 +7,6 @@
 Name: SignOnExtension
 Description: SignOn extension development 
 Version: $$PROJECT_VERSION
-Requires: $${LIBQTCORE}
+Requires: Qt5Core
 Libs: -L${libdir} -lsignon-extension
 Cflags: -I${includedir}/signon-extension

=== modified file 'lib/signond/SignOn/abstract-access-control-manager.cpp'
--- lib/signond/SignOn/abstract-access-control-manager.cpp	2013-08-20 08:01:43 +0000
+++ lib/signond/SignOn/abstract-access-control-manager.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Elena Reshetova <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>

=== modified file 'lib/signond/SignOn/abstract-access-control-manager.h'
--- lib/signond/SignOn/abstract-access-control-manager.h	2013-08-20 08:01:43 +0000
+++ lib/signond/SignOn/abstract-access-control-manager.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Elena Reshetova <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>

=== modified file 'lib/signond/SignOn/abstract-crypto-manager.cpp'
--- lib/signond/SignOn/abstract-crypto-manager.cpp	2011-11-09 15:46:53 +0000
+++ lib/signond/SignOn/abstract-crypto-manager.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/abstract-crypto-manager.h'
--- lib/signond/SignOn/abstract-crypto-manager.h	2011-11-09 15:46:53 +0000
+++ lib/signond/SignOn/abstract-crypto-manager.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/abstract-key-authorizer.cpp'
--- lib/signond/SignOn/abstract-key-authorizer.cpp	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/abstract-key-authorizer.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/abstract-key-authorizer.h'
--- lib/signond/SignOn/abstract-key-authorizer.h	2012-06-08 12:49:56 +0000
+++ lib/signond/SignOn/abstract-key-authorizer.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/abstract-key-manager.cpp'
--- lib/signond/SignOn/abstract-key-manager.cpp	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/abstract-key-manager.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/abstract-key-manager.h'
--- lib/signond/SignOn/abstract-key-manager.h	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/abstract-key-manager.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/abstract-secrets-storage.cpp'
--- lib/signond/SignOn/abstract-secrets-storage.cpp	2011-11-16 10:02:41 +0000
+++ lib/signond/SignOn/abstract-secrets-storage.cpp	2016-08-24 14:26:52 +0000
@@ -3,6 +3,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/abstract-secrets-storage.h'
--- lib/signond/SignOn/abstract-secrets-storage.h	2012-04-18 13:03:21 +0000
+++ lib/signond/SignOn/abstract-secrets-storage.h	2016-08-24 14:26:52 +0000
@@ -3,6 +3,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/debug.cpp'
--- lib/signond/SignOn/debug.cpp	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/debug.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/debug.h'
--- lib/signond/SignOn/debug.h	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/debug.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/export.h'
--- lib/signond/SignOn/export.h	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/export.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/extension-interface.cpp'
--- lib/signond/SignOn/extension-interface.cpp	2011-12-23 07:46:09 +0000
+++ lib/signond/SignOn/extension-interface.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/extension-interface.h'
--- lib/signond/SignOn/extension-interface.h	2012-04-18 13:03:21 +0000
+++ lib/signond/SignOn/extension-interface.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010-2011 Nokia Corporation.
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  * Copyright (C) 2011 Intel Corporation.
  *
  * Contact: Alberto Mardegan <[e-mail]>

=== modified file 'lib/signond/SignOn/key-handler.cpp'
--- lib/signond/SignOn/key-handler.cpp	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/key-handler.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/key-handler.h'
--- lib/signond/SignOn/key-handler.h	2012-06-08 12:49:56 +0000
+++ lib/signond/SignOn/key-handler.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/misc.cpp'
--- lib/signond/SignOn/misc.cpp	2012-06-08 12:49:56 +0000
+++ lib/signond/SignOn/misc.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/SignOn/misc.h'
--- lib/signond/SignOn/misc.h	2012-04-18 13:06:27 +0000
+++ lib/signond/SignOn/misc.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'lib/signond/signoncommon.h'
--- lib/signond/signoncommon.h	2013-07-29 13:52:21 +0000
+++ lib/signond/signoncommon.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -105,7 +105,7 @@
     SIGNOND_STRING(SIGNOND_ERR_PREFIX "InternalCommunication")
 
 #define SIGNOND_PERMISSION_DENIED_ERR_STR \
-    SIGNOND_STRING("Client has insuficient permissions to access the service.")
+    SIGNOND_STRING("Client has insufficient permissions to access the service.")
 #define SIGNOND_PERMISSION_DENIED_ERR_NAME \
     SIGNOND_STRING(SIGNOND_ERR_PREFIX "PermissionDenied")
 

=== modified file 'signon.pro'
--- signon.pro	2013-10-30 11:51:34 +0000
+++ signon.pro	2016-08-24 14:26:52 +0000
@@ -9,7 +9,4 @@
 
 include( doc/doc.pri )
 
-DISTNAME = $${PROJECT_NAME}-$${PROJECT_VERSION}
-dist.commands = "git archive --format=tar --prefix=$${DISTNAME}/ HEAD | bzip2 -9 > $${DISTNAME}.tar.bz2"
-QMAKE_EXTRA_TARGETS += dist
 # End of File

=== modified file 'src/extensions/cryptsetup/cryptsetup-plugin.cpp'
--- src/extensions/cryptsetup/cryptsetup-plugin.cpp	2012-11-06 10:10:28 +0000
+++ src/extensions/cryptsetup/cryptsetup-plugin.cpp	2016-08-24 14:26:52 +0000
@@ -40,7 +40,3 @@
     qDebug() << Q_FUNC_INFO;
     return new CryptoManager(parent);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(cryptsetup, CryptsetupPlugin);
-#endif

=== modified file 'src/extensions/cryptsetup/cryptsetup-plugin.h'
--- src/extensions/cryptsetup/cryptsetup-plugin.h	2012-11-06 10:10:28 +0000
+++ src/extensions/cryptsetup/cryptsetup-plugin.h	2016-08-24 14:26:52 +0000
@@ -32,9 +32,7 @@
 {
     Q_OBJECT
     Q_INTERFACES(SignOn::ExtensionInterface3)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SingleSignOn.ExtensionInterface/3.0")
-#endif
 
 public:
     CryptsetupPlugin();

=== modified file 'src/plugins/example/exampledata.h'
--- src/plugins/example/exampledata.h	2012-04-18 13:06:27 +0000
+++ src/plugins/example/exampledata.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/example/exampleplugin.cpp'
--- src/plugins/example/exampleplugin.cpp	2012-04-18 13:06:27 +0000
+++ src/plugins/example/exampleplugin.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/example/exampleplugin.h'
--- src/plugins/example/exampleplugin.h	2012-04-18 13:06:27 +0000
+++ src/plugins/example/exampleplugin.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/password/passwordplugin.cpp'
--- src/plugins/password/passwordplugin.cpp	2012-04-18 13:06:27 +0000
+++ src/plugins/password/passwordplugin.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/password/passwordplugin.h'
--- src/plugins/password/passwordplugin.h	2012-04-18 13:06:27 +0000
+++ src/plugins/password/passwordplugin.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/test/ssotest2data.h'
--- src/plugins/test/ssotest2data.h	2012-04-24 11:57:25 +0000
+++ src/plugins/test/ssotest2data.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/test/ssotest2plugin.cpp'
--- src/plugins/test/ssotest2plugin.cpp	2013-03-01 06:57:55 +0000
+++ src/plugins/test/ssotest2plugin.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/test/ssotest2plugin.h'
--- src/plugins/test/ssotest2plugin.h	2012-04-24 11:57:25 +0000
+++ src/plugins/test/ssotest2plugin.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/plugins/test/ssotestplugin.cpp'
--- src/plugins/test/ssotestplugin.cpp	2012-06-08 12:49:56 +0000
+++ src/plugins/test/ssotestplugin.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -32,9 +33,6 @@
 
 namespace SsoTestPluginNS {
 
-static QMutex mutex;
-static bool is_canceled = false;
-
 SsoTestPlugin::SsoTestPlugin(QObject *parent):
     AuthPluginInterface(parent)
 {
@@ -47,6 +45,8 @@
     m_mechanisms += QLatin1String("BLOB");
 
     qRegisterMetaType<SignOn::SessionData>("SignOn::SessionData");
+
+    QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(execProcess()));
 }
 
 SsoTestPlugin::~SsoTestPlugin()
@@ -55,9 +55,10 @@
 
 void SsoTestPlugin::cancel()
 {
-    TRACE();
-    QMutexLocker locker(&mutex);
-    is_canceled = true;
+    TRACE() << "Operation is canceled";
+    emit error(Error(Error::SessionCanceled,
+                     QLatin1String("The operation is canceled")));
+    m_timer.stop();
 }
 
 /*
@@ -73,37 +74,28 @@
         return;
     }
 
-    QMetaObject::invokeMethod(this,
-                              "execProcess",
-                              Qt::QueuedConnection,
-                              Q_ARG(SignOn::SessionData, inData),
-                              Q_ARG(QString, mechanism));
+    m_data = inData;
+    m_mechanism = mechanism;
+    m_statusCounter = 0;
+
+    m_timer.setInterval(100);
+    m_timer.setSingleShot(false);
+    m_timer.start();
 }
 
-void SsoTestPlugin::execProcess(const SignOn::SessionData &inData,
-                                const QString &mechanism)
+void SsoTestPlugin::execProcess()
 {
-    SignOn::SessionData outData(inData);
+    m_statusCounter++;
+    emit statusChanged(PLUGIN_STATE_WAITING,
+                       QLatin1String("hello from the test plugin"));
+    if (m_statusCounter < 10) return;
+
+    m_timer.stop();
+
+    SignOn::SessionData outData(m_data);
     outData.setRealm("testRealm_after_test");
 
-    for (int i = 0; i < 10; i++)
-        if (!is_canceled) {
-            TRACE() << "Signal is sent";
-            emit statusChanged(PLUGIN_STATE_WAITING,
-                               QLatin1String("hello from the test plugin"));
-            usleep(0.1 * 1000000);
-        }
-
-    if (is_canceled) {
-        TRACE() << "Operation is canceled";
-        QMutexLocker locker(&mutex);
-        is_canceled = false;
-        emit error(Error(Error::SessionCanceled,
-                         QLatin1String("The operation is canceled")));
-        return;
-    }
-
-    if (mechanism == QLatin1String("BLOB")) {
+    if (m_mechanism == QLatin1String("BLOB")) {
         emit result(outData);
         return;
     }
@@ -111,12 +103,12 @@
     foreach(QString key, outData.propertyNames())
         TRACE() << key << ": " << outData.getProperty(key);
 
-    if (mechanism == QLatin1String("mech1")) {
+    if (m_mechanism == QLatin1String("mech1")) {
         emit result(outData);
         return;
     }
 
-    if (mechanism == QLatin1String("mech2")) {
+    if (m_mechanism == QLatin1String("mech2")) {
         SignOn::UiSessionData data;
         data.setQueryPassword(true);
         emit userActionRequired(data);

=== modified file 'src/plugins/test/ssotestplugin.h'
--- src/plugins/test/ssotestplugin.h	2012-04-24 11:57:25 +0000
+++ src/plugins/test/ssotestplugin.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -50,10 +51,13 @@
 private:
     QString m_type;
     QStringList m_mechanisms;
+    SignOn::SessionData m_data;
+    QString m_mechanism;
+    QTimer m_timer;
+    int m_statusCounter;
 
 private Q_SLOTS:
-    void execProcess(const SignOn::SessionData &inData,
-                     const QString &mechanism);
+    void execProcess();
 };
 
 } //namespace SsoTestPluginNS

=== modified file 'src/remotepluginprocess/debug.cpp'
--- src/remotepluginprocess/debug.cpp	2012-04-18 13:06:27 +0000
+++ src/remotepluginprocess/debug.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/remotepluginprocess/debug.h'
--- src/remotepluginprocess/debug.h	2012-10-02 11:24:30 +0000
+++ src/remotepluginprocess/debug.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/remotepluginprocess/main.cpp'
--- src/remotepluginprocess/main.cpp	2013-08-20 08:19:54 +0000
+++ src/remotepluginprocess/main.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -31,8 +32,6 @@
 #include <syslog.h>
 }
 
-#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
-
 #include "debug.h"
 #include "remotepluginprocess.h"
 
@@ -42,8 +41,11 @@
 
 RemotePluginProcess *process = NULL;
 
-void messageHandler(QtMsgType type, const char *msg)
+void messageHandler(QtMsgType type, const QMessageLogContext &context,
+                    const QString & msg)
 {
+    Q_UNUSED(context);
+
     if (debugLevel < 2) {
         if (type == QtDebugMsg) return;
         if (debugLevel < 1 && type == QtWarningMsg) return;
@@ -59,13 +61,13 @@
     default: priority = LOG_INFO; break;
     }
 
-    syslog(priority, "%s", msg);
+    syslog(priority, "%s", msg.toUtf8().constData());
 }
 
 int main(int argc, char *argv[])
 {
     openlog(NULL, LOG_CONS | LOG_PID, LOG_DAEMON);
-    qInstallMsgHandler(messageHandler);
+    qInstallMessageHandler(messageHandler);
     debugInit();
 
     TRACE() << "handler:" << (void *)messageHandler;

=== modified file 'src/remotepluginprocess/my-network-proxy-factory.h'
--- src/remotepluginprocess/my-network-proxy-factory.h	2012-09-17 07:32:20 +0000
+++ src/remotepluginprocess/my-network-proxy-factory.h	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/remotepluginprocess/remotepluginprocess.cpp'
--- src/remotepluginprocess/remotepluginprocess.cpp	2012-09-17 07:32:20 +0000
+++ src/remotepluginprocess/remotepluginprocess.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -40,12 +41,11 @@
 
 namespace RemotePluginProcessNS {
 
-static CancelEventThread *cancelThread = NULL;
-
 /* ---------------------- RemotePluginProcess ---------------------- */
 
 RemotePluginProcess::RemotePluginProcess(QObject *parent):
-    QObject(parent)
+    QObject(parent),
+    m_currentOperation(PLUGIN_OP_STOP)
 {
     m_plugin = NULL;
     m_readnotifier = NULL;
@@ -60,12 +60,6 @@
     delete m_plugin;
     delete m_readnotifier;
     delete m_errnotifier;
-
-    if (cancelThread) {
-        cancelThread->quit();
-        cancelThread->wait();
-        delete cancelThread;
-    }
 }
 
 RemotePluginProcess *
@@ -159,11 +153,6 @@
     connect(m_errnotifier, SIGNAL(activated(int)),
             this, SIGNAL(processStopped()));
 
-    if (!cancelThread)
-        cancelThread = new CancelEventThread(m_plugin);
-
-    TRACE() << "cancel thread created";
-
     m_blobIOHandler = new BlobIOHandler(&m_inFile, &m_outFile, this);
 
     connect(m_blobIOHandler,
@@ -201,12 +190,10 @@
     error(
         Error(Error::InternalServer,
         QLatin1String("Failed to I/O session data to/from the signon daemon.")));
-    connect(m_readnotifier, SIGNAL(activated(int)), this, SLOT(startTask()));
 }
 
 void RemotePluginProcess::result(const SignOn::SessionData &data)
 {
-    disableCancelThread();
     QDataStream out(&m_outFile);
     QVariantMap resultDataMap;
 
@@ -237,8 +224,6 @@
 
 void RemotePluginProcess::error(const SignOn::Error &err)
 {
-    disableCancelThread();
-
     QDataStream out(&m_outFile);
 
     out << (quint32)PLUGIN_RESPONSE_ERROR;
@@ -252,7 +237,6 @@
 void RemotePluginProcess::userActionRequired(const SignOn::UiSessionData &data)
 {
     TRACE();
-    disableCancelThread();
 
     QDataStream out(&m_outFile);
     QVariantMap resultDataMap;
@@ -268,7 +252,6 @@
 void RemotePluginProcess::refreshed(const SignOn::UiSessionData &data)
 {
     TRACE();
-    disableCancelThread();
 
     QDataStream out(&m_outFile);
     QVariantMap resultDataMap;
@@ -276,8 +259,6 @@
     foreach(QString key, data.propertyNames())
         resultDataMap[key] = data.getProperty(key);
 
-    m_readnotifier->setEnabled(true);
-
     out << (quint32)PLUGIN_RESPONSE_REFRESHED;
 
     m_blobIOHandler->sendData(resultDataMap);
@@ -330,14 +311,11 @@
 {
     QDataStream in(&m_inFile);
 
-
     in >> m_currentMechanism;
 
     int processBlobSize = -1;
     in >> processBlobSize;
 
-    disconnect(m_readnotifier, SIGNAL(activated(int)), this, SLOT(startTask()));
-
     m_currentOperation = PLUGIN_OP_PROCESS;
     m_blobIOHandler->receiveData(processBlobSize);
 }
@@ -348,8 +326,6 @@
     int processBlobSize = -1;
     in >> processBlobSize;
 
-    disconnect(m_readnotifier, SIGNAL(activated(int)), this, SLOT(startTask()));
-
     m_currentOperation = PLUGIN_OP_PROCESS_UI;
     m_blobIOHandler->receiveData(processBlobSize);
 }
@@ -360,17 +336,12 @@
     int processBlobSize = -1;
     in >> processBlobSize;
 
-    disconnect(m_readnotifier, SIGNAL(activated(int)), this, SLOT(startTask()));
-
     m_currentOperation = PLUGIN_OP_REFRESH;
     m_blobIOHandler->receiveData(processBlobSize);
 }
 
 void RemotePluginProcess::sessionDataReceived(const QVariantMap &sessionDataMap)
 {
-    enableCancelThread();
-    TRACE() << "The cancel thread is started";
-
     if (m_currentOperation == PLUGIN_OP_PROCESS) {
         SessionData inData(sessionDataMap);
         m_plugin->process(inData, m_currentMechanism);
@@ -391,81 +362,33 @@
     }
 
     m_currentOperation = PLUGIN_OP_STOP;
-    connect(m_readnotifier, SIGNAL(activated(int)), this, SLOT(startTask()));
-}
-
-void RemotePluginProcess::enableCancelThread()
-{
-    QEventLoop loop;
-    connect(cancelThread,
-            SIGNAL(started()),
-            &loop,
-            SLOT(quit()));
-
-    m_readnotifier->setEnabled(false);
-    QTimer::singleShot(0.5*1000, &loop, SLOT(quit()));
-    cancelThread->start();
-    loop.exec();
-    QThread::yieldCurrentThread();
-}
-
-void RemotePluginProcess::disableCancelThread()
-{
-    if (!cancelThread->isRunning())
-        return;
-
-    /**
-     * Sort of terrible workaround which
-     * I do not know how to fix: the thread
-     * could hang up during wait up without
-     * these loops and sleeps
-     */
-    cancelThread->quit();
-
-    TRACE() << "Before the isFinished loop ";
-
-    int i = 0;
-    while (!cancelThread->isFinished()) {
-        cancelThread->quit();
-        TRACE() << "Internal iteration " << i++;
-        usleep(0.005 * 1000000);
-    }
-
-    if (!cancelThread->wait(500)) {
-        BLAME() << "Cannot disable cancel thread";
-        int i;
-        for (i = 0; i < 5; i++) {
-            usleep(0.01 * 1000000);
-            if (cancelThread->wait(500))
-                break;
-        }
-
-        if (i == 5) {
-            BLAME() << "Cannot do anything with cancel thread";
-            cancelThread->terminate();
-            cancelThread->wait();
-        }
-    }
-
-    m_readnotifier->setEnabled(true);
 }
 
 void RemotePluginProcess::startTask()
 {
+    if (m_blobIOHandler->isReading()) {
+        /* A data blob is being read; there's nothing for us here */
+        return;
+    }
+
     quint32 opcode = PLUGIN_OP_STOP;
     bool is_stopped = false;
 
     QDataStream in(&m_inFile);
     in >> opcode;
 
+    /* If the plugin is busy, the only allowed action here is canceling */
+    if (m_currentOperation != PLUGIN_OP_STOP && opcode != PLUGIN_OP_CANCEL) {
+        qCritical() << "Operation requested while plugin busy! - code" <<
+            opcode;
+        m_plugin->abort();
+        Q_EMIT processStopped();
+        return;
+    }
+
     switch (opcode) {
     case PLUGIN_OP_CANCEL:
-        {
-            m_plugin->cancel(); break;
-            //still do not have clear understanding
-            //of the cancelation-stop mechanism
-            //is_stopped = true;
-        }
+        m_plugin->cancel();
         break;
     case PLUGIN_OP_TYPE:
         type();
@@ -507,56 +430,5 @@
     }
 }
 
-CancelEventThread::CancelEventThread(AuthPluginInterface *plugin)
-{
-    m_plugin = plugin;
-    m_cancelNotifier = 0;
-}
-
-CancelEventThread::~CancelEventThread()
-{
-    delete m_cancelNotifier;
-}
-
-void CancelEventThread::run()
-{
-    if (!m_cancelNotifier) {
-        m_cancelNotifier = new QSocketNotifier(STDIN_FILENO,
-                                               QSocketNotifier::Read);
-        connect(m_cancelNotifier, SIGNAL(activated(int)),
-                this, SLOT(cancel()), Qt::DirectConnection);
-    }
-
-    m_cancelNotifier->setEnabled(true);
-    exec();
-    m_cancelNotifier->setEnabled(false);
-}
-
-void CancelEventThread::cancel()
-{
-    char buf[4];
-    memset(buf, 0, 4);
-    int n = 0;
-
-    if (!(n = read(STDIN_FILENO, buf, 4))) {
-        qCritical() << "Cannot read from cancel socket";
-        return;
-    }
-
-    /*
-     * Read the actual value of
-     * */
-    QByteArray ba(buf, 4);
-    quint32 opcode;
-    QDataStream ds(ba);
-    ds >> opcode;
-
-    if (opcode != PLUGIN_OP_CANCEL)
-        qCritical() << "wrong operation code: breakage of remotepluginprocess "
-            "threads synchronization: " << opcode;
-
-    m_plugin->cancel();
-}
-
 } //namespace RemotePluginProcessNS
 

=== modified file 'src/remotepluginprocess/remotepluginprocess.h'
--- src/remotepluginprocess/remotepluginprocess.h	2012-04-18 13:06:27 +0000
+++ src/remotepluginprocess/remotepluginprocess.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -67,28 +68,6 @@
 namespace RemotePluginProcessNS {
 
 /*!
- * @class CancelEventThread
- * Thread to enable cancel functionality.
- */
-class CancelEventThread: public QThread
-{
-    Q_OBJECT
-
-public:
-    CancelEventThread(AuthPluginInterface *plugin);
-    ~CancelEventThread();
-
-    void run();
-
-public Q_SLOTS:
-    void cancel();
-
-private:
-    AuthPluginInterface *m_plugin;
-    QSocketNotifier *m_cancelNotifier;
-};
-
-/*!
  * @class RemotePluginProcess
  * Class to execute plugin process.
  */
@@ -136,9 +115,6 @@
     void userActionFinished();
     void refresh();
 
-    void enableCancelThread();
-    void disableCancelThread();
-
 private Q_SLOTS:
     void result(const SignOn::SessionData &data);
     void store(const SignOn::SessionData &data);

=== modified file 'src/remotepluginprocess/remotepluginprocess.pro'
--- src/remotepluginprocess/remotepluginprocess.pro	2015-10-27 09:58:39 +0000
+++ src/remotepluginprocess/remotepluginprocess.pro	2016-08-24 14:26:52 +0000
@@ -26,7 +26,7 @@
     build_all \
     link_pkgconfig
 
-system(pkg-config --exists libproxy-1.0) {
+lessThan(QT_VERSION, "5.5.0"):system(pkg-config --exists libproxy-1.0) {
     DEFINES += HAVE_LIBPROXY
     PKGCONFIG += libproxy-1.0
     SOURCES += my-network-proxy-factory.cpp

=== modified file 'src/signond/accesscontrolmanagerhelper.cpp'
--- src/signond/accesscontrolmanagerhelper.cpp	2014-11-14 10:45:01 +0000
+++ src/signond/accesscontrolmanagerhelper.cpp	2016-08-24 14:26:52 +0000
@@ -4,9 +4,8 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Elena Reshetova <[e-mail]>
  *

=== modified file 'src/signond/accesscontrolmanagerhelper.h'
--- src/signond/accesscontrolmanagerhelper.h	2013-08-20 08:01:44 +0000
+++ src/signond/accesscontrolmanagerhelper.h	2016-08-24 14:26:52 +0000
@@ -4,9 +4,8 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Elena Reshetova <[e-mail]>
  *

=== added file 'src/signond/backup.cpp'
--- src/signond/backup.cpp	1970-01-01 00:00:00 +0000
+++ src/signond/backup.cpp	2016-08-24 14:26:52 +0000
@@ -0,0 +1,343 @@
+/*
+ * This file is part of signon
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2013-2016 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 <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QDBusConnection>
+
+#include "SignOn/misc.h"
+
+#include "backup.h"
+#include "backup_adaptor.h"
+#include "credentialsaccessmanager.h"
+#include "signond-common.h"
+
+#define BACKUP_DIR_NAME() \
+    (QDir::separator() + QLatin1String("backup"))
+
+using namespace SignOn;
+
+namespace SignonDaemonNS {
+
+Backup::Backup(CredentialsAccessManager *cam, bool backupMode,
+               QObject *parent):
+    QObject(parent),
+    m_cam(cam),
+    m_backup(backupMode)
+{
+    QDBusConnection sessionConnection = QDBusConnection::sessionBus();
+
+    QDBusConnection::RegisterOptions registerSessionOptions =
+        QDBusConnection::ExportAdaptors;
+
+    (void)new BackupclientAdaptor(this);
+
+    if (!sessionConnection.registerObject(SIGNOND_DAEMON_OBJECTPATH
+                                          + QLatin1String("/Backup"),
+                                          this, registerSessionOptions)) {
+        TRACE() << "Object cannot be registered";
+
+        qFatal("SignonDaemon requires to register backup object");
+    }
+
+    if (!sessionConnection.registerService(SIGNOND_SERVICE +
+                                           QLatin1String(".Backup"))) {
+        QDBusError err = sessionConnection.lastError();
+        TRACE() << "Service cannot be registered: " <<
+            err.errorString(err.type());
+
+        qFatal("SignonDaemon requires to register backup service");
+    }
+}
+
+Backup::~Backup()
+{
+    QDBusConnection sessionConnection = QDBusConnection::sessionBus();
+    sessionConnection.unregisterObject(SIGNOND_DAEMON_OBJECTPATH
+                                       + QLatin1String("/Backup"));
+    sessionConnection.unregisterService(SIGNOND_SERVICE
+                                        + QLatin1String(".Backup"));
+}
+
+void Backup::eraseBackupDir() const
+{
+    const CAMConfiguration &config = m_cam->configuration();
+    QString backupRoot = config.m_storagePath + BACKUP_DIR_NAME();
+
+    QDir target(backupRoot);
+    if (!target.exists()) return;
+
+    QStringList targetEntries = target.entryList(QDir::Files);
+    foreach (QString entry, targetEntries) {
+        target.remove(entry);
+    }
+
+    target.rmdir(backupRoot);
+}
+
+bool Backup::copyToBackupDir(const QStringList &fileNames) const
+{
+    const CAMConfiguration &config = m_cam->configuration();
+    QString backupRoot = config.m_storagePath + BACKUP_DIR_NAME();
+
+    QDir target(backupRoot);
+    if (!target.exists() && !target.mkpath(backupRoot)) {
+        qCritical() << "Cannot create target directory";
+        return false;
+    }
+
+    setUserOwnership(backupRoot);
+
+    /* Now copy the files to be backed up */
+    bool ok = true;
+    foreach (const QString &fileName, fileNames) {
+        /* Remove the target file, if it exists */
+        if (target.exists(fileName))
+            target.remove(fileName);
+
+        /* Copy the source into the target directory */
+        QString source = config.m_storagePath + QDir::separator() + fileName;
+        if (!QFile::exists(source)) continue;
+
+        QString destination = backupRoot + QDir::separator() + fileName;
+        ok = QFile::copy(source, destination);
+        if (!ok) {
+            BLAME() << "Copying" << source << "to" << destination << "failed";
+            break;
+        }
+
+        setUserOwnership(destination);
+    }
+
+    return ok;
+}
+
+bool Backup::copyFromBackupDir(const QStringList &fileNames) const
+{
+    const CAMConfiguration &config = m_cam->configuration();
+    QString backupRoot = config.m_storagePath + BACKUP_DIR_NAME();
+
+    QDir sourceDir(backupRoot);
+    if (!sourceDir.exists()) {
+        TRACE() << "Backup directory does not exist!";
+    }
+
+    if (!sourceDir.exists(config.m_dbName)) {
+        TRACE() << "Backup does not contain DB:" << config.m_dbName;
+    }
+
+    /* Now restore the files from the backup */
+    bool ok = true;
+    QDir target(config.m_storagePath);
+    QStringList movedFiles, copiedFiles;
+    foreach (const QString &fileName, fileNames) {
+        /* Rename the target file, if it exists */
+        if (target.exists(fileName)) {
+            if (target.rename(fileName, fileName + QLatin1String(".bak")))
+                movedFiles += fileName;
+        }
+
+        /* Copy the source into the target directory */
+        QString source = backupRoot + QDir::separator() + fileName;
+        if (!QFile::exists(source)) {
+            TRACE() << "Ignoring file not present in backup:" << source;
+            continue;
+        }
+
+        QString destination =
+            config.m_storagePath + QDir::separator() + fileName;
+
+        ok = QFile::copy(source, destination);
+        if (ok) {
+            copiedFiles << fileName;
+        } else {
+            qWarning() << "Copy failed for:" << source;
+            break;
+        }
+    }
+
+    if (!ok) {
+        qWarning() << "Restore failed, recovering previous DB";
+
+        foreach (const QString &fileName, copiedFiles) {
+            target.remove(fileName);
+        }
+
+        foreach (const QString &fileName, movedFiles) {
+            if (!target.rename(fileName + QLatin1String(".bak"), fileName)) {
+                qCritical() << "Could not recover:" << fileName;
+            }
+        }
+    } else {
+        /* delete ".bak" files */
+        foreach (const QString &fileName, movedFiles) {
+            target.remove(fileName + QLatin1String(".bak"));
+        }
+
+    }
+    return ok;
+}
+
+bool Backup::createStorageFileTree(const QStringList &backupFiles) const
+{
+    const CAMConfiguration &config = m_cam->configuration();
+    QDir storageDir(config.m_storagePath);
+
+    if (!storageDir.exists()) {
+        if (!storageDir.mkpath(config.m_storagePath)) {
+            qCritical() << "Could not create storage dir for backup.";
+            return false;
+        }
+    }
+
+    foreach (const QString &fileName, backupFiles) {
+        if (storageDir.exists(fileName)) continue;
+
+        QString filePath = storageDir.path() + QDir::separator() + fileName;
+        QFile file(filePath);
+        if (!file.open(QIODevice::WriteOnly)) {
+            qCritical() << "Failed to create empty file for backup:" << filePath;
+            return false;
+        } else {
+            file.close();
+        }
+    }
+
+    return true;
+}
+
+uchar Backup::backupStarts()
+{
+    TRACE() << "backup";
+    if (!m_backup && m_cam->credentialsSystemOpened())
+    {
+        m_cam->closeCredentialsSystem();
+        if (m_cam->credentialsSystemOpened())
+        {
+            qCritical() << "Cannot close credentials database";
+            return 2;
+        }
+    }
+
+    const CAMConfiguration &config = m_cam->configuration();
+
+    /* do backup copy: prepare the list of files to be backed up */
+    QStringList backupFiles;
+    backupFiles << config.m_dbName;
+    backupFiles << m_cam->backupFiles();
+
+    /* make sure that all the backup files and storage directory exist:
+       create storage dir and empty files if not so, as backup/restore
+       operations must be consistent */
+    if (!createStorageFileTree(backupFiles)) {
+        qCritical() << "Cannot create backup file tree.";
+        return 2;
+    }
+
+    /* perform the copy */
+    eraseBackupDir();
+    if (!copyToBackupDir(backupFiles)) {
+        qCritical() << "Cannot copy database";
+        if (!m_backup)
+            m_cam->openCredentialsSystem();
+        return 2;
+    }
+
+    if (!m_backup)
+    {
+        //mount file system back
+        if (!m_cam->openCredentialsSystem()) {
+            qCritical() << "Cannot reopen database";
+        }
+    }
+    return 0;
+}
+
+uchar Backup::backupFinished()
+{
+    TRACE() << "close";
+
+    eraseBackupDir();
+
+    if (m_backup)
+    {
+        //close daemon
+        TRACE() << "close daemon";
+        QCoreApplication::quit();
+    }
+
+    return 0;
+ }
+
+/*
+ * Does nothing but start-on-demand
+ * */
+uchar Backup::restoreStarts()
+{
+    TRACE();
+    return 0;
+}
+
+uchar Backup::restoreFinished()
+{
+    TRACE() << "restore";
+    //restore requested
+    if (m_cam->credentialsSystemOpened())
+    {
+        //umount file system
+        if (!m_cam->closeCredentialsSystem())
+        {
+            qCritical() << "database cannot be closed";
+            return 2;
+        }
+    }
+
+    const CAMConfiguration &config = m_cam->configuration();
+
+    QStringList backupFiles;
+    backupFiles << config.m_dbName;
+    backupFiles << m_cam->backupFiles();
+
+    /* perform the copy */
+    if (!copyFromBackupDir(backupFiles)) {
+        qCritical() << "Cannot copy database";
+        m_cam->openCredentialsSystem();
+        return 2;
+    }
+
+    eraseBackupDir();
+
+    //TODO check database integrity
+    if (!m_backup)
+    {
+        //mount file system back
+         if (!m_cam->openCredentialsSystem())
+             return 2;
+    }
+
+    return 0;
+}
+
+} //namespace SignonDaemonNS

=== added file 'src/signond/backup.h'
--- src/signond/backup.h	1970-01-01 00:00:00 +0000
+++ src/signond/backup.h	2016-08-24 14:26:52 +0000
@@ -0,0 +1,63 @@
+/*
+ * This file is part of signon
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 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
+ */
+
+#ifndef SIGNON_BACKUP_H_
+#define SIGNON_BACKUP_H_
+
+#include <QDBusContext>
+#include <QObject>
+#include <QString>
+
+namespace SignonDaemonNS {
+
+class CredentialsAccessManager;
+
+class Backup: public QObject, protected QDBusContext
+{
+    Q_OBJECT
+
+public:
+    Backup(CredentialsAccessManager *cam, bool backupMode,
+           QObject *parent = 0);
+    ~Backup();
+
+public Q_SLOTS:
+    uchar backupStarts();
+    uchar backupFinished();
+    uchar restoreStarts();
+    uchar restoreFinished();
+
+private:
+    void eraseBackupDir() const;
+    bool copyToBackupDir(const QStringList &fileNames) const;
+    bool copyFromBackupDir(const QStringList &fileNames) const;
+    bool createStorageFileTree(const QStringList &fileNames) const;
+
+private:
+    CredentialsAccessManager *m_cam;
+    bool m_backup; // whether signond was started just to take a backup
+};
+
+} // namespace
+
+#endif /* SIGNON_BACKUP_H_ */

=== modified file 'src/signond/credentialsaccessmanager.cpp'
--- src/signond/credentialsaccessmanager.cpp	2013-10-14 09:18:41 +0000
+++ src/signond/credentialsaccessmanager.cpp	2016-08-24 14:26:52 +0000
@@ -4,8 +4,8 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <mailto:[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Jussi Laako <[e-mail]>
  *

=== modified file 'src/signond/credentialsaccessmanager.h'
--- src/signond/credentialsaccessmanager.h	2012-04-18 13:06:27 +0000
+++ src/signond/credentialsaccessmanager.h	2016-08-24 14:26:52 +0000
@@ -3,8 +3,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <mailto:[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/credentialsdb.cpp'
--- src/signond/credentialsdb.cpp	2014-08-21 07:33:45 +0000
+++ src/signond/credentialsdb.cpp	2016-08-24 14:26:52 +0000
@@ -3,9 +3,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/credentialsdb.h'
--- src/signond/credentialsdb.h	2014-08-21 07:33:45 +0000
+++ src/signond/credentialsdb.h	2016-08-24 14:26:52 +0000
@@ -3,9 +3,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/credentialsdb_p.h'
--- src/signond/credentialsdb_p.h	2012-08-27 13:42:05 +0000
+++ src/signond/credentialsdb_p.h	2016-08-24 14:26:52 +0000
@@ -3,7 +3,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/default-crypto-manager.cpp'
--- src/signond/default-crypto-manager.cpp	2011-11-09 15:46:57 +0000
+++ src/signond/default-crypto-manager.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/default-crypto-manager.h'
--- src/signond/default-crypto-manager.h	2012-04-18 13:03:21 +0000
+++ src/signond/default-crypto-manager.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/default-key-authorizer.cpp'
--- src/signond/default-key-authorizer.cpp	2012-04-18 13:06:27 +0000
+++ src/signond/default-key-authorizer.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/default-key-authorizer.h'
--- src/signond/default-key-authorizer.h	2012-04-18 13:06:27 +0000
+++ src/signond/default-key-authorizer.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/default-secrets-storage.cpp'
--- src/signond/default-secrets-storage.cpp	2015-02-03 02:00:32 +0000
+++ src/signond/default-secrets-storage.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/default-secrets-storage.h'
--- src/signond/default-secrets-storage.h	2015-02-03 02:00:32 +0000
+++ src/signond/default-secrets-storage.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/main.cpp'
--- src/signond/main.cpp	2012-04-18 13:06:27 +0000
+++ src/signond/main.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/pluginproxy.cpp'
--- src/signond/pluginproxy.cpp	2015-01-23 08:41:04 +0000
+++ src/signond/pluginproxy.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/pluginproxy.h'
--- src/signond/pluginproxy.h	2013-01-11 11:33:56 +0000
+++ src/signond/pluginproxy.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/signonauthsession.cpp'
--- src/signond/signonauthsession.cpp	2013-07-23 09:07:35 +0000
+++ src/signond/signonauthsession.cpp	2016-08-24 14:26:52 +0000
@@ -2,9 +2,9 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Conta 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
@@ -27,11 +27,9 @@
 
 using namespace SignonDaemonNS;
 
-SignonAuthSession::SignonAuthSession(quint32 id,
-                                     const QString &method,
+SignonAuthSession::SignonAuthSession(SignonSessionCore *core,
                                      pid_t ownerPid):
-    m_id(id),
-    m_method(method),
+    QObject(core),
     m_ownerPid(ownerPid)
 {
     TRACE();
@@ -44,6 +42,9 @@
     TRACE() << objectName;
 
     setObjectName(objectName);
+
+    connect(core, SIGNAL(stateChanged(const QString&, int, const QString&)),
+            this, SLOT(stateChangedSlot(const QString&, int, const QString&)));
 }
 
 SignonAuthSession::~SignonAuthSession()
@@ -58,19 +59,13 @@
                                                         pid_t ownerPid)
 {
     TRACE();
-    SignonAuthSession *sas = new SignonAuthSession(id, method, ownerPid);
-
     SignonSessionCore *core = SignonSessionCore::sessionCore(id, method, parent);
     if (!core) {
         TRACE() << "Cannot retrieve proper tasks queue";
-        delete sas;
         return NULL;
     }
 
-    sas->setParent(core);
-
-    connect(core, SIGNAL(stateChanged(const QString&, int, const QString&)),
-            sas, SLOT(stateChangedSlot(const QString&, int, const QString&)));
+    SignonAuthSession *sas = new SignonAuthSession(core, ownerPid);
 
     TRACE() << "SignonAuthSession created successfully:" << sas->objectName();
     return sas;
@@ -83,12 +78,12 @@
 
 quint32 SignonAuthSession::id() const
 {
-    return m_id;
+    return parent()->id();
 }
 
 QString SignonAuthSession::method() const
 {
-    return m_method;
+    return parent()->method();
 }
 
 pid_t SignonAuthSession::ownerPid() const
@@ -122,7 +117,6 @@
 
 void SignonAuthSession::setId(quint32 id)
 {
-    m_id = id;
     parent()->setId(id);
 }
 

=== modified file 'src/signond/signonauthsession.h'
--- src/signond/signonauthsession.h	2013-07-23 09:07:35 +0000
+++ src/signond/signonauthsession.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -81,7 +81,7 @@
                           const QString &message);
 
 protected:
-    SignonAuthSession(quint32 id, const QString &method, pid_t ownerPid);
+    SignonAuthSession(SignonSessionCore *core, pid_t ownerPid);
     virtual ~SignonAuthSession();
 
 private:

=== modified file 'src/signond/signonauthsessionadaptor.cpp'
--- src/signond/signonauthsessionadaptor.cpp	2013-08-05 08:47:33 +0000
+++ src/signond/signonauthsessionadaptor.cpp	2016-08-24 14:26:52 +0000
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Jussi Laako <[e-mail]>

=== modified file 'src/signond/signonauthsessionadaptor.h'
--- src/signond/signonauthsessionadaptor.h	2012-04-18 13:03:21 +0000
+++ src/signond/signonauthsessionadaptor.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/signond-common.h'
--- src/signond/signond-common.h	2012-11-07 08:51:26 +0000
+++ src/signond/signond-common.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/signond.pro'
--- src/signond/signond.pro	2015-10-27 09:58:39 +0000
+++ src/signond/signond.pro	2016-08-24 14:26:52 +0000
@@ -9,8 +9,8 @@
     dbus
 
 #generate adaptor for backup
-system(qdbusxml2cpp -c BackupIfAdaptor -a backupifadaptor.h:backupifadaptor.cpp \
-    ../../lib/signond/com.nokia.SingleSignOn.Backup.xml)
+DBUS_ADAPTORS += \
+    ../../lib/signond/com.nokia.SingleSignOn.Backup.xml
 
 HEADERS += \
     accesscontrolmanagerhelper.h \
@@ -33,7 +33,6 @@
     signonidentityinfo.h \
     signonui_interface.h \
     signonidentityadaptor.h \
-    backupifadaptor.h \
     signonsessioncoretools.h
 SOURCES += \
     accesscontrolmanagerhelper.cpp \
@@ -54,7 +53,6 @@
     signondaemon.cpp \
     signonidentityinfo.cpp \
     signonidentityadaptor.cpp \
-    backupifadaptor.cpp \
     signonsessioncoretools.cpp
 INCLUDEPATH += . \
     $${TOP_SRC_DIR}/lib/plugins \
@@ -75,6 +73,14 @@
     PKGCONFIG += dbus-1
 }
 
+CONFIG(enable-backup) {
+    DEFINES += ENABLE_BACKUP
+    SOURCES += \
+        backup.cpp
+    HEADERS += \
+        backup.h
+}
+
 DEFINES += QT_NO_CAST_TO_ASCII \
     QT_NO_CAST_FROM_ASCII
 DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}"
@@ -87,10 +93,6 @@
     -lsignon-plugins-common \
     -lsignon-extension
 
-QMAKE_DISTCLEAN += \
-    backupifadaptor.cpp \
-    backupifadaptor.h
-
 headers.files = $$HEADERS
 include( ../../common-installs-config.pri )
 

=== modified file 'src/signond/signondaemon.cpp'
--- src/signond/signondaemon.cpp	2015-06-12 11:21:18 +0000
+++ src/signond/signondaemon.cpp	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013-2015 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
@@ -28,8 +27,6 @@
     #include <sys/types.h>
 }
 
-#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
-
 #include <QtDebug>
 #include <QDir>
 #include <QDBusConnection>
@@ -38,12 +35,11 @@
 #include <QPluginLoader>
 #include <QProcessEnvironment>
 #include <QSocketNotifier>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QStandardPaths>
-#endif
 
 #include "SignOn/misc.h"
 
+#include "backup.h"
 #include "signondaemon.h"
 #include "signond-common.h"
 #include "signontrace.h"
@@ -51,7 +47,6 @@
 #include "signonidentity.h"
 #include "signonauthsession.h"
 #include "accesscontrolmanagerhelper.h"
-#include "backupifadaptor.h"
 
 #define SIGNON_RETURN_IF_CAM_UNAVAILABLE(_ret_arg_) do {                   \
         if (m_pCAMManager && !m_pCAMManager->credentialsSystemOpened()) {  \
@@ -63,9 +58,6 @@
         }                               \
     } while(0)
 
-#define BACKUP_DIR_NAME() \
-    (QDir::separator() + QLatin1String("backup"))
-
 using namespace SignOn;
 
 namespace SignonDaemonNS {
@@ -218,12 +210,8 @@
             environment.value(QLatin1String("SSO_EXTENSIONS_DIR"));
     }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     QString runtimeDir =
         QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
-#else
-    QString runtimeDir = environment.value(QLatin1String("XDG_RUNTIME_DIR"));
-#endif
     if (!runtimeDir.isEmpty()) {
         QString socketFileName =
             QString::fromLatin1("%1/" SIGNOND_SOCKET_FILENAME).arg(runtimeDir);
@@ -267,10 +255,6 @@
     ::close(sigFd[0]);
     ::close(sigFd[1]);
 
-    if (m_backup) {
-        exit(0);
-    }
-
     delete m_dbusServer;
 
     SignonAuthSession::stopAllAuthSessions();
@@ -282,16 +266,8 @@
     }
 
     QDBusConnection sessionConnection = QDBusConnection::sessionBus();
-
-    sessionConnection.unregisterObject(SIGNOND_DAEMON_OBJECTPATH
-                                       + QLatin1String("/Backup"));
-    sessionConnection.unregisterService(SIGNOND_SERVICE
-                                        + QLatin1String(".Backup"));
-    if (m_backup == false)
-    {
-        sessionConnection.unregisterObject(SIGNOND_DAEMON_OBJECTPATH);
-        sessionConnection.unregisterService(SIGNOND_SERVICE);
-    }
+    sessionConnection.unregisterObject(SIGNOND_DAEMON_OBJECTPATH);
+    sessionConnection.unregisterService(SIGNOND_SERVICE);
 
     delete m_configuration;
 
@@ -392,49 +368,20 @@
                "constructed first");
 
     setupSignalHandlers();
-    m_backup = app->arguments().contains(QLatin1String("-backup"));
     m_pCAMManager =
         new CredentialsAccessManager(m_configuration->camConfiguration());
 
+#ifdef ENABLE_BACKUP
     /* backup dbus interface */
-    QDBusConnection sessionConnection = QDBusConnection::sessionBus();
-
-    if (!sessionConnection.isConnected()) {
-        QDBusError err = sessionConnection.lastError();
-        TRACE() << "Session connection cannot be established:" <<
-            err.errorString(err.type());
-        TRACE() << err.message();
-
-        qFatal("SignonDaemon requires session bus to start working");
-    }
-
-    QDBusConnection::RegisterOptions registerSessionOptions =
-        QDBusConnection::ExportAdaptors;
-
-    (void)new BackupIfAdaptor(this);
-
-    if (!sessionConnection.registerObject(SIGNOND_DAEMON_OBJECTPATH
-                                          + QLatin1String("/Backup"),
-                                          this, registerSessionOptions)) {
-        TRACE() << "Object cannot be registered";
-
-        qFatal("SignonDaemon requires to register backup object");
-    }
-
-    if (!sessionConnection.registerService(SIGNOND_SERVICE +
-                                           QLatin1String(".Backup"))) {
-        QDBusError err = sessionConnection.lastError();
-        TRACE() << "Service cannot be registered: " <<
-            err.errorString(err.type());
-
-        qFatal("SignonDaemon requires to register backup service");
-    }
-
-    if (m_backup) {
+    bool backupMode = app->arguments().contains(QLatin1String("-backup"));
+    (void)new Backup(m_pCAMManager, backupMode, this);
+
+    if (backupMode) {
         TRACE() << "Signond initialized in backup mode.";
         //skip rest of initialization in backup mode
         return;
     }
+#endif
 
     /* DBus Service init */
     QDBusConnection connection = SIGNOND_BUS;
@@ -677,11 +624,6 @@
 
     TRACE() << method;
 
-    QStringList mechs = SignonSessionCore::loadedPluginMethods(method);
-
-    if (!mechs.isEmpty())
-        return mechs;
-
     PluginProxy *plugin = PluginProxy::createNewPluginProxy(method);
 
     if (!plugin) {
@@ -694,7 +636,7 @@
         return QStringList();
     }
 
-    mechs = plugin->mechanisms();
+    QStringList mechs = plugin->mechanisms();
     delete plugin;
 
     return mechs;
@@ -776,265 +718,6 @@
     return authSession;
 }
 
-void SignonDaemon::eraseBackupDir() const
-{
-    const CAMConfiguration config = m_configuration->camConfiguration();
-    QString backupRoot = config.m_storagePath + BACKUP_DIR_NAME();
-
-    QDir target(backupRoot);
-    if (!target.exists()) return;
-
-    QStringList targetEntries = target.entryList(QDir::Files);
-    foreach (QString entry, targetEntries) {
-        target.remove(entry);
-    }
-
-    target.rmdir(backupRoot);
-}
-
-bool SignonDaemon::copyToBackupDir(const QStringList &fileNames) const
-{
-    const CAMConfiguration config = m_configuration->camConfiguration();
-    QString backupRoot = config.m_storagePath + BACKUP_DIR_NAME();
-
-    QDir target(backupRoot);
-    if (!target.exists() && !target.mkpath(backupRoot)) {
-        qCritical() << "Cannot create target directory";
-        return false;
-    }
-
-    setUserOwnership(backupRoot);
-
-    /* Now copy the files to be backed up */
-    bool ok = true;
-    foreach (const QString &fileName, fileNames) {
-        /* Remove the target file, if it exists */
-        if (target.exists(fileName))
-            target.remove(fileName);
-
-        /* Copy the source into the target directory */
-        QString source = config.m_storagePath + QDir::separator() + fileName;
-        if (!QFile::exists(source)) continue;
-
-        QString destination = backupRoot + QDir::separator() + fileName;
-        ok = QFile::copy(source, destination);
-        if (!ok) {
-            BLAME() << "Copying" << source << "to" << destination << "failed";
-            break;
-        }
-
-        setUserOwnership(destination);
-    }
-
-    return ok;
-}
-
-bool SignonDaemon::copyFromBackupDir(const QStringList &fileNames) const
-{
-    const CAMConfiguration config = m_configuration->camConfiguration();
-    QString backupRoot = config.m_storagePath + BACKUP_DIR_NAME();
-
-    QDir sourceDir(backupRoot);
-    if (!sourceDir.exists()) {
-        TRACE() << "Backup directory does not exist!";
-    }
-
-    if (!sourceDir.exists(config.m_dbName)) {
-        TRACE() << "Backup does not contain DB:" << config.m_dbName;
-    }
-
-    /* Now restore the files from the backup */
-    bool ok = true;
-    QDir target(config.m_storagePath);
-    QStringList movedFiles, copiedFiles;
-    foreach (const QString &fileName, fileNames) {
-        /* Remove the target file, if it exists */
-        if (target.exists(fileName)) {
-            if (target.rename(fileName, fileName + QLatin1String(".bak")))
-                movedFiles += fileName;
-        }
-
-        /* Copy the source into the target directory */
-        QString source = backupRoot + QDir::separator() + fileName;
-        if (!QFile::exists(source)) {
-            TRACE() << "Ignoring file not present in backup:" << source;
-            continue;
-        }
-
-        QString destination =
-            config.m_storagePath + QDir::separator() + fileName;
-
-        ok = QFile::copy(source, destination);
-        if (ok) {
-            copiedFiles << fileName;
-        } else {
-            qWarning() << "Copy failed for:" << source;
-            break;
-        }
-    }
-
-    if (!ok) {
-        qWarning() << "Restore failed, recovering previous DB";
-
-        foreach (const QString &fileName, copiedFiles) {
-            target.remove(fileName);
-        }
-
-        foreach (const QString &fileName, movedFiles) {
-            if (!target.rename(fileName + QLatin1String(".bak"), fileName)) {
-                qCritical() << "Could not recover:" << fileName;
-            }
-        }
-    } else {
-        /* delete ".bak" files */
-        foreach (const QString &fileName, movedFiles) {
-            target.remove(fileName + QLatin1String(".bak"));
-        }
-
-    }
-    return ok;
-}
-
-bool SignonDaemon::createStorageFileTree(const QStringList &backupFiles) const
-{
-    QString storageDirPath = m_configuration->camConfiguration().m_storagePath;
-    QDir storageDir(storageDirPath);
-
-    if (!storageDir.exists()) {
-        if (!storageDir.mkpath(storageDirPath)) {
-            qCritical() << "Could not create storage dir for backup.";
-            return false;
-        }
-    }
-
-    foreach (const QString &fileName, backupFiles) {
-        if (storageDir.exists(fileName)) continue;
-
-        QString filePath = storageDir.path() + QDir::separator() + fileName;
-        QFile file(filePath);
-        if (!file.open(QIODevice::WriteOnly)) {
-            qCritical() << "Failed to create empty file for backup:" << filePath;
-            return false;
-        } else {
-            file.close();
-        }
-    }
-
-    return true;
-}
-
-uchar SignonDaemon::backupStarts()
-{
-    TRACE() << "backup";
-    if (!m_backup && m_pCAMManager->credentialsSystemOpened())
-    {
-        m_pCAMManager->closeCredentialsSystem();
-        if (m_pCAMManager->credentialsSystemOpened())
-        {
-            qCritical() << "Cannot close credentials database";
-            return 2;
-        }
-    }
-
-    const CAMConfiguration config = m_configuration->camConfiguration();
-
-    /* do backup copy: prepare the list of files to be backed up */
-    QStringList backupFiles;
-    backupFiles << config.m_dbName;
-    backupFiles << m_pCAMManager->backupFiles();
-
-    /* make sure that all the backup files and storage directory exist:
-       create storage dir and empty files if not so, as backup/restore
-       operations must be consistent */
-    if (!createStorageFileTree(backupFiles)) {
-        qCritical() << "Cannot create backup file tree.";
-        return 2;
-    }
-
-    /* perform the copy */
-    eraseBackupDir();
-    if (!copyToBackupDir(backupFiles)) {
-        qCritical() << "Cannot copy database";
-        if (!m_backup)
-            m_pCAMManager->openCredentialsSystem();
-        return 2;
-    }
-
-    if (!m_backup)
-    {
-        //mount file system back
-        if (!m_pCAMManager->openCredentialsSystem()) {
-            qCritical() << "Cannot reopen database";
-        }
-    }
-    return 0;
-}
-
-uchar SignonDaemon::backupFinished()
-{
-    TRACE() << "close";
-
-    eraseBackupDir();
-
-    if (m_backup)
-    {
-        //close daemon
-        TRACE() << "close daemon";
-        this->deleteLater();
-    }
-
-    return 0;
- }
-
-/*
- * Does nothing but start-on-demand
- * */
-uchar SignonDaemon::restoreStarts()
-{
-    TRACE();
-    return 0;
-}
-
-uchar SignonDaemon::restoreFinished()
-{
-    TRACE() << "restore";
-    //restore requested
-    if (m_pCAMManager->credentialsSystemOpened())
-    {
-        //umount file system
-        if (!m_pCAMManager->closeCredentialsSystem())
-        {
-            qCritical() << "database cannot be closed";
-            return 2;
-        }
-    }
-
-    const CAMConfiguration config = m_configuration->camConfiguration();
-
-    QStringList backupFiles;
-    backupFiles << config.m_dbName;
-    backupFiles << m_pCAMManager->backupFiles();
-
-    /* perform the copy */
-    if (!copyFromBackupDir(backupFiles)) {
-        qCritical() << "Cannot copy database";
-        m_pCAMManager->openCredentialsSystem();
-        return 2;
-    }
-
-    eraseBackupDir();
-
-    //TODO check database integrity
-    if (!m_backup)
-    {
-        //mount file system back
-         if (!m_pCAMManager->openCredentialsSystem())
-             return 2;
-    }
-
-    return 0;
-}
-
 void SignonDaemon::onDisconnected()
 {
     TRACE() << "Disconnected from session bus: exiting";

=== modified file 'src/signond/signondaemon.h'
--- src/signond/signondaemon.h	2013-08-20 13:17:21 +0000
+++ src/signond/signondaemon.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
@@ -143,12 +142,6 @@
     void onIdentityStored(SignonIdentity *identity);
     void onIdentityDestroyed();
 
-public Q_SLOTS: // backup METHODS
-    uchar backupStarts();
-    uchar backupFinished();
-    uchar restoreStarts();
-    uchar restoreFinished();
-
 private:
     SignonDaemon(QObject *parent);
     void initExtensions();
@@ -158,11 +151,6 @@
     void watchIdentity(SignonIdentity *identity);
     void setupSignalHandlers();
 
-    void eraseBackupDir() const;
-    bool copyToBackupDir(const QStringList &fileNames) const;
-    bool copyFromBackupDir(const QStringList &fileNames) const;
-    bool createStorageFileTree(const QStringList &fileNames) const;
-
     void setLastError(const QString &name, const QString &msg);
     void clearLastError();
 
@@ -179,8 +167,6 @@
      * */
     CredentialsAccessManager *m_pCAMManager;
 
-    bool m_backup;
-
     int m_identityTimeout;
     int m_authSessionTimeout;
 

=== modified file 'src/signond/signondaemonadaptor.cpp'
--- src/signond/signondaemonadaptor.cpp	2014-11-14 10:08:04 +0000
+++ src/signond/signondaemonadaptor.cpp	2016-08-24 14:26:52 +0000
@@ -3,9 +3,8 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Jussi Laako <[e-mail]>
  *

=== modified file 'src/signond/signondaemonadaptor.h'
--- src/signond/signondaemonadaptor.h	2013-08-20 08:01:44 +0000
+++ src/signond/signondaemonadaptor.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/signondisposable.cpp'
--- src/signond/signondisposable.cpp	2012-04-18 13:06:27 +0000
+++ src/signond/signondisposable.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/signondisposable.h'
--- src/signond/signondisposable.h	2012-04-18 13:06:27 +0000
+++ src/signond/signondisposable.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/signonidentity.cpp'
--- src/signond/signonidentity.cpp	2014-11-17 09:33:43 +0000
+++ src/signond/signonidentity.cpp	2016-08-24 14:26:52 +0000
@@ -3,9 +3,8 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Jussi Laako <[e-mail]>
  *

=== modified file 'src/signond/signonidentity.h'
--- src/signond/signonidentity.h	2014-08-21 07:33:45 +0000
+++ src/signond/signonidentity.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012-2013 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/signonidentityadaptor.cpp'
--- src/signond/signonidentityadaptor.cpp	2013-08-05 08:47:33 +0000
+++ src/signond/signonidentityadaptor.cpp	2016-08-24 14:26:52 +0000
@@ -3,9 +3,8 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Jussi Laako <[e-mail]>
  *

=== modified file 'src/signond/signonidentityadaptor.h'
--- src/signond/signonidentityadaptor.h	2012-04-18 13:03:21 +0000
+++ src/signond/signonidentityadaptor.h	2016-08-24 14:26:52 +0000
@@ -2,9 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/signonidentityinfo.cpp'
--- src/signond/signonidentityinfo.cpp	2014-11-17 09:33:43 +0000
+++ src/signond/signonidentityinfo.cpp	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/signonidentityinfo.h'
--- src/signond/signonidentityinfo.h	2014-11-17 09:33:43 +0000
+++ src/signond/signonidentityinfo.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/signonsessioncore.cpp'
--- src/signond/signonsessioncore.cpp	2014-10-10 13:11:26 +0000
+++ src/signond/signonsessioncore.cpp	2016-08-24 14:26:52 +0000
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  * Contact: Jussi Laako <[e-mail]>
@@ -207,21 +208,6 @@
     sessionsOfNonStoredCredentials.clear();
 }
 
-QStringList SignonSessionCore::loadedPluginMethods(const QString &method)
-{
-    foreach (SignonSessionCore *corePtr, sessionsOfStoredCredentials) {
-        if (corePtr->method() == method)
-            return corePtr->queryAvailableMechanisms(QStringList());
-    }
-
-    foreach (SignonSessionCore *corePtr, sessionsOfNonStoredCredentials) {
-        if (corePtr->method() == method)
-            return corePtr->queryAvailableMechanisms(QStringList());
-    }
-
-    return QStringList();
-}
-
 QStringList
 SignonSessionCore::queryAvailableMechanisms(const QStringList &wantedMechanisms)
 {
@@ -614,11 +600,14 @@
         rd.m_conn.send(rd.m_msg.createReply(arguments));
 
         if (m_watcher && !m_watcher->isFinished()) {
-            m_signonui->cancelUiRequest(rd.m_cancelKey);
             delete m_watcher;
             m_watcher = 0;
         }
-        m_queryCredsUiDisplayed = false;
+        /* Inform SignOnUi that we are done */
+        if (m_queryCredsUiDisplayed) {
+            m_signonui->cancelUiRequest(rd.m_cancelKey);
+            m_queryCredsUiDisplayed = false;
+        }
     }
 
     requestDone();
@@ -745,6 +734,7 @@
         m_watcher = new QDBusPendingCallWatcher(
                      m_signonui->queryDialog(request.m_params),
                      this);
+        m_queryCredsUiDisplayed = true;
         connect(m_watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
                 this, SLOT(queryUiSlot(QDBusPendingCallWatcher*)));
     }
@@ -771,6 +761,7 @@
         m_watcher = new QDBusPendingCallWatcher(
                      m_signonui->refreshDialog(m_listOfRequests.head().m_params),
                      this);
+        m_queryCredsUiDisplayed = true;
         connect(m_watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
                 this, SLOT(queryUiSlot(QDBusPendingCallWatcher*)));
     }
@@ -792,10 +783,14 @@
         replyError(rd.m_conn, rd.m_msg, err, message);
 
         if (m_watcher && !m_watcher->isFinished()) {
-            m_signonui->cancelUiRequest(rd.m_cancelKey);
             delete m_watcher;
             m_watcher = 0;
         }
+        /* Inform SignOnUi that we are done */
+        if (m_queryCredsUiDisplayed) {
+            m_queryCredsUiDisplayed = false;
+            m_signonui->cancelUiRequest(rd.m_cancelKey);
+        }
     }
 
     requestDone();
@@ -857,17 +852,16 @@
         rd.m_params = resultParameters;
 
         /* If the query ui was canceled or any other error occurred
-         * do not set this flag to true. */
+         * we assume that the UI is not displayed. */
         if (resultParameters.contains(SSOUI_KEY_ERROR)
             && (resultParameters[SSOUI_KEY_ERROR] == QUERY_ERROR_CANCELED)) {
 
             m_queryCredsUiDisplayed = false;
-        } else {
-            m_queryCredsUiDisplayed = true;
         }
     } else {
         rd.m_params.insert(SSOUI_KEY_ERROR,
                            (int)SignOn::QUERY_ERROR_NO_SIGNONUI);
+        m_queryCredsUiDisplayed = false;
     }
 
     if (!m_canceled) {

=== modified file 'src/signond/signonsessioncore.h'
--- src/signond/signonsessioncore.h	2013-02-06 09:03:19 +0000
+++ src/signond/signonsessioncore.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -63,7 +64,6 @@
      * just for any case
      * */
     static void stopAllAuthSessions();
-    static QStringList loadedPluginMethods(const QString &method);
 
     void destroy();
 

=== modified file 'src/signond/signonsessioncoretools.cpp'
--- src/signond/signonsessioncoretools.cpp	2012-08-27 13:42:05 +0000
+++ src/signond/signonsessioncoretools.cpp	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/signonsessioncoretools.h'
--- src/signond/signonsessioncoretools.h	2012-08-27 13:42:05 +0000
+++ src/signond/signonsessioncoretools.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'src/signond/signontrace.h'
--- src/signond/signontrace.h	2012-08-16 09:42:35 +0000
+++ src/signond/signontrace.h	2016-08-24 14:26:52 +0000
@@ -2,8 +2,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
@@ -58,8 +58,11 @@
         m_pInstance = new SignonTrace(logOutput);
     }
 
-    static void output(QtMsgType type, const char *msg)
+    static void output(QtMsgType type, const QMessageLogContext &context,
+                       const QString &msg)
     {
+        Q_UNUSED(context);
+
         if (!m_pInstance)
             return;
 
@@ -79,7 +82,7 @@
             default: priority = LOG_INFO; break;
         }
 
-        syslog(priority, "%s", msg);
+        syslog(priority, "%s", msg.toUtf8().constData());
     }
 
 private:
@@ -88,7 +91,7 @@
     {
         if (logOutput == Syslog) {
             openlog(NULL, LOG_PID, LOG_DAEMON);
-            qInstallMsgHandler(output);
+            qInstallMessageHandler(output);
         }
     }
 

=== modified file 'src/signond/signonui_interface.cpp'
--- src/signond/signonui_interface.cpp	2013-04-24 08:49:02 +0000
+++ src/signond/signonui_interface.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'src/signond/signonui_interface.h'
--- src/signond/signonui_interface.h	2013-04-24 08:49:02 +0000
+++ src/signond/signonui_interface.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/extensions/tst_access_control_manager.cpp'
--- tests/extensions/tst_access_control_manager.cpp	2013-08-20 08:01:43 +0000
+++ tests/extensions/tst_access_control_manager.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/libsignon-qt-tests.pro'
--- tests/libsignon-qt-tests/libsignon-qt-tests.pro	2015-10-27 09:58:39 +0000
+++ tests/libsignon-qt-tests/libsignon-qt-tests.pro	2016-08-24 14:26:52 +0000
@@ -11,11 +11,7 @@
     testlib
 QT -= gui
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBS *= -lsignon-qt5
-} else {
-    LIBS *= -lsignon-qt
-}
+LIBS *= -lsignon-qt5
 QMAKE_LIBDIR += $${TOP_BUILD_DIR}/lib/SignOn
 QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
 

=== modified file 'tests/libsignon-qt-tests/signon-ui.cpp'
--- tests/libsignon-qt-tests/signon-ui.cpp	2012-10-25 12:58:10 +0000
+++ tests/libsignon-qt-tests/signon-ui.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/signon-ui.h'
--- tests/libsignon-qt-tests/signon-ui.h	2012-10-25 12:58:10 +0000
+++ tests/libsignon-qt-tests/signon-ui.h	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/ssotestclient.cpp'
--- tests/libsignon-qt-tests/ssotestclient.cpp	2014-11-17 09:37:35 +0000
+++ tests/libsignon-qt-tests/ssotestclient.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/ssotestclient.h'
--- tests/libsignon-qt-tests/ssotestclient.h	2014-11-17 09:37:35 +0000
+++ tests/libsignon-qt-tests/ssotestclient.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/testauthserviceresult.cpp'
--- tests/libsignon-qt-tests/testauthserviceresult.cpp	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testauthserviceresult.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/testauthserviceresult.h'
--- tests/libsignon-qt-tests/testauthserviceresult.h	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testauthserviceresult.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/testauthsession.cpp'
--- tests/libsignon-qt-tests/testauthsession.cpp	2014-11-17 09:37:35 +0000
+++ tests/libsignon-qt-tests/testauthsession.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -405,111 +405,6 @@
     QCOMPARE(errorType, SignOn::Error::MethodOrMechanismNotAllowed);
 }
 
-void TestAuthSession::process_from_other_process()
-{
-    // In order to try reusing same authentication session from
-    // another process we need the session object path, which isn't
-    // available through the client API. To work around this we
-    // don't use the API but make direct D-Bus calls instead
-
-    // The session bus used by the API cannot be accessed outside
-    // the API library so create our own bus
-    QDBusConnection dbuscon1 =
-        QDBusConnection::connectToBus(QDBusConnection::SessionBus,
-                                      "originalconnection");
-    QDBusInterface iface(SIGNOND_SERVICE,
-                         SIGNOND_DAEMON_OBJECTPATH,
-                         SIGNOND_DAEMON_INTERFACE,
-                         dbuscon1);
-
-    SlotMachine slotMachine;
-    QEventLoop sessionLoop;
-    QObject::connect(&slotMachine, SIGNAL(done()), &sessionLoop, SLOT(quit()));
-    QTimer::singleShot(10*1000, &sessionLoop, SLOT(quit()));
-
-    QVariantList arguments;
-    arguments += (quint32)SIGNOND_NEW_IDENTITY;
-    arguments += QString::fromLatin1("ssotest");
-    iface.callWithCallback(QLatin1String("getAuthSessionObjectPath"),
-                           arguments, &slotMachine,
-                           SLOT(authenticationSlot(const QString&)),
-                           SLOT(errorSlot(const QDBusError&)));
-
-    sessionLoop.exec();
-
-    QString qs;
-    if (slotMachine.m_path.isEmpty())
-        qDebug() << "getAuthSessionObjectPath failed: " << slotMachine.m_errorMessage.toLatin1().data();
-    QVERIFY(slotMachine.m_path.length() > 0);
-
-    int exitCode = 1;
-    pid_t childPid = fork();
-    QVERIFY(childPid != -1);
-
-    if (childPid != 0) {
-        int status = 0;
-        childPid = waitpid(childPid, &status, 0);
-        QVERIFY(childPid != -1 && WIFEXITED(status));
-        exitCode = WEXITSTATUS(status);
-    } else {
-        // We're in the child process now...
-        // Do not reuse existing session bus because it is seen by signond
-        // as if coming from the parent process and we want to test connection
-		 // from other process
-        QDBusConnection dbuscon2 = QDBusConnection::connectToBus(QDBusConnection::SessionBus, "otherconnection");
-        QDBusInterface *dbus = new QDBusInterface(SIGNOND_SERVICE,
-                                                  slotMachine.m_path,
-                                                  QLatin1String(SIGNOND_AUTH_SESSION_INTERFACE),
-                                                  dbuscon2);
-
-        SessionData inData;
-        inData.setSecret("testSecret");
-        inData.setUserName("testUsername");
-        QVariantMap inDataVarMap;
-        foreach(QString key, inData.propertyNames()) {
-            if (!inData.getProperty(key).isNull() && inData.getProperty(key).isValid())
-                inDataVarMap[key] = inData.getProperty(key);
-        }
-
-        arguments.clear();
-        arguments += inDataVarMap;
-        arguments += QString::fromLatin1("mech1");
-
-        QDBusMessage msg = QDBusMessage::createMethodCall(dbus->service(),
-                                                          dbus->path(),
-                                                          dbus->interface(),
-                                                          QString::fromLatin1("process"));
-        msg.setArguments(arguments);
-
-        QEventLoop processLoop;
-        QObject::connect(&slotMachine, SIGNAL(done()), &processLoop, SLOT(quit()));
-        QTimer::singleShot(10*1000, &processLoop, SLOT(quit()));
-
-        dbus->connection().callWithCallback(msg, &slotMachine,
-                                            SLOT(responseSlot(const QVariantMap&)),
-                                            SLOT(errorSlot(const QDBusError&)),
-                                            SIGNOND_MAX_TIMEOUT);
-
-        processLoop.exec();
-
-        delete dbus;
-
-        if (slotMachine.m_responseReceived) {
-            qDebug() << "AuthSession::process succeeded even though it was expected to fail";
-            exit(1);
-        } else {
-            if (slotMachine.m_errorName == SIGNOND_PERMISSION_DENIED_ERR_NAME)
-                exit(0);
-
-            qDebug() << "AuthSession::process failed but with unexpected error: " <<
-                        slotMachine.m_errorMessage;
-            exit(1);
-        }
-    }
-
-    QCOMPARE(exitCode, 0);
-}
-
 void TestAuthSession::process_many_times_after_auth()
 {
     AuthSession *as;

=== modified file 'tests/libsignon-qt-tests/testauthsession.h'
--- tests/libsignon-qt-tests/testauthsession.h	2013-07-23 09:07:35 +0000
+++ tests/libsignon-qt-tests/testauthsession.h	2016-08-24 14:26:52 +0000
@@ -3,9 +3,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
@@ -86,7 +85,6 @@
     void process_with_nonexisting_type();
     void process_with_nonexisting_method();
     void process_with_unauthorized_method();
-    void process_from_other_process();
     void process_many_times_after_auth();
     void process_many_times_before_auth();
     void process_with_big_session_data();

=== modified file 'tests/libsignon-qt-tests/testidentityresult.cpp'
--- tests/libsignon-qt-tests/testidentityresult.cpp	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testidentityresult.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/testidentityresult.h'
--- tests/libsignon-qt-tests/testidentityresult.h	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testidentityresult.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/testsinglesignon.cpp'
--- tests/libsignon-qt-tests/testsinglesignon.cpp	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testsinglesignon.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/testsinglesignon.h'
--- tests/libsignon-qt-tests/testsinglesignon.h	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testsinglesignon.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/libsignon-qt-tests/testthread.cpp'
--- tests/libsignon-qt-tests/testthread.cpp	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testthread.cpp	2016-08-24 14:26:52 +0000
@@ -3,8 +3,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'tests/libsignon-qt-tests/testthread.h'
--- tests/libsignon-qt-tests/testthread.h	2012-04-18 13:06:27 +0000
+++ tests/libsignon-qt-tests/testthread.h	2016-08-24 14:26:52 +0000
@@ -3,8 +3,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'tests/passwordplugintest/passwordplugintest.cpp'
--- tests/passwordplugintest/passwordplugintest.cpp	2012-04-18 13:06:27 +0000
+++ tests/passwordplugintest/passwordplugintest.cpp	2016-08-24 14:26:52 +0000
@@ -3,8 +3,8 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or

=== modified file 'tests/passwordplugintest/passwordplugintest.h'
--- tests/passwordplugintest/passwordplugintest.h	2012-04-18 13:06:27 +0000
+++ tests/passwordplugintest/passwordplugintest.h	2016-08-24 14:26:52 +0000
@@ -3,6 +3,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/run-with-signond.sh'
--- tests/run-with-signond.sh	2015-04-23 12:37:16 +0000
+++ tests/run-with-signond.sh	2016-08-24 14:26:52 +0000
@@ -24,7 +24,7 @@
 if command -v dbus-test-runner > /dev/null ; then
     echo "Using dbus-test-runner"
     export SSO_LOGGING_OUTPUT="stdout"
-    dbus-test-runner -m 180 --dbus-config=${DBUS_CONFIG} \
+    dbus-test-runner -m 600 --dbus-config=${DBUS_CONFIG} \
         -t "$@" --keep-env
 else
     echo "Using dbus-launch"

=== modified file 'tests/signond-tests/.gitignore'
--- tests/signond-tests/.gitignore	2014-11-17 09:59:40 +0000
+++ tests/signond-tests/.gitignore	2016-08-24 14:26:52 +0000
@@ -5,4 +5,5 @@
 /tst_backup
 /tst_database
 /tst_pluginproxy
+/tst_signond
 /tst_timeouts

=== modified file 'tests/signond-tests/backuptest.cpp'
--- tests/signond-tests/backuptest.cpp	2013-08-20 08:01:43 +0000
+++ tests/signond-tests/backuptest.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/backuptest.h'
--- tests/signond-tests/backuptest.h	2012-08-27 13:42:05 +0000
+++ tests/signond-tests/backuptest.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/databasetest.cpp'
--- tests/signond-tests/databasetest.cpp	2014-08-21 08:46:18 +0000
+++ tests/signond-tests/databasetest.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/databasetest.h'
--- tests/signond-tests/databasetest.h	2012-08-27 13:59:00 +0000
+++ tests/signond-tests/databasetest.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== added file 'tests/signond-tests/fake_signonui.h'
--- tests/signond-tests/fake_signonui.h	1970-01-01 00:00:00 +0000
+++ tests/signond-tests/fake_signonui.h	2016-08-24 14:26:52 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of signond
+ *
+ * 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 SSO_FAKE_SIGNONUI_H
+#define SSO_FAKE_SIGNONUI_H
+
+#include <QVariantMap>
+#include <libqtdbusmock/DBusMock.h>
+
+class FakeSignOnUi
+{
+public:
+    FakeSignOnUi(QtDBusMock::DBusMock *mock): m_mock(mock) {
+        m_mock->registerTemplate("com.nokia.singlesignonui",
+                                 SIGNONUI_MOCK_TEMPLATE,
+                                 QDBusConnection::SessionBus);
+    }
+
+    void setNextReply(const QVariantMap &reply) {
+        mockedService().call("SetNextReply", reply);
+    }
+
+    OrgFreedesktopDBusMockInterface &mockedService() {
+        return m_mock->mockInterface("com.nokia.singlesignonui",
+                                     "/SignonUi",
+                                     "com.nokia.singlesignonui",
+                                     QDBusConnection::SessionBus);
+    }
+
+private:
+    QtDBusMock::DBusMock *m_mock;
+};
+
+#endif // SSO_FAKE_SIGNONUI_H

=== modified file 'tests/signond-tests/identity-tool.cpp'
--- tests/signond-tests/identity-tool.cpp	2013-08-20 08:01:44 +0000
+++ tests/signond-tests/identity-tool.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/identity-tool.pro'
--- tests/signond-tests/identity-tool.pro	2015-10-27 09:58:39 +0000
+++ tests/signond-tests/identity-tool.pro	2016-08-24 14:26:52 +0000
@@ -6,11 +6,7 @@
 QT += core
 QT -= gui
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBS += -lsignon-qt5
-} else {
-    LIBS += -lsignon-qt
-}
+LIBS += -lsignon-qt5
 
 QMAKE_LIBDIR += \
     $${TOP_BUILD_DIR}/lib/signond/SignOn \

=== modified file 'tests/signond-tests/include.cpp'
--- tests/signond-tests/include.cpp	2013-08-20 08:01:43 +0000
+++ tests/signond-tests/include.cpp	2016-08-24 14:26:52 +0000
@@ -3,6 +3,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro'
--- tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro	2015-10-27 09:58:39 +0000
+++ tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro	2016-08-24 14:26:52 +0000
@@ -6,11 +6,7 @@
 QT += core
 QT -= gui
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBS += -lsignon-qt5
-} else {
-    LIBS += -lsignon-qt
-}
+LIBS += -lsignon-qt5
 
 QMAKE_LIBDIR += \
     $${TOP_BUILD_DIR}/lib/signond/SignOn \

=== modified file 'tests/signond-tests/mock-ac-plugin/plugin.cpp'
--- tests/signond-tests/mock-ac-plugin/plugin.cpp	2013-08-20 08:01:44 +0000
+++ tests/signond-tests/mock-ac-plugin/plugin.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -39,7 +39,3 @@
     qDebug() << Q_FUNC_INFO;
     return new AccessControlManager(parent);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(mock-ac, Plugin);
-#endif

=== modified file 'tests/signond-tests/mock-ac-plugin/plugin.h'
--- tests/signond-tests/mock-ac-plugin/plugin.h	2013-08-20 08:01:44 +0000
+++ tests/signond-tests/mock-ac-plugin/plugin.h	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -30,9 +30,7 @@
 {
     Q_OBJECT
     Q_INTERFACES(SignOn::ExtensionInterface3)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SingleSignOn.ExtensionInterface/3.0")
-#endif
 
 public:
     Plugin(QObject *parent = 0);

=== added file 'tests/signond-tests/session_tool.cpp'
--- tests/signond-tests/session_tool.cpp	1970-01-01 00:00:00 +0000
+++ tests/signond-tests/session_tool.cpp	2016-08-24 14:26:52 +0000
@@ -0,0 +1,125 @@
+/*
+ * This file is part of signond
+ *
+ * Copyright (C) 2016 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 <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusError>
+#include <QDBusInterface>
+#include <QDBusMessage>
+#include <QTextStream>
+#include <QTimer>
+
+#include "signond/signoncommon.h"
+
+class AuthSession: public QObject
+{
+    Q_OBJECT
+
+public:
+    AuthSession(const QString &path);
+    ~AuthSession();
+
+public Q_SLOTS:
+    void process(const QVariantMap &sessionData);
+    void onResponse(const QVariantMap &response);
+    void onError(const QDBusError &error);
+
+private:
+    QTextStream m_out;
+    QDBusInterface *m_dbus;
+};
+
+AuthSession::AuthSession(const QString &path):
+    QObject(),
+    m_out(stdout)
+{
+    m_dbus = new QDBusInterface(SIGNOND_SERVICE,
+                                path,
+                                QLatin1String(SIGNOND_AUTH_SESSION_INTERFACE),
+                                QDBusConnection::sessionBus());
+}
+
+AuthSession::~AuthSession()
+{
+    delete m_dbus;
+}
+
+void AuthSession::process(const QVariantMap &sessionData)
+{
+    QVariantList arguments;
+    arguments += sessionData;
+    arguments += QStringLiteral("mech1");
+
+    QDBusMessage msg = QDBusMessage::createMethodCall(m_dbus->service(),
+                                                      m_dbus->path(),
+                                                      m_dbus->interface(),
+                                                      QStringLiteral("process"));
+    msg.setArguments(arguments);
+
+    m_dbus->connection().callWithCallback(msg, this,
+                                          SLOT(onResponse(const QVariantMap&)),
+                                          SLOT(onError(const QDBusError&)),
+                                          SIGNOND_MAX_TIMEOUT);
+}
+
+void AuthSession::onResponse(const QVariantMap &response)
+{
+    // The called doesn't really care about the response value
+    Q_UNUSED(response);
+    m_out << "Response:";
+    QCoreApplication::quit();
+}
+
+void AuthSession::onError(const QDBusError &error)
+{
+    m_out << "Error:" << error.name();
+    QCoreApplication::quit();
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QString sessionPath;
+
+    QStringList args = QCoreApplication::arguments();
+    for (int i = 1; i < args.count(); i++) {
+        if (args[i] == "--sessionPath") {
+            sessionPath = args[++i];
+        }
+    }
+
+    AuthSession authSession(sessionPath);
+
+    QVariantMap sessionData {
+        { "Secret", QStringLiteral("testSecret") },
+        { "UserName", QStringLiteral("testUsername") },
+    };
+    authSession.process(sessionData);
+
+    QTimer::singleShot(10*1000, &app, SLOT(quit()));
+    app.exec();
+
+    return 0;
+}
+
+#include "session_tool.moc"

=== added file 'tests/signond-tests/session_tool.pro'
--- tests/signond-tests/session_tool.pro	1970-01-01 00:00:00 +0000
+++ tests/signond-tests/session_tool.pro	2016-08-24 14:26:52 +0000
@@ -0,0 +1,13 @@
+include(../../common-project-config.pri)
+
+TEMPLATE = app
+TARGET = session_tool
+
+QT += core dbus
+QT -= gui
+
+INCLUDEPATH += \
+    $${TOP_SRC_DIR}/lib
+
+SOURCES = \
+    session_tool.cpp

=== modified file 'tests/signond-tests/signond-tests.pri'
--- tests/signond-tests/signond-tests.pri	2015-10-27 09:58:39 +0000
+++ tests/signond-tests/signond-tests.pri	2016-08-24 14:26:52 +0000
@@ -12,12 +12,9 @@
 
 QT -= gui
 
-LIBS += -lsignon-extension
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBS += -lsignon-qt5
-} else {
-    LIBS += -lsignon-qt
-}
+LIBS += \
+    -lsignon-extension \
+    -lsignon-qt5
 
 QMAKE_LIBDIR += \
     $${TOP_BUILD_DIR}/lib/signond/SignOn \

=== modified file 'tests/signond-tests/signond-tests.pro'
--- tests/signond-tests/signond-tests.pro	2015-02-03 14:59:11 +0000
+++ tests/signond-tests/signond-tests.pro	2016-08-24 14:26:52 +0000
@@ -7,5 +7,12 @@
     tst_database.pro \
     access-control.pro \
 
+system(pkg-config --exists libqtdbusmock-1) {
+    SUBDIRS += \
+        session_tool.pro \
+        tst_signond.pro
+    tst_signond.depends += session_tool
+}
+
 # Disabled until fixed
 #SUBDIRS += tst_backup.pro

=== added file 'tests/signond-tests/signonui.py'
--- tests/signond-tests/signonui.py	1970-01-01 00:00:00 +0000
+++ tests/signond-tests/signonui.py	2016-08-24 14:26:52 +0000
@@ -0,0 +1,55 @@
+'''signonui mock template
+
+This creates the expected methods and properties of the
+com.nokia.singlesignonui service.
+'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 2.1 of the License.  See
+# http://www.gnu.org/copyleft/lgpl.html for the full text of the license.
+
+__author__ = 'Alberto Mardegan'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2016 Canonical Ltd.'
+__license__ = 'LGPL 2.1'
+
+import dbus
+import time
+
+from dbusmock import MOCK_IFACE
+import dbusmock
+
+BUS_NAME = 'com.nokia.singlesignonui'
+MAIN_OBJ = '/SignonUi'
+MAIN_SERVICE_IFACE = 'com.nokia.singlesignonui'
+MAIN_IFACE = MAIN_SERVICE_IFACE
+SYSTEM_BUS = False
+
+
+def query_dialog(self, params):
+    if self.nextReplyError:
+        raise dbus.exceptions.DBusException('SignOnUi error',
+                                            name=self.nextReplyError)
+    return self.nextReplyData
+
+
+def load(mock, parameters):
+    mock.query_dialog = query_dialog
+    mock.refresh_dialog = query_dialog
+    mock.AddMethods(MAIN_SERVICE_IFACE, [
+        ('queryDialog', 'a{sv}', 'a{sv}', 'ret = self.query_dialog(self, args[0])'),
+        ('refreshDialog', 'a{sv}', 'a{sv}', 'ret = self.refresh_dialog(self, args[0])'),
+        ('cancelUiRequest', 's', '', 'ret = None'),
+        ('removeIdentityData', 'u', '', 'ret = None'),
+    ])
+
+    mock.nextReplyData = {}
+    mock.nextReplyError = ''
+
+
[e-mail](MOCK_IFACE, in_signature='a{sv}', out_signature='')
+def SetNextReply(self, data):
+    self.nextReplyData = data.get('data', {})
+    self.nextReplyError = data.get('error', '')
+

=== modified file 'tests/signond-tests/testpluginproxy.cpp'
--- tests/signond-tests/testpluginproxy.cpp	2013-08-20 08:01:43 +0000
+++ tests/signond-tests/testpluginproxy.cpp	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/testpluginproxy.h'
--- tests/signond-tests/testpluginproxy.h	2013-08-20 08:01:43 +0000
+++ tests/signond-tests/testpluginproxy.h	2016-08-24 14:26:52 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/timeouts.cpp'
--- tests/signond-tests/timeouts.cpp	2014-11-17 09:37:35 +0000
+++ tests/signond-tests/timeouts.cpp	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/timeouts.h'
--- tests/signond-tests/timeouts.h	2012-08-27 13:42:05 +0000
+++ tests/signond-tests/timeouts.h	2016-08-24 14:26:52 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/tst_access_control.cpp'
--- tests/signond-tests/tst_access_control.cpp	2013-08-20 08:01:44 +0000
+++ tests/signond-tests/tst_access_control.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/signond-tests/tst_access_control_manager_helper.cpp'
--- tests/signond-tests/tst_access_control_manager_helper.cpp	2014-11-17 11:53:47 +0000
+++ tests/signond-tests/tst_access_control_manager_helper.cpp	2016-08-24 14:26:52 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of signon
  *
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== added file 'tests/signond-tests/tst_signond.cpp'
--- tests/signond-tests/tst_signond.cpp	1970-01-01 00:00:00 +0000
+++ tests/signond-tests/tst_signond.cpp	2016-08-24 14:26:52 +0000
@@ -0,0 +1,648 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of signond
+ *
+ * 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 <QDebug>
+#include <QDir>
+#include <QProcess>
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include <QTest>
+#include <libqtdbusmock/DBusMock.h>
+#include <signal.h>
+#include <sys/types.h>
+
+#include "SignOn/UiSessionData"
+#include "signond/signoncommon.h"
+
+#include "fake_signonui.h"
+
+namespace QTest {
+template<>
+char *toString(const QSet<QString> &set)
+{
+    QByteArray ba = "QSet<QString>(";
+    QStringList list = set.toList();
+    ba += list.join(", ");
+    ba += ")";
+    return qstrdup(ba.data());
+}
+} // QTest namespace
+
+using namespace QtDBusMock;
+
+class SignondTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    SignondTest();
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanup();
+    void testStart();
+    void testQueryMethods();
+    void testQueryMechanisms_data();
+    void testQueryMechanisms();
+    void testIdentityCreation();
+    void testIdentityRemoval();
+    void testIdentityReferences();
+    void testAuthSessionMechanisms_data();
+    void testAuthSessionMechanisms();
+    void testAuthSessionProcess();
+    void testAuthSessionProcessFromOtherProcess();
+    void testAuthSessionProcessUi();
+    void testAuthSessionCloseUi_data();
+    void testAuthSessionCloseUi();
+
+private:
+    void setupEnvironment();
+    bool signondIsRunning();
+    bool killSignond();
+    void clearBaseDir();
+    const QDBusConnection &connection() { return m_dbus.sessionConnection(); }
+    QDBusMessage methodCall(const QString &path, const QString &interface,
+                            const QString &method) {
+        return QDBusMessage::createMethodCall(SIGNOND_SERVICE, path,
+                                              interface, method);
+    }
+    bool replyIsValid(const QDBusMessage &reply);
+    QString createIdentity(const QVariantMap &data, uint *id = 0);
+
+private:
+    QTemporaryDir m_baseDir;
+    QtDBusTest::DBusTestRunner m_dbus;
+    QtDBusMock::DBusMock m_mock;
+    FakeSignOnUi m_signonUi;
+};
+
+static bool mapIsSuperset(const QVariantMap &superSet, const QVariantMap &set)
+{
+    QMapIterator<QString, QVariant> it(set);
+    while (it.hasNext()) {
+        it.next();
+        if (!superSet.contains(it.key())) {
+            qDebug() << "Missing key" << it.key();
+            return false;
+        }
+        if (superSet.value(it.key()) != it.value()) {
+            qDebug() << it.key() << "is" << superSet.value(it.key()) << " expecting " << it.value();
+            return false;
+        }
+    }
+
+    return true;
+}
+
+SignondTest::SignondTest():
+    QObject(0),
+    m_dbus((setupEnvironment(), TEST_DBUS_CONFIG_FILE)),
+    m_mock(m_dbus),
+    m_signonUi(&m_mock)
+{
+    DBusMock::registerMetaTypes();
+}
+
+void SignondTest::setupEnvironment()
+{
+    QVERIFY(m_baseDir.isValid());
+    QByteArray baseDirPath = m_baseDir.path().toUtf8();
+    QDir baseDir(m_baseDir.path());
+
+    qunsetenv("XDG_DATA_DIR");
+    qputenv("BUILDDIR", BUILDDIR);
+    qputenv("HOME", baseDirPath);
+    qputenv("XDG_RUNTIME_DIR", baseDirPath + "/runtime-dir");
+    baseDir.mkpath("runtime-dir");
+    qputenv("SSO_STORAGE_PATH", baseDirPath);
+    qputenv("SSO_EXTENSIONS_DIR", baseDirPath + "/non-existing-dir");
+    qputenv("SSO_USE_PEER_BUS", "0");
+    qputenv("SSO_LOGGING_LEVEL", "2");
+    qputenv("SSO_PLUGINS_DIR", BUILDDIR "/src/plugins/test");
+    QByteArray ldLibraryPath = qgetenv("LD_LIBRARY_PATH");
+    qputenv("LD_LIBRARY_PATH",
+            BUILDDIR "/lib/plugins:"
+            BUILDDIR "/lib/plugins/signon-plugins-common:"
+            BUILDDIR "/lib/signond/SignOn:" +
+            ldLibraryPath);
+    QByteArray execPath = qgetenv("PATH");
+    qputenv("PATH",
+            BUILDDIR "/src/remotepluginprocess:" +
+            execPath);
+
+    /* Make sure we accidentally don't talk to the developer's signond running
+     * in the session bus */
+    qunsetenv("DBUS_SESSION_BUS_ADDRESS");
+}
+
+bool SignondTest::replyIsValid(const QDBusMessage &msg)
+{
+    if (msg.type() == QDBusMessage::ErrorMessage) {
+        qDebug() << "Error name:" << msg.errorName();
+        qDebug() << "Error text:" << msg.errorMessage();
+    }
+    return msg.type() == QDBusMessage::ReplyMessage;
+}
+
+bool SignondTest::signondIsRunning()
+{
+    return connection().
+        interface()->isServiceRegistered(SIGNOND_SERVICE).value();
+}
+
+bool SignondTest::killSignond()
+{
+    uint pid = connection().interface()->servicePid(SIGNOND_SERVICE).value();
+    if (pid == 0) return true;
+    return kill(pid, SIGTERM) == 0 || errno == ESRCH;
+}
+
+void SignondTest::clearBaseDir()
+{
+    QDir baseDir(m_baseDir.path());
+    baseDir.removeRecursively();
+    baseDir.mkpath(".");
+}
+
+QString SignondTest::createIdentity(const QVariantMap &data, uint *id)
+{
+    QDBusMessage msg = methodCall(SIGNOND_DAEMON_OBJECTPATH,
+                                  SIGNOND_DAEMON_INTERFACE,
+                                  "registerNewIdentity");
+    QDBusMessage reply = connection().call(msg);
+    if (!replyIsValid(reply)) return QString();
+
+    QString objectPath =
+        reply.arguments()[0].value<QDBusObjectPath>().path();
+
+    msg = methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "store");
+    msg << data;
+    reply = connection().call(msg);
+    if (!replyIsValid(reply)) return QString();
+
+    if (id) {
+        *id = reply.arguments()[0].toUInt();
+    }
+    return objectPath;
+}
+
+void SignondTest::initTestCase()
+{
+    m_dbus.startServices();
+}
+
+void SignondTest::cleanup()
+{
+    if (QTest::currentTestFailed()) {
+        m_baseDir.setAutoRemove(false);
+        qDebug() << "Base dir:" << m_baseDir.path();
+    }
+}
+
+void SignondTest::testStart()
+{
+    QVERIFY(killSignond());
+    QTRY_VERIFY(!signondIsRunning());
+
+    QDBusMessage reply =
+        connection().interface()->call("StartServiceByName",
+                                       SIGNOND_SERVICE, uint(0));
+    QVERIFY(replyIsValid(reply));
+    QTRY_VERIFY(signondIsRunning());
+}
+
+void SignondTest::testQueryMethods()
+{
+    QDBusMessage msg = methodCall(SIGNOND_DAEMON_OBJECTPATH,
+                                  SIGNOND_DAEMON_INTERFACE,
+                                  "queryMethods");
+    QDBusMessage reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+    QCOMPARE(reply.arguments().count(), 1);
+    QStringList methods = reply.arguments()[0].toStringList();
+    QStringList expectedMethods { "ssotest", "ssotest2" };
+    QCOMPARE(methods.toSet(), expectedMethods.toSet());
+}
+
+void SignondTest::testQueryMechanisms_data()
+{
+    QTest::addColumn<QString>("method");
+    QTest::addColumn<QStringList>("expectedMechanisms");
+
+    QTest::newRow("ssotest") <<
+        "ssotest" << QStringList { "mech1", "mech2", "mech3", "BLOB" };
+    QTest::newRow("ssotest2") <<
+        "ssotest2" << QStringList { "mech1", "mech2", "mech3" };
+}
+
+void SignondTest::testQueryMechanisms()
+{
+    QFETCH(QString, method);
+    QFETCH(QStringList, expectedMechanisms);
+
+    QDBusMessage msg = methodCall(SIGNOND_DAEMON_OBJECTPATH,
+                                  SIGNOND_DAEMON_INTERFACE,
+                                  "queryMechanisms");
+    msg << method;
+    QDBusMessage reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QCOMPARE(reply.arguments().count(), 1);
+    QStringList mechanisms = reply.arguments()[0].toStringList();
+    QCOMPARE(mechanisms.toSet(), expectedMechanisms.toSet());
+}
+
+void SignondTest::testIdentityCreation()
+{
+    QDBusMessage msg = methodCall(SIGNOND_DAEMON_OBJECTPATH,
+                                  SIGNOND_DAEMON_INTERFACE,
+                                  "registerNewIdentity");
+    QDBusMessage reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QCOMPARE(reply.arguments().count(), 1);
+
+    QString objectPath =
+        reply.arguments()[0].value<QDBusObjectPath>().path();
+    QVERIFY(objectPath.startsWith('/'));
+
+    QVariantMap identityData {
+        { SIGNOND_IDENTITY_INFO_USERNAME, "John" },
+        { SIGNOND_IDENTITY_INFO_CAPTION, "John's account" },
+        { SIGNOND_IDENTITY_INFO_ACL, QStringList { "*" } },
+    };
+    msg = methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "store");
+    msg << identityData;
+    reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    uint id = reply.arguments()[0].toUInt();
+    QVERIFY(id != 0);
+
+    /* Read the current identity info */
+    msg = methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "getInfo");
+    reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QVariantMap storedData = QDBusReply<QVariantMap>(reply).value();
+    QVERIFY(mapIsSuperset(storedData, identityData));
+
+    /* Reload the identity */
+    msg = methodCall(SIGNOND_DAEMON_OBJECTPATH, SIGNOND_DAEMON_INTERFACE,
+                     "getIdentity");
+    msg << id;
+    reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QCOMPARE(reply.arguments().count(), 2);
+    objectPath = reply.arguments()[0].value<QDBusObjectPath>().path();
+    QVERIFY(objectPath.startsWith('/'));
+    storedData =
+        qdbus_cast<QVariantMap>(reply.arguments()[1].value<QDBusArgument>());
+    QVERIFY(mapIsSuperset(storedData, identityData));
+
+    /* Query identities */
+    msg = methodCall(SIGNOND_DAEMON_OBJECTPATH, SIGNOND_DAEMON_INTERFACE,
+                     "queryIdentities");
+    msg << QVariantMap();
+    reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QCOMPARE(reply.arguments().count(), 1);
+    QList<QVariantMap> identities =
+        qdbus_cast<QList<QVariantMap>>(reply.arguments()[0].value<QDBusArgument>());
+    QCOMPARE(identities.count(), 1);
+    storedData = identities[0];
+    QVERIFY(mapIsSuperset(storedData, identityData));
+}
+
+void SignondTest::testIdentityRemoval()
+{
+    m_signonUi.mockedService().ClearCalls().waitForFinished();
+
+    QVariantMap identityData {
+        { SIGNOND_IDENTITY_INFO_USERNAME, "John Deleteme" },
+        { SIGNOND_IDENTITY_INFO_CAPTION, "John's account" },
+        { SIGNOND_IDENTITY_INFO_ACL, QStringList { "*" } },
+    };
+    uint id;
+    QString objectPath = createIdentity(identityData, &id);
+    QVERIFY(objectPath.startsWith('/'));
+    QVERIFY(id > 0);
+
+    QDBusMessage msg =
+        methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "remove");
+    QDBusMessage reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    /* Check that signonui has been asked to remove its data */
+    QList<MethodCall> calls =
+        m_signonUi.mockedService().GetMethodCalls("removeIdentityData");
+    QCOMPARE(calls.count(), 1);
+    MethodCall call = calls.first();
+    QCOMPARE(call.args().count(), 1);
+    QCOMPARE(call.args().first().toUInt(), id);
+
+    /* Read the current identity info */
+    msg = methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "getInfo");
+    reply = connection().call(msg);
+    QCOMPARE(reply.type(), QDBusMessage::ErrorMessage);
+
+    /* Load the identity again */
+    msg = methodCall(SIGNOND_DAEMON_OBJECTPATH, SIGNOND_DAEMON_INTERFACE,
+                     "getIdentity");
+    msg << id;
+    reply = connection().call(msg);
+    QCOMPARE(reply.type(), QDBusMessage::ErrorMessage);
+}
+
+void SignondTest::testIdentityReferences()
+{
+    QVariantMap identityData {
+        { SIGNOND_IDENTITY_INFO_USERNAME, "John" },
+        { SIGNOND_IDENTITY_INFO_CAPTION, "John's account" },
+        { SIGNOND_IDENTITY_INFO_ACL, QStringList { "*" } },
+    };
+    QString objectPath = createIdentity(identityData);
+
+    /* Read the current identity info */
+    QDBusMessage msg =
+        methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "getInfo");
+    QDBusMessage reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QVariantMap storedData = QDBusReply<QVariantMap>(reply).value();
+    QCOMPARE(storedData.value(SIGNOND_IDENTITY_INFO_REFCOUNT).toInt(), 0);
+
+    /* Add a reference */
+    msg = methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "addReference");
+    msg << "hello";
+    reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    /* Check new refcount */
+    msg = methodCall(objectPath, SIGNOND_IDENTITY_INTERFACE, "getInfo");
+    reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+    storedData = QDBusReply<QVariantMap>(reply).value();
+    QEXPECT_FAIL("", "refcount not updated: https://gitlab.com/accounts-sso/signond/issues/1", Continue);
+    QCOMPARE(storedData.value(SIGNOND_IDENTITY_INFO_REFCOUNT).toInt(), 1);
+}
+
+void SignondTest::testAuthSessionMechanisms_data()
+{
+    QTest::addColumn<QString>("method");
+    QTest::addColumn<QStringList>("wantedMechanisms");
+    QTest::addColumn<QStringList>("expectedMechanisms");
+
+    QTest::newRow("ssotest - any") <<
+        "ssotest" <<
+        QStringList {} <<
+        QStringList { "mech1", "mech2", "mech3", "BLOB" };
+    QTest::newRow("ssotest - subset") <<
+        "ssotest" <<
+        QStringList { "BLOB", "mech1" } <<
+        QStringList { "BLOB", "mech1" };
+    QTest::newRow("ssotest2 - any") <<
+        "ssotest2" <<
+        QStringList {} <<
+        QStringList { "mech1", "mech2", "mech3" };
+    QTest::newRow("ssotest2 - mix") <<
+        "ssotest2" <<
+        QStringList { "BLOB", "mech1" } <<
+        QStringList { "mech1" };
+}
+
+void SignondTest::testAuthSessionMechanisms()
+{
+    QFETCH(QString, method);
+    QFETCH(QStringList, wantedMechanisms);
+    QFETCH(QStringList, expectedMechanisms);
+
+    QDBusMessage msg = methodCall(SIGNOND_DAEMON_OBJECTPATH,
+                                  SIGNOND_DAEMON_INTERFACE,
+                                  "getAuthSessionObjectPath");
+    msg << uint(0);
+    msg << method;
+    QDBusMessage reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QCOMPARE(reply.arguments().count(), 1);
+
+    QString objectPath = reply.arguments()[0].toString();
+    QVERIFY(objectPath.startsWith('/'));
+
+    /* Check the available mechanisms */
+    msg = methodCall(objectPath, SIGNOND_AUTH_SESSION_INTERFACE,
+                     "queryAvailableMechanisms");
+    msg << wantedMechanisms;
+    reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QStringList mechanisms = QDBusReply<QStringList>(reply).value();
+    QCOMPARE(mechanisms.toSet(), expectedMechanisms.toSet());
+}
+
+void SignondTest::testAuthSessionProcess()
+{
+    QDBusMessage msg = methodCall(SIGNOND_DAEMON_OBJECTPATH,
+                                  SIGNOND_DAEMON_INTERFACE,
+                                  "getAuthSessionObjectPath");
+    msg << uint(0);
+    msg << QString("ssotest");
+    QDBusMessage reply = connection().call(msg);
+    QVERIFY(replyIsValid(reply));
+
+    QCOMPARE(reply.arguments().count(), 1);
+
+    QString objectPath = reply.arguments()[0].toString();
+    QVERIFY(objectPath.startsWith('/'));
+