Merge lp:~mardy/ubuntu-system-settings-online-accounts/rtm-fixes into lp:ubuntu-system-settings-online-accounts/rtm-14.09

[Alberto Mardegan]

Backport of two bugfixes:

- Handle early authentication requests in the same trust session
- Handle requests from unconfined applications

Backport of two bugfixes:

- Handle early authentication requests in the same trust session
- Handle requests from unconfined applications

[David Barth (dbarth)]

review: Approve

[lp:~mardy/ubuntu-system-settings-online-accounts/rtm-fixes]

204. By Alberto Mardegan on 2014-12-08

Implement QML dialog for password queries

Authentication plugins can request SignOnUi to show a login form to the user. Support for this action is implemented by unity7's signon-ui, but was never implemented in this project.

205. By Alberto Mardegan on 2015-01-05

Make sure apps don't appear on top of each other

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-29 17:10:11 +0000
+++ debian/changelog	2015-01-08 13:59:01 +0000
@@ -1,3 +1,14 @@
+ubuntu-system-settings-online-accounts (0.5+14.10.20141029~rtm-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Backport a few bugfixes: 
+    - Handle requests from unconfined applications (LP: #1376445)
+    - Implement password prompt UI (LP: #1379863)
+    - Handle early authentication requests in the same trust session (LP:
+      #1380914)
+    - Make sure apps don't appear on top of each other (LP: #1384314)
+
+ -- Alberto Mardegan <[e-mail]>  Thu, 08 Jan 2015 14:55:37 +0100
+
 ubuntu-system-settings-online-accounts (0.5+14.10.20141029~rtm-0ubuntu1) 14.09; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/control'
--- debian/control	2014-10-28 17:51:37 +0000
+++ debian/control	2015-01-08 13:59:01 +0000
@@ -6,6 +6,7 @@
                pkg-config,
                python3:any,
                libaccounts-qt5-dev (>= 1.13),
+               libapparmor-dev,
                libclick-0.4-dev,
                libmirclient-dev [!powerpc !ppc64 !ppc64el],
                libnotify-dev,

=== modified file 'online-accounts-service/mir-helper-stub.cpp'
--- online-accounts-service/mir-helper-stub.cpp	2014-08-18 13:24:54 +0000
+++ online-accounts-service/mir-helper-stub.cpp	2015-01-08 13:59:01 +0000
@@ -62,8 +62,8 @@
     return m_instance;
 }
 
-PromptSession *MirHelper::createPromptSession(pid_t initiatorPid)
+PromptSessionP MirHelper::createPromptSession(pid_t initiatorPid)
 {
     Q_UNUSED(initiatorPid);
-    return 0;
+    return PromptSessionP();
 }

=== modified file 'online-accounts-service/mir-helper.cpp'
--- online-accounts-service/mir-helper.cpp	2014-09-04 14:33:01 +0000
+++ online-accounts-service/mir-helper.cpp	2015-01-08 13:59:01 +0000
@@ -24,8 +24,9 @@
 #include <mir_toolkit/mir_client_library.h>
 #include <mir_toolkit/mir_prompt_session.h>
 
-#include <QList>
+#include <QHash>
 #include <QStandardPaths>
+#include <QWeakPointer>
 
 using namespace OnlineAccountsUi;
 
@@ -36,12 +37,13 @@
 class PromptSessionPrivate
 {
 public:
-    inline PromptSessionPrivate(MirPromptSession *session);
+    inline PromptSessionPrivate(MirPromptSession *session, pid_t initiatorPid);
     inline ~PromptSessionPrivate();
 
     void emitFinished() { Q_EMIT q_ptr->finished(); }
 
     MirPromptSession *m_mirSession;
+    pid_t m_initiatorPid;
     QList<int> m_fds;
     mutable PromptSession *q_ptr;
 };
@@ -61,14 +63,16 @@
 private:
     friend class PromptSession;
     MirConnection *m_connection;
-    QList<PromptSession*> m_sessions;
+    QHash<pid_t,QWeakPointer<PromptSession> > m_sessions;
     mutable MirHelper *q_ptr;
 };
 
 } // namespace
 
-PromptSessionPrivate::PromptSessionPrivate(MirPromptSession *session):
-    m_mirSession(session)
+PromptSessionPrivate::PromptSessionPrivate(MirPromptSession *session,
+                                           pid_t initiatorPid):
+    m_mirSession(session),
+    m_initiatorPid(initiatorPid)
 {
 }
 
@@ -82,14 +86,13 @@
     d_ptr(priv)
 {
     priv->q_ptr = this;
-    MirHelperPrivate *helperPrivate = MirHelper::instance()->d_ptr;
-    helperPrivate->m_sessions.append(this);
 }
 
 PromptSession::~PromptSession()
 {
+    Q_D(PromptSession);
     MirHelperPrivate *helperPrivate = MirHelper::instance()->d_ptr;
-    helperPrivate->m_sessions.removeOne(this);
+    helperPrivate->m_sessions.remove(d->m_initiatorPid);
     delete d_ptr;
 }
 
@@ -153,7 +156,7 @@
 
 void MirHelperPrivate::onSessionStopped(MirPromptSession *mirSession)
 {
-    Q_FOREACH(PromptSession *session, m_sessions) {
+    Q_FOREACH(PromptSessionP session, m_sessions) {
         if (mirSession == session->d_ptr->m_mirSession) {
             session->d_ptr->emitFinished();
         }
@@ -177,7 +180,7 @@
         return 0;
     }
 
-    return new PromptSession(new PromptSessionPrivate(mirSession));
+    return new PromptSession(new PromptSessionPrivate(mirSession, initiatorPid));
 }
 
 MirHelper::MirHelper(QObject *parent):
@@ -199,10 +202,18 @@
     return m_instance;
 }
 
-PromptSession *MirHelper::createPromptSession(pid_t initiatorPid)
+PromptSessionP MirHelper::createPromptSession(pid_t initiatorPid)
 {
     Q_D(MirHelper);
-    return d->createPromptSession(initiatorPid);
+    PromptSessionP session = d->m_sessions.value(initiatorPid);
+    if (session.isNull()) {
+        PromptSession *s = d->createPromptSession(initiatorPid);
+        if (s) {
+            session = PromptSessionP(s);
+            d->m_sessions.insert(initiatorPid, session);
+        }
+    }
+    return session;
 }
 
 #include "mir-helper.moc"

=== modified file 'online-accounts-service/mir-helper.h'
--- online-accounts-service/mir-helper.h	2014-09-04 08:27:19 +0000
+++ online-accounts-service/mir-helper.h	2015-01-08 13:59:01 +0000
@@ -22,6 +22,7 @@
 #define OAU_MIR_HELPER_H
 
 #include <QObject>
+#include <QSharedPointer>
 
 namespace OnlineAccountsUi {
 
@@ -49,6 +50,8 @@
     Q_DECLARE_PRIVATE(PromptSession)
 };
 
+typedef QSharedPointer<PromptSession> PromptSessionP;
+
 class MirHelper: public QObject
 {
     Q_OBJECT
@@ -56,7 +59,7 @@
 public:
     static MirHelper *instance();
 
-    PromptSession *createPromptSession(pid_t initiatorPid);
+    PromptSessionP createPromptSession(pid_t initiatorPid);
 
 private:
     explicit MirHelper(QObject *parent = 0);

=== modified file 'online-accounts-service/request.cpp'
--- online-accounts-service/request.cpp	2014-08-06 13:49:45 +0000
+++ online-accounts-service/request.cpp	2015-01-08 13:59:01 +0000
@@ -65,6 +65,7 @@
     QVariantMap m_parameters;
     QString m_clientApparmorProfile;
     bool m_inProgress;
+    int m_delay;
 };
 
 } // namespace
