Merge lp:~ken-vandine/content-hub/url-dispatcher into lp:content-hub

[Ken VanDine]

Added url-dispatcher integration. This allows export and share requests to be initiated by opening a url.

Added url-dispatcher integration. This allows export and share requests to be initiated by opening a url. For example, to create a share request to facebook you could open a url like:

"content:?pkg=com.ubuntu.developer.webapps.webapp-facebook&app=webapp-facebook&handler=share&url=http://www.ubuntu.com"

Parameters:
 * pkg - click package name (required)
 * app - click app name, ubuntu-app-launch will attempt to guess if not provided
 * ver - version of the click package, defaults to "current-user-version"
 * handler - export or share, defaults to defaults to "export"

A simple way to test this would be to run this from a shell:

url-dispatcher "content:?pkg=messaging-app&handler=share&url=http://www.ubuntu.com"

This will open the messaging-app and insert the link

File transfers are prohibited, for security reasons. So this only works for remote links and text shares.

[lp:~ken-vandine/content-hub/url-dispatcher]

205. By Ken VanDine on 2015-05-13

tidy up a bit

206. By Ken VanDine on 2015-05-13

merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/content-hub-ci/254/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/50

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/254/rebuild

review: Approve (continuous-integration)

[lp:~ken-vandine/content-hub/url-dispatcher]

207. By Ken VanDine on 2015-05-14

Cleaned up appId creation and all text to be set

208. By Ken VanDine on 2015-05-14

white space cleanup

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/content-hub-ci/256/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/256/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes, plus I ran the url-dispatcher test in the description. I'll add that to the test plan after this lands

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * There are packaging changes, I'm a core-dev

[Michael Sheldon (michael-sheldon)]

This doesn't appear to obey apparmor profiles, so as it stands this could potentially give unrestricted access to all files owned by the phablet user.

For example, creating a simple QML app that calls:

Qt.openUrlExternally("content:?pkg=com.ubuntu.developer.ken-vandine.hub-importer&url=file:///home/phablet/.ssh/known_hosts");

Will result in a user's SSH known_hosts file being sent to the hub-importer app (but potentially an app could be using this to send files directly back to itself and it could be grabbing much more important files if they exist, like ~/.ssh/id_rsa).

Unfortunately I don't think applying the apparmor profile of the app which called url-dispatcher will be enough either, as a malicious developer could create a website like http://mikeasoft.com/~mike/urlhack.php which does a header redirect to "content:?pkg=com.ubuntu.developer.ken-vandine.hub-importer&url=file:///home/phablet/.ssh/known_hosts". They would then call Qt.openUrlExternally("http://mikeasoft.com/~mike/urlhack.php") in their app, which would launch the webbrowser. The urlhack page would then cause the webbrowser to issue the request to the url-dispatcher instead of the originating app, and since the webbrowser is unconfined this would again provide a mechanism for accessing all of a user's files from a confined app.

review: Needs Fixing

[lp:~ken-vandine/content-hub/url-dispatcher]

209. By Ken VanDine on 2015-05-15

Don't support file transfers via url-dispatcher

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/content-hub-ci/257/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/257/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-14 11:49:28 +0000
+++ CMakeLists.txt	2015-05-15 14:21:06 +0000
@@ -103,6 +103,7 @@
 add_subdirectory(import)
 add_subdirectory(examples)
 add_subdirectory(tests)
+add_subdirectory(tools)
 
 install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
 

=== modified file 'debian/content-hub.install'
--- debian/content-hub.install	2014-11-18 14:59:03 +0000
+++ debian/content-hub.install	2015-05-15 14:21:06 +0000
@@ -1,6 +1,9 @@
+usr/bin/content-hub-send
 usr/bin/content-hub-service
 usr/lib/*/content-hub
 usr/share/click/hooks
 usr/share/dbus-1
 usr/share/glib-2.0/schemas
 usr/share/locale/*/LC_MESSAGES/content-hub.mo
+usr/share/applications/content-hub-send.desktop
+usr/share/url-dispatcher/urls/content-hub-send.url-dispatcher

=== added directory 'tools'
=== added file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tools/CMakeLists.txt	2015-05-15 14:21:06 +0000
@@ -0,0 +1,17 @@
+# Copyright © 2015 Canonical Ltd.
+#
+# 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 warranty of
+# MERCHANTABILITY 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/>.
+#
+# Authored by: Ken VanDine <[e-mail]>
+
+add_subdirectory(send)

