Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1420847 into lp:~online-accounts/ubuntu-system-settings-online-accounts/master

[Alberto Mardegan]

Fail initialization if trust session cannot be setup.

Fail initialization if trust session cannot be setup.

[Alexandre Abreu (abreu-alexandre)]

review: Needs Information

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'online-accounts-service/mir-helper-stub.cpp'
--- online-accounts-service/mir-helper-stub.cpp	2014-11-25 13:34:16 +0000
+++ online-accounts-service/mir-helper-stub.cpp	2015-02-16 15:47:16 +0000
@@ -40,7 +40,11 @@
 
 QString PromptSession::requestSocket()
 {
+#ifdef BUILDING_TESTS
+    return QString::fromUtf8(qgetenv("TEST_MIR_HELPER_SOCKET"));
+#else
     return QString();
+#endif
 }
 
 MirHelper::MirHelper(QObject *parent):
@@ -65,5 +69,10 @@
 PromptSessionP MirHelper::createPromptSession(pid_t initiatorPid)
 {
     Q_UNUSED(initiatorPid);
+#ifdef BUILDING_TESTS
+    return qgetenv("TEST_MIR_HELPER_FAIL_CREATE").isEmpty() ?
+        PromptSessionP(new PromptSession(0)) : PromptSessionP();
+#else
     return PromptSessionP();
+#endif
 }

=== modified file 'online-accounts-service/mir-helper.h'
--- online-accounts-service/mir-helper.h	2014-11-21 13:50:15 +0000
+++ online-accounts-service/mir-helper.h	2015-02-16 15:47:16 +0000
@@ -27,6 +27,7 @@
 namespace OnlineAccountsUi {
 
 class PromptSessionPrivate;
+class MirHelper;
 class MirHelperPrivate;
 
 class PromptSession: public QObject
@@ -45,6 +46,7 @@
     explicit PromptSession(PromptSessionPrivate *priv);
 
 private:
+    friend class MirHelper;
     friend class MirHelperPrivate;
     PromptSessionPrivate *d_ptr;
     Q_DECLARE_PRIVATE(PromptSession)

=== modified file 'online-accounts-service/ui-proxy.cpp'
--- online-accounts-service/ui-proxy.cpp	2015-02-03 10:21:46 +0000
+++ online-accounts-service/ui-proxy.cpp	2015-02-16 15:47:16 +0000
@@ -225,6 +225,8 @@
 {
     Q_Q(UiProxy);
 
+    if (!m_clientPid) return false;
+
     PromptSessionP session =
         MirHelper::instance()->createPromptSession(m_clientPid);
     if (!session) return false;
@@ -246,14 +248,12 @@
 
 bool UiProxyPrivate::init()
 {
-    m_arguments.clear();
-    if (!m_promptSession) {
-        /* the first argument is required to be the desktop file */
-        m_arguments.append("--desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop");
-    }
-
-    if (m_clientPid) {
-        setupPromptSession();
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    if (env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) {
+        if (!setupPromptSession()) {
+            qWarning() << "Couldn't setup prompt session";
+            return false;
+        }
     }
 
     return true;
@@ -313,15 +313,6 @@
         m_arguments.prepend(accountsUi);
     }
 
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    if (env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) {
-        if (!setupPromptSession()) {
-            qWarning() << "Couldn't setup prompt session";
-            setStatus(UiProxy::Error);
-            return;
-        }
-    }
-
     setStatus(UiProxy::Loading);
     m_process.start(processName, m_arguments);
     if (Q_UNLIKELY(!m_process.waitForStarted())) {

=== modified file 'tests/online-accounts-service/tst_ui_proxy.cpp'
--- tests/online-accounts-service/tst_ui_proxy.cpp	2014-12-03 13:42:09 +0000
+++ tests/online-accounts-service/tst_ui_proxy.cpp	2015-02-16 15:47:16 +0000
@@ -204,6 +204,8 @@
     void testRequestDelay();
     void testHandler();
     void testWrapper();
+    void testTrustSessionError_data();
+    void testTrustSessionError();
 
 private:
     QDBusConnection m_connection;
@@ -477,6 +479,43 @@
     delete proxy;
 }
 
+void UiProxyTest::testTrustSessionError_data()
+{
+    QTest::addColumn<int>("clientPid");
+    QTest::addColumn<QString>("envVar");
+    QTest::addColumn<bool>("expectSuccess");
+
+    QTest::newRow("PID 0") << 0 << "" << false;
+
+    QTest::newRow("fail creation") << 4 <<
+        "TEST_MIR_HELPER_FAIL_CREATE=1" << false;
+
+    QTest::newRow("return empty socket") << 4 <<
+        "" << false;
+
+    QTest::newRow("success") << 4 <<
+        "TEST_MIR_HELPER_SOCKET=something" << true;
+}
+
+void UiProxyTest::testTrustSessionError()
+{
+    QFETCH(int, clientPid);
+    QFETCH(QString, envVar);
+    QFETCH(bool, expectSuccess);
+
+    qputenv("QT_QPA_PLATFORM", "ubuntu-something");
+
+    QStringList envVarSplit = envVar.split('=');
+    QByteArray envVarKey = envVarSplit.value(0, "").toUtf8();
+    QByteArray envVarValue = envVarSplit.value(1, "").toUtf8();
+    qputenv(envVarKey.constData(), envVarValue);
+    UiProxy *proxy = new UiProxy(clientPid, this);
+    QCOMPARE(proxy->init(), expectSuccess);
+    delete proxy;
+
+    qunsetenv(envVarKey.constData());
+}
+
 QTEST_MAIN(UiProxyTest);
 
 #include "tst_ui_proxy.moc"

=== modified file 'tests/online-accounts-service/tst_ui_proxy.pro'
--- tests/online-accounts-service/tst_ui_proxy.pro	2014-12-08 16:22:39 +0000
+++ tests/online-accounts-service/tst_ui_proxy.pro	2015-02-16 15:47:16 +0000
@@ -13,6 +13,7 @@
     testlib
 
 DEFINES += \
+    BUILDING_TESTS \
     INSTALL_BIN_DIR=\\\"$${INSTALL_PREFIX}/bin\\\"
 
 PKGCONFIG += \