@@ -78,7 +79,8 @@
     m_connection(connection),
     m_message(message),
     m_parameters(parameters),
-    m_inProgress(false)
+    m_inProgress(false),
+    m_delay(0)
 {
     m_clientApparmorProfile = findClientApparmorProfile();
 }
@@ -176,6 +178,18 @@
     return d->m_message.interface();
 }
 
+void Request::setDelay(int delay)
+{
+    Q_D(Request);
+    d->m_delay = delay;
+}
+
+int Request::delay() const
+{
+    Q_D(const Request);
+    return d->m_delay;
+}
+
 void Request::cancel()
 {
     setCanceled();

=== modified file 'online-accounts-service/request.h'
--- online-accounts-service/request.h	2014-08-06 13:49:45 +0000
+++ online-accounts-service/request.h	2015-01-08 13:59:01 +0000
@@ -49,6 +49,9 @@
     QString clientApparmorProfile() const;
     QString interface() const;
 
+    void setDelay(int delay);
+    int delay() const;
+
 public Q_SLOTS:
     void cancel();
 

=== modified file 'online-accounts-service/ui-proxy.cpp'
--- online-accounts-service/ui-proxy.cpp	2014-09-04 09:44:53 +0000
+++ online-accounts-service/ui-proxy.cpp	2015-01-08 13:59:01 +0000
@@ -31,6 +31,7 @@
 #include <QProcess>
 #include <QProcessEnvironment>
 #include <QStandardPaths>
+#include <QTimer>
 #include <SignOn/uisessiondata_priv.h>
 
 using namespace OnlineAccountsUi;
@@ -58,17 +59,19 @@
     void onNewConnection();
     void onDataReady(QByteArray &data);
     void onRequestCompleted();
+    void onFinishedTimer();
 
 private:
     QProcess m_process;
     QLocalServer m_server;
     QLocalSocket *m_socket;
     OnlineAccountsUi::Ipc m_ipc;
+    QTimer m_finishedTimer;
     int m_nextRequestId;
     QMap<int,Request*> m_requests;
     QStringList m_handlers;
     pid_t m_clientPid;
-    PromptSession *m_promptSession;
+    PromptSessionP m_promptSession;
     mutable UiProxy *q_ptr;
 };
 
@@ -79,7 +82,6 @@
     m_socket(0),
     m_nextRequestId(0),
     m_clientPid(clientPid),
-    m_promptSession(0),
     q_ptr(uiProxy)
 {
     QObject::connect(&m_server, SIGNAL(newConnection()),
@@ -87,6 +89,10 @@
     QObject::connect(&m_ipc, SIGNAL(dataReady(QByteArray &)),
                      this, SLOT(onDataReady(QByteArray &)));
     m_process.setProcessChannelMode(QProcess::ForwardedChannels);
+
+    m_finishedTimer.setSingleShot(true);
+    QObject::connect(&m_finishedTimer, SIGNAL(timeout()),
+                     this, SLOT(onFinishedTimer()));
 }
 
 UiProxyPrivate::~UiProxyPrivate()
@@ -96,8 +102,6 @@
         request->cancel();
     }
 
