Merge lp:~mardy/ubuntu-system-settings-online-accounts/paths-1642225 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Support running inside a snap

- If the $SNAP variable is set, prefix that to absolute paths
- If the client is running under the same confinement as our service (that is, it's in the same snap) treat it as unconfined.

Support running inside a snap

- If the $SNAP variable is set, prefix that to absolute paths
- If the client is running under the same confinement as our service (that is, it's in the same snap) treat it as unconfined.

[Marcus Tomlinson (marcustomlinson)]

Looks good, will test this in a moment. One inline comment so long.

review: Needs Fixing

[Marcus Tomlinson (marcustomlinson)]

Hey, so with this fix I now see the UbuntuOne login page with email / password boxes etc. But when I enter my details and hit "Sign In", I get this error in red at the top:

GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name io.snapcraft.SnapdLoginService was not provided by any .service files

[lp:~mardy/ubuntu-system-settings-online-accounts/paths-1642225]

410. By Alberto Mardegan on 2016-11-17

Use QFile::decodeName

[Alberto Mardegan (mardy)]

Updated to use QFile::decodeName()

[Marcus Tomlinson (marcustomlinson)]

+1

review: Approve

=== modified file 'online-accounts-service/utils.cpp'
--- online-accounts-service/utils.cpp	2016-10-04 07:18:05 +0000
+++ online-accounts-service/utils.cpp	2016-11-17 08:37:38 +0000
@@ -31,11 +31,21 @@
 
 QString apparmorProfileOfPeer(const QDBusMessage &message)
 {
+    static QString ourProfile;
+
     QString uniqueConnectionId = message.service();
     /* This is mainly for unit tests: real messages on the session bus always
      * have a service name. */
     if (uniqueConnectionId.isEmpty()) return QString();
 
+    if (ourProfile.isEmpty()) {
+        char *label = NULL;
+        char *mode = NULL;
+        aa_getcon(&label, &mode);
+        ourProfile = QString::fromUtf8(label);
+        free(label);
+    }
+
     QString appId;
 
     QDBusMessage msg =
@@ -54,6 +64,10 @@
         if (!context.isEmpty()) {
             aa_splitcon(context.data(), NULL);
             appId = QString::fromUtf8(context);
+            if (appId == ourProfile) {
+                qDebug() << "Same profile as ourselves, assuming unconfined";
+                appId = "unconfined";
+            }
         }
         qDebug() << "App ID:" << appId;
     } else {

=== modified file 'online-accounts-ui/dialog-request.cpp'
--- online-accounts-ui/dialog-request.cpp	2016-04-07 12:57:06 +0000
+++ online-accounts-ui/dialog-request.cpp	2016-11-17 08:37:38 +0000
@@ -180,7 +180,8 @@
         QObject::connect(m_dialog, SIGNAL(finished(int)),
                          this, SLOT(onFinished()));
 
-        m_dialog->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
+        m_dialog->engine()->addImportPath(q->mountPoint() +
+                                          PLUGIN_PRIVATE_MODULE_DIR);
         m_dialog->rootContext()->setContextProperty("request", this);
         m_dialog->setSource(QUrl("qrc:/qml/SignOnUiDialog.qml"));
         q->setWindow(m_dialog);

=== modified file 'online-accounts-ui/online-accounts-ui.pro'
--- online-accounts-ui/online-accounts-ui.pro	2015-04-27 21:01:41 +0000
+++ online-accounts-ui/online-accounts-ui.pro	2016-11-17 08:37:38 +0000
@@ -49,7 +49,6 @@
     i18n.cpp \
     ipc.cpp \
     main.cpp \
-    panel-request.cpp \
     provider-request.cpp \
     request.cpp \
     signonui-request.cpp \
@@ -63,7 +62,6 @@
     dialog-request.h \
     i18n.h \
     ipc.h \
-    panel-request.h \
     provider-request.h \
     request.h \
     signonui-request.h \

=== removed file 'online-accounts-ui/panel-request.cpp'
--- online-accounts-ui/panel-request.cpp	2014-10-03 14:56:11 +0000
+++ online-accounts-ui/panel-request.cpp	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This file is part of online-accounts-ui
- *
- * 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 "debug.h"
-#include "globals.h"
-#include "panel-request.h"
-
-#include <QDesktopServices>
-#include <QGuiApplication>
-#include <QStandardPaths>
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QQuickView>
-
-using namespace OnlineAccountsUi;
-
-namespace OnlineAccountsUi {
-
-class PanelRequestPrivate: public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PUBLIC(PanelRequest)
-
-public:
-    PanelRequestPrivate(PanelRequest *request);
-    ~PanelRequestPrivate();
-
-    void start();
-
-private Q_SLOTS:
-    void onWindowVisibleChanged(bool visible);
-
-private:
-    mutable PanelRequest *q_ptr;
-    QQuickView *m_view;
-};
-
-} // namespace
-
-PanelRequestPrivate::PanelRequestPrivate(PanelRequest *request):
-    QObject(request),
-    q_ptr(request),
-    m_view(0)
-{
-}
-
-PanelRequestPrivate::~PanelRequestPrivate()
-{
-    DEBUG() << "view:" << m_view;
-    /* TODO Uncomment this once QTBUG-40766 is resolved:
-    delete m_view;
-    */
-}
-
-void PanelRequestPrivate::start()
-{
-    Q_Q(PanelRequest);
-
-    m_view = new QQuickView;
-    QObject::connect(m_view, SIGNAL(visibleChanged(bool)),
-                     this, SLOT(onWindowVisibleChanged(bool)));
-    m_view->setResizeMode(QQuickView::SizeRootObjectToView);
-    m_view->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
-
-    QQmlContext *context = m_view->rootContext();
-
-    context->setContextProperty("systemQmlPluginPath",
-                                QUrl::fromLocalFile(OAU_PLUGIN_DIR));
-    context->setContextProperty("localQmlPluginPath",
-                                QUrl::fromLocalFile(QStandardPaths::writableLocation(
-                                    QStandardPaths::GenericDataLocation) +
-                                "/accounts/qml-plugins/"));
-    context->setContextProperty("pluginOptions", QVariantMap());
-    context->setContextProperty("mainWindow", m_view);
-
-    m_view->setSource(QUrl(QStringLiteral("qrc:/qml/MainPage.qml")));
-    q->setWindow(m_view);
-}
-
-void PanelRequestPrivate::onWindowVisibleChanged(bool visible)
-{
-    Q_Q(PanelRequest);
-
-    DEBUG() << visible;
-
-    if (!visible) {
-        q->setResult(QVariantMap());
-    }
-}
-
-PanelRequest::PanelRequest(const QString &interface,
-                           int id,
-                           const QString &clientProfile,
-                           const QVariantMap &parameters,
-                           QObject *parent):
-    Request(interface, id, clientProfile, parameters, parent),
-    d_ptr(new PanelRequestPrivate(this))
-{
-}
-
-PanelRequest::~PanelRequest()
-{
-}
-
-void PanelRequest::start()
-{
-    Q_D(PanelRequest);
-    Request::start();
-    d->start();
-}
-
-#include "panel-request.moc"

=== removed file 'online-accounts-ui/panel-request.h'
--- online-accounts-ui/panel-request.h	2014-08-07 13:41:03 +0000
+++ online-accounts-ui/panel-request.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This file is part of online-accounts-ui
- *
- * 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 OAU_PANEL_REQUEST_H
-#define OAU_PANEL_REQUEST_H
-
-#include "request.h"
-
-namespace OnlineAccountsUi {
-
-class PanelRequestPrivate;
-class PanelRequest: public Request
-{
-    Q_OBJECT
-
-public:
-    explicit PanelRequest(const QString &interface,
-                          int id,
-                          const QString &clientProfile,
-                          const QVariantMap &parameters,
-                          QObject *parent = 0);
-    ~PanelRequest();
-
-    void start() Q_DECL_OVERRIDE;
-
-private:
-    PanelRequestPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(PanelRequest)
-};
-
-} // namespace
-
-#endif // OAU_PANEL_REQUEST_H

=== modified file 'online-accounts-ui/provider-request.cpp'
--- online-accounts-ui/provider-request.cpp	2016-06-23 13:18:47 +0000
+++ online-accounts-ui/provider-request.cpp	2016-11-17 08:37:38 +0000
@@ -123,8 +123,9 @@
     QObject::connect(m_view, SIGNAL(visibleChanged(bool)),
                      this, SLOT(onWindowVisibleChanged(bool)));
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
+    QString mountPoint = q->mountPoint();
     QQmlEngine *engine = m_view->engine();
-    engine->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
+    engine->addImportPath(mountPoint + PLUGIN_PRIVATE_MODULE_DIR);
 
     /* If the plugin comes from a click package, also add
      *   <package-dir>/lib
@@ -142,7 +143,7 @@
     QQmlContext *context = m_view->rootContext();
 
     context->setContextProperty("systemQmlPluginPath",
-                                QUrl::fromLocalFile(OAU_PLUGIN_DIR));
+                                QUrl::fromLocalFile(mountPoint + OAU_PLUGIN_DIR));
     context->setContextProperty("localQmlPluginPath",
                                 QUrl::fromLocalFile(QStandardPaths::writableLocation(
                                     QStandardPaths::GenericDataLocation) +

=== modified file 'online-accounts-ui/request.cpp'
--- online-accounts-ui/request.cpp	2015-06-24 14:58:01 +0000
+++ online-accounts-ui/request.cpp	2016-11-17 08:37:38 +0000
@@ -21,11 +21,11 @@
 #include "debug.h"
 // TODO #include "dialog-request.h"
 #include "globals.h"
-#include "panel-request.h"
 #include "provider-request.h"
 #include "request.h"
 #include "signonui-request.h"
 
+#include <QFile>
 #include <QPointer>
 
 using namespace OnlineAccountsUi;
@@ -298,4 +298,10 @@
     }
 }
 
+QString Request::mountPoint() const
+{
+    return qEnvironmentVariableIsSet("SNAP") ?
+        QFile::decodeName(qgetenv("SNAP")) : "";
+}
+
 #include "request.moc"

=== modified file 'online-accounts-ui/request.h'
--- online-accounts-ui/request.h	2014-11-21 13:50:15 +0000
+++ online-accounts-ui/request.h	2016-11-17 08:37:38 +0000
@@ -71,6 +71,8 @@
     virtual void setWindow(QWindow *window);
     void setDelay(int delay);
 
+    QString mountPoint() const;
+
 protected Q_SLOTS:
     void fail(const QString &name, const QString &message);
     virtual void setCanceled();

=== modified file 'tests/online-accounts-ui/mock/request-mock.cpp'
--- tests/online-accounts-ui/mock/request-mock.cpp	2015-06-22 14:55:14 +0000
+++ tests/online-accounts-ui/mock/request-mock.cpp	2016-11-17 08:37:38 +0000
@@ -150,3 +150,8 @@
         d->m_inProgress = false;
     }
 }
+
+QString Request::mountPoint() const
+{
+    return "";
+}