=== added directory 'tools/send'
=== added file 'tools/send/CMakeLists.txt'
--- tools/send/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tools/send/CMakeLists.txt	2015-05-15 14:21:06 +0000
@@ -0,0 +1,59 @@
+# Copyright © 2015 Canonical Ltd.
+#
+# 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 warranty of
+# MERCHANTABILITY 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/>.
+#
+# Authored by: Ken VanDine <[e-mail]>
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content
+  ${UBUNTU_LAUNCH_INCLUDE_DIRS}
+)
+
+add_executable(
+  content-hub-send
+
+  exporter.cpp
+  autoexporter.cpp
+  ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content/debug.cpp
+)
+
+qt5_use_modules(content-hub-send Core Gui DBus)
+
+set_target_properties(
+  content-hub-send
+  PROPERTIES
+  AUTOMOC TRUE
+)
+
+target_link_libraries(
+  content-hub-send
+ 
+  content-hub 
+  ${UBUNTU_LAUNCH_LDFLAGS}
+)
+
+install(
+  TARGETS content-hub-send
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+install(
+  FILES content-hub-send.desktop
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
+)
+
+install(
+    FILES content-hub-send.url-dispatcher
+    DESTINATION share/url-dispatcher/urls
+)

=== added file 'tools/send/autoexporter.cpp'
--- tools/send/autoexporter.cpp	1970-01-01 00:00:00 +0000
+++ tools/send/autoexporter.cpp	2015-05-15 14:21:06 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 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/>.
+ *
+ * Authored by: Ken VanDine <[e-mail]>
+ */
+
+#include "autoexporter.h"
+#include "debug.h"
+
+AutoExporter::AutoExporter()
+{
+    auto hub = cuc::Hub::Client::instance();
+    hub->register_import_export_handler(this);
+}
+
+void AutoExporter::setUrl(const QString& newUrl)
+{
+    url = newUrl;
+}
+
+void AutoExporter::setText(const QString& newText)
+{
+    text = newText;
+}
+
+void AutoExporter::handle_import(cuc::Transfer *transfer)
+{
+    TRACE() << Q_FUNC_INFO << "not implemented";
+    Q_UNUSED(transfer);
+}
+
+void AutoExporter::handle_export(cuc::Transfer *transfer)
+{
+    TRACE() << Q_FUNC_INFO;
+    if (transfer == nullptr) {
+        TRACE() << Q_FUNC_INFO << "Transfer null";
+        return;
+    }
+
+    cuc::Item item;
+
+    if (!url.isEmpty())
+        item.setUrl(QUrl(url));
+    if (!text.isEmpty())
+        item.setText(text);
+
+    QVector<cuc::Item> items;
+    items << item;
+    transfer->charge(items);
+    connect(transfer, SIGNAL(stateChanged()), this, SLOT(stateChanged()));
+    TRACE() << Q_FUNC_INFO << "Items:" << items.count();
+}
+
+void AutoExporter::handle_share(cuc::Transfer *transfer)
+{
+    TRACE() << Q_FUNC_INFO << "not implemented";
+    Q_UNUSED(transfer);
+}
+
+void AutoExporter::stateChanged()
+{
+    cuc::Transfer *transfer = static_cast<cuc::Transfer*>(sender());
+    TRACE() << Q_FUNC_INFO << "STATE:" << transfer->state();
+
+    if (transfer->state() == cuc::Transfer::collected)
+        QCoreApplication::instance()->quit();
+}

=== added file 'tools/send/autoexporter.h'
--- tools/send/autoexporter.h	1970-01-01 00:00:00 +0000
+++ tools/send/autoexporter.h	2015-05-15 14:21:06 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 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/>.
+ *
+ * Authored by: Ken VanDine <[e-mail]>
+ */
+
+#ifndef AUTOEXPORTER_H
+#define AUTOEXPORTER_H
+
+#include <QObject>
+#include <QString>
+#include <com/ubuntu/content/hub.h>
+#include <com/ubuntu/content/transfer.h>
+#include <com/ubuntu/content/import_export_handler.h>
+
+namespace cuc = com::ubuntu::content;
+
+class AutoExporter : public cuc::ImportExportHandler
+{
+    Q_OBJECT
+
+public:
+    AutoExporter();
+       
+public slots:
+    Q_INVOKABLE void handle_import(cuc::Transfer*);
+    Q_INVOKABLE void handle_export(cuc::Transfer*);
+    Q_INVOKABLE void handle_share(cuc::Transfer*);
+    Q_INVOKABLE void stateChanged();
+    void setUrl(const QString&);
+    void setText(const QString&);
+
+private:
+    QString url;
+    QString text;
+};
+
+#endif // AUTOEXPORTER_H

=== added file 'tools/send/content-hub-send.desktop'
--- tools/send/content-hub-send.desktop	1970-01-01 00:00:00 +0000
+++ tools/send/content-hub-send.desktop	2015-05-15 14:21:06 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Content Hub Send
+Comment=Content Hub Send
+Exec=content-hub-send %U
+Icon=
+Terminal=false
+Type=Application
+OnlyShowIn=Old
+X-Ubuntu-Touch=true

=== added file 'tools/send/content-hub-send.url-dispatcher'
--- tools/send/content-hub-send.url-dispatcher	1970-01-01 00:00:00 +0000
+++ tools/send/content-hub-send.url-dispatcher	2015-05-15 14:21:06 +0000
@@ -0,0 +1,5 @@
+[
+   {
+       "protocol": "content"
+   }
+]

=== added file 'tools/send/exporter.cpp'
--- tools/send/exporter.cpp	1970-01-01 00:00:00 +0000
+++ tools/send/exporter.cpp	2015-05-15 14:21:06 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 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/>.
+ *
+ * Authored by: Ken VanDine <[e-mail]>
+ */
+
+#include <QCoreApplication>
+#include <QStringList>
+#include <QUrlQuery>
+#include <ubuntu-app-launch.h>
+
+#include "autoexporter.h"
+#include "debug.h"
+
+namespace cuc = com::ubuntu::content;
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+    if (qgetenv("APP_ID").isEmpty()) {
+        qputenv("APP_ID", "content-hub-send-file");
+    }
+
+    /* read environment variables */
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    if (environment.contains(QLatin1String("CONTENT_HUB_LOGGING_LEVEL"))) {
+        bool isOk;
+        int value = environment.value(
+            QLatin1String("CONTENT_HUB_LOGGING_LEVEL")).toInt(&isOk);
+        if (isOk)
+            setLoggingLevel(value);
+    }
+
+    std::string handler = "export";
+    QString url, text, appId;
+    gchar* pkg = NULL;
+    gchar* app = NULL;
+    gchar* ver = NULL;
+
+    /* URL handled looks like:
+     * content:?pkg=foo&app=bar&ver=0.1&url=path&text=text
+     * Only pkg is required.
+     */
+
+    QUrlQuery* query = new QUrlQuery(a.arguments().at(1).split("?").at(1));
+    TRACE() << "Handling URL:" << query->query();
+
+    if (query->hasQueryItem("pkg"))
+        pkg = g_strdup(query->queryItemValue("pkg").toStdString().c_str());
+    else {
+        qWarning() << "PKG is required";
+        return 1;
+    }
+    if (query->hasQueryItem("app"))
+        app = g_strdup(query->queryItemValue("app").toStdString().c_str());
+    if (query->hasQueryItem("ver"))
+        ver = g_strdup(query->queryItemValue("ver").toStdString().c_str());
+    if (query->hasQueryItem("handler"))
+        handler = query->queryItemValue("handler").toStdString();
+    url = query->queryItemValue("url");
+
+    /* Don't support file transfers via url-dispatcher
+     * it would allow unconfined access to any file simply
+     * by constructing an evil file url
+     */
+    if (url.startsWith("file")) {
+        qWarning() << "File transfers are not supported";
+        return 1;
+    }
+
+    text = query->queryItemValue("text");
+    TRACE() << "URL:" << url;
+    TRACE() << "PKG:" << pkg;
+    TRACE() << "APP:" << app;
+    TRACE() << "VER:" << ver;
+    TRACE() << "HANDLER:" << handler.c_str();
+
+    appId = QString::fromLocal8Bit(ubuntu_app_launch_triplet_to_app_id(pkg, app, ver));
+    if (appId.isNull())
+        appId = QString(pkg);
+
+    if (appId.isEmpty())
+    {
+        qWarning() << "Unable to determine peer";
+        return 1;
+    }
+
+    AutoExporter exporter;
+    if (!url.isEmpty())
+        exporter.setUrl(url);
+
+    if (!text.isEmpty())
+        exporter.setText(text);
+
+    TRACE() << "APP_ID:" << appId;
+
+    auto hub = cuc::Hub::Client::instance();
+    auto peer = cuc::Peer{appId};
+    if (handler == "share") {
+        auto transfer = hub->create_share_to_peer(peer);
+        exporter.handle_export(transfer);
+    } else {
+        auto transfer = hub->create_export_to_peer(peer);
+        exporter.handle_export(transfer);
+    }
+
+    return a.exec();
+}