-    delete m_promptSession;
-
     if (m_socket) {
         m_socket->abort();
         delete m_socket;
@@ -154,6 +158,7 @@
     QString code = map.value(OAU_OPERATION_CODE).toString();
     if (code == OAU_OPERATION_CODE_REQUEST_FINISHED) {
         Q_ASSERT(request);
+        request->setDelay(map.value(OAU_OPERATION_DELAY).toInt());
         request->setResult(map.value(OAU_OPERATION_DATA).toMap());
     } else if (code == OAU_OPERATION_CODE_REQUEST_FAILED) {
         Q_ASSERT(request);
@@ -192,18 +197,17 @@
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     if (!env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) return;
 
-    PromptSession *session =
+    PromptSessionP session =
         MirHelper::instance()->createPromptSession(m_clientPid);
     if (!session) return;
 
     QString mirSocket = session->requestSocket();
     if (mirSocket.isEmpty()) {
-        delete session;
         return;
     }
 
     m_promptSession = session;
-    QObject::connect(m_promptSession, SIGNAL(finished()),
+    QObject::connect(m_promptSession.data(), SIGNAL(finished()),
                      q, SIGNAL(finished()));
 
     env.insert("MIR_SOCKET", mirSocket);
@@ -251,17 +255,25 @@
     sendOperation(operation);
 }
 
+void UiProxyPrivate::onFinishedTimer()
+{
+    Q_Q(UiProxy);
+
+    if (m_requests.isEmpty()) {
+        Q_EMIT q->finished();
+    }
+}
+
 void UiProxyPrivate::onRequestCompleted()
 {
-    Q_Q(UiProxy);
-
     Request *request = qobject_cast<Request*>(sender());
+    Q_ASSERT(request);
+    m_finishedTimer.setInterval(request->delay());
+    m_finishedTimer.start();
+
     int id = m_requests.key(request, -1);
     if (id != -1) {
         m_requests.remove(id);
-        if (m_requests.isEmpty()) {
-            Q_EMIT q->finished();
-        }
     }
 }
 

=== added file 'online-accounts-ui/dialog-request.cpp'
--- online-accounts-ui/dialog-request.cpp	1970-01-01 00:00:00 +0000
+++ online-accounts-ui/dialog-request.cpp	2015-01-08 13:59:01 +0000
@@ -0,0 +1,286 @@
+/*
+ * This file is part of online-accounts-ui
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dialog-request.h"
+
+#include "debug.h"
+#include "dialog.h"
+#include "globals.h"
+#include "i18n.h"
+
+#include <OnlineAccountsPlugin/request-handler.h>
+#include <QDir>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <SignOn/uisessiondata_priv.h>
+
+using namespace SignOnUi;
+
+/* These fields are temporarily defined here; they'll be eventually moved to
+ * signond's include files. */
+#define SSOUI_KEY_USERNAME_TEXT QLatin1String("UserNameText")
+#define SSOUI_KEY_PASSWORD_TEXT QLatin1String("PasswordText")
+#define SSOUI_KEY_REGISTER_URL  QLatin1String("RegisterUrl")
+#define SSOUI_KEY_REGISTER_TEXT QLatin1String("RegisterText")
+#define SSOUI_KEY_LOGIN_TEXT QLatin1String("LoginText")
+
+namespace SignOnUi {
+
+class DialogRequestPrivate: public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PUBLIC(DialogRequest)
+    Q_PROPERTY(QString title READ title CONSTANT)
+    Q_PROPERTY(QString userName READ userName WRITE setUserName \
+               NOTIFY userNameChanged)
+    Q_PROPERTY(QString password READ password WRITE setPassword \
+               NOTIFY passwordChanged)
+    Q_PROPERTY(QString userNameText READ userNameText CONSTANT)
+    Q_PROPERTY(QString passwordText READ passwordText CONSTANT)
+    Q_PROPERTY(QString message READ message CONSTANT)
+    Q_PROPERTY(bool queryUserName READ queryUserName CONSTANT)
+    Q_PROPERTY(bool queryPassword READ queryPassword CONSTANT)
+    Q_PROPERTY(QUrl forgotPasswordUrl READ forgotPasswordUrl CONSTANT)
+    Q_PROPERTY(QString forgotPasswordText READ forgotPasswordText CONSTANT)
+    Q_PROPERTY(QUrl registerUrl READ registerUrl CONSTANT)
+    Q_PROPERTY(QString registerText READ registerText CONSTANT)
+    Q_PROPERTY(QString loginText READ loginText CONSTANT)
+
+public:
+    DialogRequestPrivate(DialogRequest *request);
+    ~DialogRequestPrivate();
+
+    void start();
+
+    QString title() const { return m_title; }
+    void setUserName(const QString &userName);
+    QString userName() const { return m_userName; }
+    void setPassword(const QString &password);
+    QString password() const { return m_password; }
+    QString userNameText() const { return m_userNameText; }
+    QString passwordText() const { return m_passwordText; }
+    QString message() const { return m_message; }
+    bool queryUserName() const { return m_queryUsername; }
+    bool queryPassword() const { return m_queryPassword; }
+    QUrl forgotPasswordUrl() const { return m_forgotPasswordUrl; }
+    QString forgotPasswordText() const { return m_forgotPasswordText; }
+    QUrl registerUrl() const { return m_registerUrl; }
+    QString registerText() const { return m_registerText; }
+    QString loginText() const { return m_loginText; }
+
+public Q_SLOTS:
+    void cancel();
+    void accept();
+
+Q_SIGNALS:
+    void userNameChanged();
+    void passwordChanged();
+
+private Q_SLOTS:
+    void onFinished();
+
+private:
+    void closeView();
+
+private:
+    Dialog *m_dialog;
+    QString m_title;
+    QString m_userName;
+    QString m_password;
+    QString m_userNameText;
+    QString m_passwordText;
+    QString m_message;
+    bool m_queryUsername;
+    bool m_queryPassword;
+    QUrl m_forgotPasswordUrl;
+    QString m_forgotPasswordText;
+    QUrl m_registerUrl;
+    QString m_registerText;
+    QString m_loginText;
+    mutable DialogRequest *q_ptr;
+};
+
+} // namespace
+
+DialogRequestPrivate::DialogRequestPrivate(DialogRequest *request):
+    QObject(request),
+    m_dialog(0),
+    m_queryUsername(false),
+    m_queryPassword(false),
+    q_ptr(request)
+{
+    const QVariantMap &params = q_ptr->parameters();
+
+    if (params.contains(SSOUI_KEY_TITLE)) {
+        m_title = params[SSOUI_KEY_TITLE].toString();
+    } else if (params.contains(SSOUI_KEY_CAPTION)) {
+        m_title = OnlineAccountsUi::_("Web authentication for %1",
+                                      SIGNONUI_I18N_DOMAIN).
+            arg(params[SSOUI_KEY_CAPTION].toString());
+    } else {
+        m_title = OnlineAccountsUi::_("Web authentication",
+                                      SIGNONUI_I18N_DOMAIN);
+    }
+
+    m_queryUsername = params.value(SSOUI_KEY_QUERYUSERNAME, false).toBool();
+    m_userName = params.value(SSOUI_KEY_USERNAME).toString();
+    m_userNameText = params.value(SSOUI_KEY_USERNAME_TEXT).toString();
+    if (m_userNameText.isEmpty()) {
+        m_userNameText = OnlineAccountsUi::_("Username:",
+                                             SIGNONUI_I18N_DOMAIN);
+    }
+
+    m_queryPassword = params.value(SSOUI_KEY_QUERYPASSWORD, false).toBool();
+    m_password = params.value(SSOUI_KEY_PASSWORD).toString();
+    m_passwordText = params.value(SSOUI_KEY_PASSWORD_TEXT).toString();
+    if (m_passwordText.isEmpty()) {
+        m_passwordText = OnlineAccountsUi::_("Password:",
+                                             SIGNONUI_I18N_DOMAIN);
+    }
+
+
+    m_message = params.value(SSOUI_KEY_MESSAGE).toString();
+
+    m_forgotPasswordUrl =
+        QUrl(params.value(SSOUI_KEY_FORGOTPASSWORDURL).toString());
+    m_forgotPasswordText = params.value(SSOUI_KEY_FORGOTPASSWORD).toString();
+
+    m_registerUrl =
+        QUrl(params.value(SSOUI_KEY_REGISTER_URL).toString());
+    m_registerText = params.value(SSOUI_KEY_REGISTER_TEXT).toString();
+
+    m_loginText = params.value(SSOUI_KEY_LOGIN_TEXT).toString();
+    if (m_loginText.isEmpty()) {
+        m_loginText = OnlineAccountsUi::_("Sign in");
+    }
+}
+
+DialogRequestPrivate::~DialogRequestPrivate()
+{
+    closeView();
+    delete m_dialog;
+}
+
+void DialogRequestPrivate::start()
+{
+    Q_Q(DialogRequest);
+
+    const QVariantMap &params = q->parameters();
+    DEBUG() << params;
+
+    if (!q->hasHandler()) {
+        m_dialog = new Dialog;
+        m_dialog->setTitle(m_title);
+
+        QObject::connect(m_dialog, SIGNAL(finished(int)),
+                         this, SLOT(onFinished()));
+
+        m_dialog->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
+        m_dialog->rootContext()->setContextProperty("request", this);
+        m_dialog->setSource(QUrl("qrc:/qml/SignOnUiDialog.qml"));
+        q->setWindow(m_dialog);
+    } else {
+        DEBUG() << "Setting request on handler";
+        q->handler()->setRequest(this);
+    }
+}
+
+void DialogRequestPrivate::accept()
+{
+    DEBUG() << "User accepted";
+    onFinished();
+}
+
+void DialogRequestPrivate::cancel()
+{
+    Q_Q(DialogRequest);
+
+    DEBUG() << "User requested to cancel";
+    q->setCanceled();
+    closeView();
+}
+
+void DialogRequestPrivate::setUserName(const QString &userName)
+{
+    if (userName == m_userName) return;
+    m_userName = userName;
+    Q_EMIT userNameChanged();
+}
+
+void DialogRequestPrivate::setPassword(const QString &password)
+{
+    if (password == m_password) return;
+    m_password = password;
+    Q_EMIT passwordChanged();
+}
+
+void DialogRequestPrivate::onFinished()
+{
+    Q_Q(DialogRequest);
+
+    DEBUG() << "Dialog closed";
+
+    QVariantMap reply;
+
+    if (m_queryUsername) {
+        reply[SSOUI_KEY_USERNAME] = m_userName;
+    }
+    if (m_queryPassword) {
+        reply[SSOUI_KEY_PASSWORD] = m_password;
+    }
+
+    closeView();
+
+    q->setResult(reply);
+}
+
+void DialogRequestPrivate::closeView()
+{
+    Q_Q(DialogRequest);
+
+    if (q->hasHandler()) {
+        q->handler()->setRequest(0);
+    } else if (m_dialog) {
+        m_dialog->close();
+    }
+}
+
+DialogRequest::DialogRequest(int id,
+                             const QString &clientProfile,
+                             const QVariantMap &parameters,
+                             QObject *parent):
+    Request(id, clientProfile, parameters, parent),
+    d_ptr(new DialogRequestPrivate(this))
+{
+}
+
+DialogRequest::~DialogRequest()
+{
+}
+
+void DialogRequest::start()
+{
+    Q_D(DialogRequest);
+
+    Request::start();
+    d->start();
+}
+
+#include "dialog-request.moc"

=== added file 'online-accounts-ui/dialog-request.h'
--- online-accounts-ui/dialog-request.h	1970-01-01 00:00:00 +0000
+++ online-accounts-ui/dialog-request.h	2015-01-08 13:59:01 +0000
@@ -0,0 +1,54 @@
+/*
+ * This file is part of online-accounts-ui
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SIGNON_UI_DIALOG_REQUEST_H
+#define SIGNON_UI_DIALOG_REQUEST_H
+
+#include "signonui-request.h"
+
+#include <QObject>
+
+namespace SignOnUi {
+
+class DialogRequestPrivate;
+
+class DialogRequest: public Request
+{
+    Q_OBJECT
+
+public:
+    explicit DialogRequest(int id,
+                           const QString &clientProfile,
+                           const QVariantMap &parameters,
+                           QObject *parent = 0);
+    ~DialogRequest();
+
+    // reimplemented virtual methods
+    void start();
+
+private:
+    DialogRequestPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(DialogRequest)
+};
+
+} // namespace
+
+#endif // SIGNON_UI_DIALOG_REQUEST_H
+

=== modified file 'online-accounts-ui/ipc.h'
--- online-accounts-ui/ipc.h	2014-08-06 13:49:45 +0000
+++ online-accounts-ui/ipc.h	2015-01-08 13:59:01 +0000
@@ -33,6 +33,7 @@
 #define OAU_OPERATION_CODE_REQUEST_FAILED "failed"
 #define OAU_OPERATION_ID "id"
 #define OAU_OPERATION_DATA "data"
+#define OAU_OPERATION_DELAY "delay"
 #define OAU_OPERATION_INTERFACE "interface"
 #define OAU_OPERATION_CLIENT_PROFILE "profile"
 #define OAU_OPERATION_ERROR_NAME "errname"

=== modified file 'online-accounts-ui/online-accounts-ui.pro'
--- online-accounts-ui/online-accounts-ui.pro	2014-10-28 18:18:54 +0000
+++ online-accounts-ui/online-accounts-ui.pro	2015-01-08 13:59:01 +0000
@@ -20,6 +20,7 @@
 
 PKGCONFIG += \
     accounts-qt5 \
+    libapparmor \
     libnotify \
     libsignon-qt5 \
     signon-plugins-common
@@ -47,6 +48,7 @@
     browser-request.cpp \
     debug.cpp \
     dialog.cpp \
+    dialog-request.cpp \
     i18n.cpp \
     ipc.cpp \
     main.cpp \
@@ -62,6 +64,7 @@
     browser-request.h \
     debug.h \
     dialog.h \
+    dialog-request.h \
     i18n.h \
     ipc.h \
     notification.h \

=== modified file 'online-accounts-ui/provider-request.cpp'
--- online-accounts-ui/provider-request.cpp	2014-10-03 14:56:11 +0000
+++ online-accounts-ui/provider-request.cpp	2015-01-08 13:59:01 +0000
@@ -24,8 +24,6 @@
 #include "provider-request.h"
 
 #include <OnlineAccountsPlugin/application-manager.h>
-#include <QDesktopServices>
-#include <QGuiApplication>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQuickItem>
@@ -149,14 +147,6 @@
 
     if (!visible) {
         q->setResult(QVariantMap());
-        /* FIXME HACK: remove when window reparenting is implemented */
-        QString profile =
-            m_applicationInfo.value(QStringLiteral("profile")).toString();
-        if (QGuiApplication::platformName().startsWith("ubuntu") &&
-            !profile.isEmpty()) {
-            QDesktopServices::openUrl(
-                QUrl(QString("application:///%1.desktop").arg(profile)));
-        }
     }
 }
 
