Merge lp:~mardy/webbrowser-app/export-cookies into lp:webbrowser-app

[David Barth]

Prototype for testing how to share cookies between webapps.

Prototype for testing how to share cookies between webapps.

[David Barth (dbarth)]

Not for a real merge proposal review yet

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:974
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1683/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/440
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2427
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19894

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1683/rebuild

review: Approve (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:974
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/491/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/493/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/493/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/491/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

974. By Alberto Mardegan on 2015-04-22

Test

973. By Alberto Mardegan on 2015-04-22

Add JsonCookieStore

=== modified file 'src/app/webcontainer/CMakeLists.txt'
--- src/app/webcontainer/CMakeLists.txt	2015-01-26 14:53:18 +0000
+++ src/app/webcontainer/CMakeLists.txt	2015-04-24 09:22:18 +0000
@@ -13,6 +13,7 @@
     cookie-store.cpp
     online-accounts-cookie-store.cpp
     oxide-cookie-helper.cpp
+    json-cookie-store.cpp
     local-cookie-store.cpp
     webapp-container.cpp
     webapp-container-helper.cpp

=== added file 'src/app/webcontainer/json-cookie-store.cpp'
--- src/app/webcontainer/json-cookie-store.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/json-cookie-store.cpp	2015-04-24 09:22:18 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#include "json-cookie-store.h"
+
+#include <QByteArray>
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QNetworkCookie>
+#include <QStandardPaths>
+#include "oxide-cookie-helper.h"
+
+static QList<QNetworkCookie> cookiesFromVariant(const QVariantList &cl)
+{
+    QList<QNetworkCookie> cookies;
+    Q_FOREACH(QVariant cookie, cl) {
+        if (!cookie.canConvert(QVariant::Map)) {
+            continue;
+        }
+
+        QNetworkCookie nc;
+        QVariantMap vm = cookie.toMap();
+        if (!vm.contains("name") || !vm.contains("value")) {
+            continue;
+        }
+
+        nc.setName(vm.value("name").toByteArray());
+        nc.setValue(vm.value("value").toByteArray());
+        nc.setDomain(vm.value("domain").toString());
+        nc.setPath(vm.value("path").toString());
+        if (vm.contains("httponly") &&
+            vm.value("httponly").canConvert(QVariant::Bool)) {
+            nc.setHttpOnly(vm.value("httponly").toBool());
+        }
+
+        if (vm.contains("issecure") &&
+            vm.value("issecure").canConvert(QVariant::Bool)) {
+            nc.setSecure(vm.value("issecure").toBool());
+        }
+
+        if (vm.contains("expirationdate") &&
+            vm.value("expirationdate").canConvert(QMetaType::QDateTime)) {
+            nc.setExpirationDate(vm.value("expirationdate").toDateTime());
+        }
+
+        cookies.append(nc);
+    }
+    return cookies;
+}
+
+JsonCookieStore::JsonCookieStore(QObject* parent):
+    CookieStore(parent)
+{
+}
+
+void JsonCookieStore::doGetCookies()
+{
+    Cookies cookies;
+
+    QFile file(m_dbPath);
+
+    if (Q_UNLIKELY(!file.open(QIODevice::ReadOnly))) {
+        qCritical() << "Could not open cookie database:" << m_dbPath;
+        return;
+    }
+
+    QByteArray contents = file.readAll();
+    QJsonDocument doc = QJsonDocument::fromJson(contents);
+    if (doc.isEmpty() || !doc.isArray()) {
+        qCritical() << "Json DB invalid or empty" << m_dbPath;
+        return;
+    }
+
+    QVariantList cookieVariants = doc.array().toVariantList();
+
+    emit gotCookies(cookiesFromVariant(cookieVariants));
+}
+
+QDateTime JsonCookieStore::lastUpdateTimeStamp() const
+{
+    //QFileInfo dbFileInfo(m_dbPath);
+    //return dbFileInfo.lastModified();
+    return QDateTime();
+}
+
+void JsonCookieStore::doSetCookies(const Cookies& parsedCookies)
+{
+    QFile file (m_dbPath);
+    if (!file.open(QIODevice::WriteOnly)) {
+        qCritical() << "Could not open cookie database:" << m_dbPath;
+        return;
+    }
+
+    QVariant cookies = OxideCookieHelper::variantFromCookies(parsedCookies);
+    QJsonArray jsonCookies =
+        QJsonArray::fromVariantList(cookies.toList());
+    QJsonDocument doc(jsonCookies);
+    file.write(doc.toJson());
+    file.close();
+
+    emit cookiesSet(true);
+}
+
+void JsonCookieStore::setDbPath(const QString &path)
+{
+    // If path is a URL, strip the initial "file://"
+    QString normalizedPath = path.startsWith("file://") ? path.mid(7) : path;
+
+    if (normalizedPath != m_dbPath) {
+        if (Q_UNLIKELY(!normalizedPath.startsWith('/'))) {
+            qWarning() << "Invalid database path (must be absolute):" << path;
+            return;
+        }
+        m_dbPath = normalizedPath;
+
+        qDebug() << "Using local cookie db: " << m_dbPath;
+
+        Q_EMIT dbPathChanged();
+    }
+}
+
+QString JsonCookieStore::dbPath () const
+{
+    return m_dbPath;
+}

=== added file 'src/app/webcontainer/json-cookie-store.h'
--- src/app/webcontainer/json-cookie-store.h	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/json-cookie-store.h	2015-04-24 09:22:18 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#ifndef JSON_COOKIE_STORE_H
+#define JSON_COOKIE_STORE_H
+
+#include "cookie-store.h"
+
+class JsonCookieStore : public CookieStore
+{
+    Q_OBJECT
+    Q_PROPERTY(QString dbPath READ dbPath WRITE setDbPath NOTIFY dbPathChanged)
+
+public:
+    JsonCookieStore(QObject* parent = 0);
+
+    void setDbPath(const QString& path);
+    QString dbPath() const;
+
+    QDateTime lastUpdateTimeStamp() const Q_DECL_OVERRIDE;
+
+Q_SIGNALS:
+    void dbPathChanged();
+
+private:
+    virtual void doGetCookies() Q_DECL_OVERRIDE;
+    virtual void doSetCookies(const Cookies& cookies) Q_DECL_OVERRIDE;
+
+    bool createDb();
+
+private:
+    QString m_dbPath;
+};
+
+#endif // JSON_COOKIE_STORE_H

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2015-04-10 13:33:19 +0000
+++ src/app/webcontainer/webapp-container.cpp	2015-04-24 09:22:18 +0000
@@ -21,6 +21,7 @@
 
 #include "chrome-cookie-store.h"
 #include "intent-filter.h"
+#include "json-cookie-store.h"
 #include "local-cookie-store.h"
 #include "online-accounts-cookie-store.h"
 #include "session-utils.h"
@@ -233,6 +234,8 @@
     if (engine) {
         qmlRegisterType<ChromeCookieStore>(privateModuleUri, 0, 1,
                                            "ChromeCookieStore");
+        qmlRegisterType<JsonCookieStore>(privateModuleUri, 0, 1,
+                                         "JsonCookieStore");
         qmlRegisterType<LocalCookieStore>(privateModuleUri, 0, 1,
                                            "LocalCookieStore");
         qmlRegisterType<OnlineAccountsCookieStore>(privateModuleUri, 0, 1,

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2015-04-07 14:30:52 +0000
+++ src/app/webcontainer/webapp-container.qml	2015-04-24 09:22:18 +0000
@@ -49,10 +49,42 @@
     property bool runningLocalApplication: false
 
     title: getWindowTitle()
+    onActiveChanged: {
+        if (!active) {
+            console.log("Getting inactive, saving cookies to " + jsonCookieStore.dbPath)
+
+            if (!__webappCookieStore && webappViewLoader.item) {
+                var context = webappViewLoader.item.currentWebview.context
+                __webappCookieStore = oxideCookieStoreComponent.createObject(this, {
+                    "oxideStoreBackend": context.cookieManager,
+                    "dbPath": context.dataPath + "/cookies.sqlite"
+                })
+            }
+
+            jsonCookieStore.moveFrom(__webappCookieStore)
+        } else {
+            loadCookies()
+        }
+    }
 
     // Used for testing
     signal intentUriHandleResult(string uri)
 
+    function loadCookies() {
+        if (!webappViewLoader.item) return
+        if (!__webappCookieStore) {
+            var context = webappViewLoader.item.currentWebview.context
+            __webappCookieStore = oxideCookieStoreComponent.createObject(this, {
+                "oxideStoreBackend": context.cookieManager,
+                "dbPath": context.dataPath + "/cookies.sqlite"
+            })
+        }
+
+        console.log("Loading cookies from " + jsonCookieStore.dbPath)
+        __webappCookieStore.moved.connect(onCookiesMoved)
+        __webappCookieStore.moveFrom(jsonCookieStore)
+    }
+
     function getWindowTitle() {
         var webappViewTitle =
                 webappViewLoader.item
@@ -68,6 +100,11 @@
         }
     }
 
+    JsonCookieStore {
+        id: jsonCookieStore
+        dbPath: "/tmp/cookie-" + Qt.application.name + ".json"
+    }
+
     Component {
         id: webappViewComponent
 
@@ -176,7 +213,9 @@
         if (!result) {
             console.log("Cookies were not moved")
         }
-        webappViewLoader.item.url = root.url
+        if (!webappViewLoader.item.url) {
+            webappViewLoader.item.url = root.url
+        }
     }
 
     function moveCookies(credentialsId) {