@@ -172,10 +162,16 @@
 {
     Q_Q(ProviderRequest);
     DEBUG() << "Access allowed for account:" << accountId;
+    /* If the request came from an app, add a small delay so that we could
+     * serve an authentication request coming right after this one. */
+    if (m_applicationInfo.value("id").toString() !=
+        QStringLiteral("system-settings")) {
+        q->setDelay(3000);
+    }
     QVariantMap result;
     result.insert(OAU_KEY_ACCOUNT_ID, quint32(accountId));
     q->setResult(result);
-    m_view->close();
+    /* We keep the view opened */
 }
 
 ProviderRequest::ProviderRequest(const QString &interface,

=== modified file 'online-accounts-ui/qml/ProviderRequest.qml'
--- online-accounts-ui/qml/ProviderRequest.qml	2014-10-08 09:43:28 +0000
+++ online-accounts-ui/qml/ProviderRequest.qml	2015-01-08 13:59:01 +0000
@@ -51,6 +51,8 @@
     on__CreatedAccountIdChanged: grantAccessIfReady()
     onDenied: wasDenied = true
 
+    onAllowed: loader.sourceComponent = spinnerComponent
+
     PageStack {
         id: pageStack
 
@@ -140,6 +142,18 @@
     }
 
     Component {
+        id: spinnerComponent
+        Item {
+            ActivityIndicator {
+                anchors.centerIn: parent
+                width: units.gu(5)
+                height: width
+                running: true
+            }
+        }
+    }
+
+    Component {
         id: accountServiceComponent
         AccountService {
             autoSync: false

=== added file 'online-accounts-ui/qml/SignOnUiDialog.qml'
--- online-accounts-ui/qml/SignOnUiDialog.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-ui/qml/SignOnUiDialog.qml	2015-01-08 13:59:01 +0000
@@ -0,0 +1,115 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+MainView {
+    id: root
+
+    property var signonRequest: request
+
+    width: units.gu(60)
+    height: units.gu(90)
+
+    Page {
+        title: signonRequest.title
+
+        Column {
+            id: loginForm
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListItem.Caption {
+                visible: signonRequest.message !== ""
+                text: signonRequest.message
+            }
+
+            Label {
+                id: userNameLabel
+                visible: signonRequest.queryUserName
+                text: signonRequest.userNameText
+            }
+
+            TextField {
+                id: userNameField
+                visible: signonRequest.queryUserName
+                text: signonRequest.userName
+                onTextChanged: signonRequest.userName = text
+            }
+
+            Column {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                visible: signonRequest.queryPassword
+
+                Label {
+                    id: passwordLabel
+                    text: signonRequest.passwordText
+                }
+
+                TextField {
+                    id: passwordField
+                    text: signonRequest.password
+                    echoMode: TextInput.Password
+                    onTextChanged: signonRequest.password = text
+                    Keys.onReturnPressed: signonRequest.accept()
+                } 
+                Label {
+                    visible: signonRequest.forgotPasswordUrl.toString() !== ""
+                    text: "<a href=\"" + signonRequest.forgotPasswordUrl + "\">" +
+                        signonRequest.forgotPasswordText + "</a>"
+                }
+            }
+        }
+
+        Item {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: loginForm.bottom
+            anchors.bottom: pageFooter.top
+
+            Row {
+                height: childrenRect.height
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.bottom: parent.bottom
+                spacing: units.gu(1)
+
+                Button {
+                    text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
+                    width: (parent.width / 2) - 0.5 * parent.spacing
+                    onClicked: signonRequest.cancel()
+                }
+
+                Button {
+                    text: signonRequest.loginText
+                    width: (parent.width / 2) - 0.5 * parent.spacing
+                    onClicked: signonRequest.accept()
+                }
+            }
+        }
+
+        Item {
+            id: pageFooter
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.bottom: osk.top
+            visible: signonRequest.registerUrl.toString() !== ""
+
+            ListItem.ThinDivider {
+                anchors.bottom: registerUrlLabel.top
+            }
+
+            Label {
+                anchors.bottom: parent.bottom
+                id: registerUrlLabel
+                text: "<a href=\"" + signonRequest.registerUrl + "\">" +
+                    signonRequest.registerText + "</a>"
+            }
+        }
+
+        KeyboardRectangle {
+            id: osk
+        }
+    }
+}

=== modified file 'online-accounts-ui/request.cpp'
--- online-accounts-ui/request.cpp	2014-08-07 13:41:03 +0000
+++ online-accounts-ui/request.cpp	2015-01-08 13:59:01 +0000
@@ -76,6 +76,7 @@
     QString m_errorName;
     QString m_errorMessage;
     QVariantMap m_result;
+    int m_delay;
 };
 
 } // namespace
@@ -92,7 +93,8 @@
     m_parameters(parameters),
     m_clientApparmorProfile(clientProfile),
     m_inProgress(false),
-    m_window(0)
+    m_window(0),
+    m_delay(0)
 {
 }
 
@@ -241,6 +243,18 @@
     return d->m_errorMessage;
 }
 
+void Request::setDelay(int delay)
+{
+    Q_D(Request);
+    d->m_delay = delay;
+}
+
+int Request::delay() const
+{
+    Q_D(const Request);
+    return d->m_delay;
+}
+
 void Request::start()
 {
     Q_D(Request);

=== modified file 'online-accounts-ui/request.h'
--- online-accounts-ui/request.h	2014-08-07 13:41:03 +0000
+++ online-accounts-ui/request.h	2015-01-08 13:59:01 +0000
@@ -53,6 +53,7 @@
     QVariantMap result() const;
     QString errorName() const;
     QString errorMessage() const;
+    int delay() const;
 
 public Q_SLOTS:
     virtual void start();
@@ -68,6 +69,7 @@
                      const QVariantMap &parameters,
                      QObject *parent = 0);
     virtual void setWindow(QWindow *window);
+    void setDelay(int delay);
 
 protected Q_SLOTS:
     void fail(const QString &name, const QString &message);

=== modified file 'online-accounts-ui/signonui-request.cpp'
--- online-accounts-ui/signonui-request.cpp	2014-10-09 12:24:45 +0000
+++ online-accounts-ui/signonui-request.cpp	2015-01-08 13:59:01 +0000
@@ -22,6 +22,7 @@
 
 #include "browser-request.h"
 #include "debug.h"
+#include "dialog-request.h"
 #include "globals.h"
 #include "notification.h"
 
@@ -35,6 +36,7 @@
 #include <QPointer>
 #include <SignOn/uisessiondata.h>
 #include <SignOn/uisessiondata_priv.h>
+#include <sys/apparmor.h>
 
 using namespace SignOnUi;
 
@@ -203,16 +205,44 @@
         return new SignOnUi::BrowserRequest(id, clientProfile,
                                             parameters, parent);
     } else {
-        return 0; // TODO new DialogRequest(connection, message, parameters, parent);
+        return new SignOnUi::DialogRequest(id, clientProfile,
+                                           parameters, parent);
     }
 }
 #endif
 
+static QString findClientProfile(const QString &clientProfile,
+                                 const QVariantMap &parameters)
+{
+    QString profile = clientProfile;
+    /* If the request is coming on the SignOnUi interface from an
+     * unconfined process and it carries the SSOUI_KEY_PID key, it means that
+     * it's coming from signond. In that case, we want to know what was the
+     * client which originated the call.
+     */
+    if (profile == "unconfined" &&
+        parameters.contains(SSOUI_KEY_PID)) {
+        pid_t pid = parameters.value(SSOUI_KEY_PID).toUInt();
+        char *con = NULL, *mode = NULL;
+        int ret = aa_gettaskcon(pid, &con, &mode);
+        if (Q_LIKELY(ret >= 0)) {
+            profile = QString::fromUtf8(con);
+            /* libapparmor allocates "con" and "mode" in a single allocation,
+             * so freeing "con" is actually freeing both. */
+            free(con);
+        } else {
+            qWarning() << "Couldn't get apparmor profile of PID" << pid;
+        }
+    }
+    return profile;
+}
+
 Request::Request(int id,
                  const QString &clientProfile,
                  const QVariantMap &parameters,
                  QObject *parent):
-    OnlineAccountsUi::Request(SIGNONUI_INTERFACE, id, clientProfile,
+    OnlineAccountsUi::Request(SIGNONUI_INTERFACE, id,
+                              findClientProfile(clientProfile, parameters),
                               parameters, parent),
     d_ptr(new RequestPrivate(this))
 {

=== modified file 'online-accounts-ui/ui-server.cpp'
--- online-accounts-ui/ui-server.cpp	2014-10-09 12:24:45 +0000
+++ online-accounts-ui/ui-server.cpp	2015-01-08 13:59:01 +0000
@@ -142,6 +142,7 @@
                          OAU_OPERATION_CODE_REQUEST_FINISHED);
         operation.insert(OAU_OPERATION_ID, request->id());
         operation.insert(OAU_OPERATION_DATA, request->result());
+        operation.insert(OAU_OPERATION_DELAY, request->delay());
         operation.insert(OAU_OPERATION_INTERFACE, request->interface());
         sendOperation(operation);
     } else {

=== modified file 'online-accounts-ui/ui.qrc'
--- online-accounts-ui/ui.qrc	2014-08-13 14:39:53 +0000
+++ online-accounts-ui/ui.qrc	2015-01-08 13:59:01 +0000
@@ -3,6 +3,7 @@
     <file>qml/AccountCreationPage.qml</file>
     <file>qml/AuthorizationPage.qml</file>
     <file>qml/ProviderRequest.qml</file>
+    <file>qml/SignOnUiDialog.qml</file>
     <file>qml/SignOnUiPage.qml</file>
 </qresource>
 </RCC>

=== modified file 'plugins/OnlineAccountsPlugin/application-manager.cpp'
--- plugins/OnlineAccountsPlugin/application-manager.cpp	2014-10-06 09:33:22 +0000
+++ plugins/OnlineAccountsPlugin/application-manager.cpp	2015-01-08 13:59:01 +0000
@@ -158,7 +158,17 @@
     app.insert(QStringLiteral("id"), applicationId);
     app.insert(QStringLiteral("displayName"), application.displayName());
     app.insert(QStringLiteral("icon"), application.iconName());
-    app.insert(QStringLiteral("profile"), profile);
+    /* The applicationMatchesProfile() test above ensures that either the peer
+     * is unconfined, or the profile in the .application file matches the one
+     * we see from our peer.
+     * In the first case, what we really want is the profile from the
+     * .application file (if that's set), to cover the case where an unconfined
+     * process is asking authorization on behalf of a confined app. */
+    QString targetProfile = d->applicationProfile(application.name());
+    if (targetProfile.isEmpty()) {
+        targetProfile = profile;
+    }
+    app.insert(QStringLiteral("profile"), targetProfile);
 
     /* List all the services supported by this application */
     QVariantList serviceIds;

=== modified file 'plugins/module/ServiceItem.qml'
--- plugins/module/ServiceItem.qml	2014-09-30 13:30:39 +0000
+++ plugins/module/ServiceItem.qml	2015-01-08 13:59:01 +0000
@@ -21,7 +21,7 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.OnlineAccounts 0.1
 
-Item {
+Column {
     property variant accountServiceHandle
 
     signal applicationAdded(string applicationId)
@@ -29,7 +29,6 @@
 
     anchors.left: parent.left
     anchors.right: parent.right
-    height: childrenRect.height
 
     Repeater {
         resources: AccountService {

=== modified file 'tests/online-accounts-service/mock/request-mock.cpp'
--- tests/online-accounts-service/mock/request-mock.cpp	2014-08-25 14:54:38 +0000
+++ tests/online-accounts-service/mock/request-mock.cpp	2015-01-08 13:59:01 +0000
@@ -34,6 +34,7 @@
     m_message(message),
     m_parameters(parameters),
     m_inProgress(false),
+    m_delay(0),
     q_ptr(request)
 {
 }
@@ -95,6 +96,18 @@
     return d->m_message.interface();
 }
 
+void Request::setDelay(int delay)
+{
+    Q_D(Request);
+    d->m_delay = delay;
+}
+
+int Request::delay() const
+{
+    Q_D(const Request);
+    return d->m_delay;
+}
+
 void Request::cancel()
 {
     setCanceled();

=== modified file 'tests/online-accounts-service/mock/request-mock.h'
--- tests/online-accounts-service/mock/request-mock.h	2014-08-25 14:54:38 +0000
+++ tests/online-accounts-service/mock/request-mock.h	2015-01-08 13:59:01 +0000
@@ -55,6 +55,7 @@
     QVariantMap m_parameters;
     QString m_clientApparmorProfile;
     bool m_inProgress;
+    int m_delay;
     mutable Request *q_ptr;
 };
 

=== modified file 'tests/online-accounts-service/tst_ui_proxy.cpp'
--- tests/online-accounts-service/tst_ui_proxy.cpp	2014-08-26 08:39:20 +0000
+++ tests/online-accounts-service/tst_ui_proxy.cpp	2015-01-08 13:59:01 +0000
@@ -45,6 +45,7 @@
     ~RemoteProcess();
 
     bool run();
+    void setDelay(int delay) { m_delay = delay; }
     void setResult(const QVariantMap &result);
     void fail(const QString &errorName, const QString &errorMessage);
     void registerHandler(const QString &matchId);
@@ -66,6 +67,7 @@
     QProcess *m_process;
     QVariantMap m_lastData;
     int m_requestId;
+    int m_delay;
     QString m_requestInterface;
     QLocalSocket m_socket;
     Ipc m_ipc;
@@ -78,7 +80,8 @@
     QObject(process),
     m_program(program),
     m_arguments(arguments),
-    m_process(process)
+    m_process(process),
+    m_delay(0)
 {
     QObject::connect(&m_ipc, SIGNAL(dataReady(QByteArray &)),
                      this, SLOT(onDataReady(QByteArray &)));
@@ -111,6 +114,7 @@
     operation.insert(OAU_OPERATION_ID, m_requestId);
     operation.insert(OAU_OPERATION_INTERFACE, m_requestInterface);
     operation.insert(OAU_OPERATION_DATA, result);
+    operation.insert(OAU_OPERATION_DELAY, m_delay);
     sendOperation(operation);
     deleteLater();
 }
@@ -196,6 +200,8 @@
     void testInit();
     void testRequest_data();
     void testRequest();
+    void testRequestDelay_data();
+    void testRequestDelay();
     void testHandler();
     void testWrapper();
 
@@ -335,6 +341,70 @@
     delete proxy;
 }
 
+void UiProxyTest::testRequestDelay_data()
+{
+    QTest::addColumn<int>("delay");
+
+    QTest::newRow("no delay") << 0;
+
+    QTest::newRow("300 ms") << 300;
+
+    QTest::newRow("half second") << 500;
+}
+
+void UiProxyTest::testRequestDelay()
+{
+    QFETCH(int, delay);
+
+    QVariantMap parameters;
+    parameters.insert("greeting", "Hello!");
+    Request *request = createRequest(OAU_INTERFACE, "hello",
+                                     "unconfined", parameters);
+    RequestPrivate *r = RequestPrivate::mocked(request);
+    QSignalSpy requestFailCalled(r, SIGNAL(failCalled(QString,QString)));
+    QSignalSpy requestSetResultCalled(r, SIGNAL(setResultCalled(QVariantMap)));
+
+    UiProxy *proxy = new UiProxy(0, this);
+    QVERIFY(proxy->init());
+
+    QSignalSpy finished(proxy, SIGNAL(finished()));
+    proxy->handleRequest(request);
+
+    QTRY_VERIFY(!remoteProcesses.isEmpty());
+    QCOMPARE(remoteProcesses.count(), 1);
+
+    RemoteProcess *process = remoteProcesses.values().first();
+    QVERIFY(process);
+    QSignalSpy dataReceived(process, SIGNAL(dataReceived(QVariantMap)));
+
+    /* Check the received data */
+    if (process->lastReceived().isEmpty()) {
+        QVERIFY(dataReceived.wait());
+    }
+
+    QVariantMap result;
+    result.insert("response", "OK");
+    process->setDelay(delay);
+    process->setResult(result);
+    QVERIFY(requestSetResultCalled.wait());
+    QCOMPARE(requestSetResultCalled.count(), 1);
+    QCOMPARE(requestSetResultCalled.at(0).at(0).toMap(), result);
+
+    QCOMPARE(request->delay(), delay);
+
+    int wontFinishBefore = qMax(delay - 200, 0);
+    if (wontFinishBefore > 0) {
+        QTest::qWait(wontFinishBefore);
+        QCOMPARE(finished.count(), 0);
+        QTest::qWait(250);
+    } else {
+        QTest::qWait(10);
+    }
+    QCOMPARE(finished.count(), 1);
+
+    delete proxy;
+}
+
 void UiProxyTest::testHandler()
 {
     UiProxy *proxy = new UiProxy(0, this);

=== modified file 'tests/online-accounts-ui/tst_signonui_request.pro'
--- tests/online-accounts-ui/tst_signonui_request.pro	2014-10-09 12:24:45 +0000
+++ tests/online-accounts-ui/tst_signonui_request.pro	2015-01-08 13:59:01 +0000
@@ -10,6 +10,7 @@
 
 PKGCONFIG += \
     accounts-qt5 \
+    libapparmor \
     libsignon-qt5 \
     signon-plugins-common
 

=== modified file 'tests/plugin/tst_application_manager.cpp'
--- tests/plugin/tst_application_manager.cpp	2014-10-06 09:33:22 +0000
+++ tests/plugin/tst_application_manager.cpp	2015-01-08 13:59:01 +0000
@@ -190,7 +190,8 @@
 {
     QTest::addColumn<QString>("applicationId");
     QTest::addColumn<QString>("contents");
-    QTest::addColumn<QString>("profile");
+    QTest::addColumn<QString>("inputProfile");
+    QTest::addColumn<QString>("expectedProfile");
     QTest::addColumn<QStringList>("services");
 
     QTest::newRow("no-services") <<
@@ -201,6 +202,7 @@
         "  <profile>com.ubuntu.test_MyApp_0.2</profile>\n"
         "</application>" <<
         "com.ubuntu.test_MyApp_0.2" <<
+        "com.ubuntu.test_MyApp_0.2" <<
         QStringList();
 
     QTest::newRow("no-valid-services") <<
@@ -214,6 +216,7 @@
         "  <profile>com.ubuntu.test_MyApp2_0.2</profile>\n"
         "</application>" <<
         "com.ubuntu.test_MyApp2_0.2" <<
+        "com.ubuntu.test_MyApp2_0.2" <<
         QStringList();
 
     QTest::newRow("email-services") <<
@@ -229,6 +232,7 @@
         "  <profile>com.ubuntu.test_MyApp3_0.2</profile>\n"
         "</application>" <<
         "com.ubuntu.test_MyApp3_0.2" <<
+        "com.ubuntu.test_MyApp3_0.2" <<
         (QStringList() << "cool-mail" << "bad-mail");
 
     QTest::newRow("cool-services") <<
@@ -247,7 +251,39 @@
         "  <profile>com.ubuntu.test_MyApp4_0.2</profile>\n"
         "</application>" <<
         "com.ubuntu.test_MyApp4_0.2" <<
+        "com.ubuntu.test_MyApp4_0.2" <<
         (QStringList() << "cool-mail" << "cool-sharing");
+
+    QTest::newRow("unconfined app") <<
+        "com.ubuntu.test_UnconfinedApp" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_UnconfinedApp\">\n"
+        "  <description>My application 5</description>\n"
+        "  <services>\n"
+        "    <service id=\"cool-mail\">\n"
+        "      <description>Send email</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "  <profile>com.ubuntu.test_UnconfinedApp_0.2</profile>\n"
+        "</application>" <<
+        "unconfined" <<
+        "com.ubuntu.test_UnconfinedApp_0.2" <<
+        (QStringList() << "cool-mail");
+
+    QTest::newRow("unconfined app, no profile") <<
+        "com.ubuntu.test_UnconfinedApp2" <<
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<application id=\"com.ubuntu.test_UnconfinedApp2\">\n"
+        "  <description>My application 6</description>\n"
+        "  <services>\n"
+        "    <service id=\"cool-mail\">\n"
+        "      <description>Send email</description>\n"
+        "    </service>\n"
+        "  </services>\n"
+        "</application>" <<
+        "unconfined" <<
+        "unconfined" <<
+        (QStringList() << "cool-mail");
 }
 
 void ApplicationManagerTest::testApplicationInfo()
@@ -256,16 +292,17 @@
 
     QFETCH(QString, applicationId);
     QFETCH(QString, contents);
-    QFETCH(QString, profile);
+    QFETCH(QString, inputProfile);
+    QFETCH(QString, expectedProfile);
     QFETCH(QStringList, services);
 
     writeAccountsFile(applicationId + ".application", contents);
 
     ApplicationManager manager;
 
-    QVariantMap info = manager.applicationInfo(applicationId, profile);
+    QVariantMap info = manager.applicationInfo(applicationId, inputProfile);
     QCOMPARE(info.value("id").toString(), applicationId);
-    QCOMPARE(info.value("profile").toString(), profile);
+    QCOMPARE(info.value("profile").toString(), expectedProfile);
     QCOMPARE(info.value("services").toStringList().toSet(), services.toSet());
 }