Merge lp:~mardy/signon-ui/export-cookies into lp:signon-ui

[Alberto Mardegan]

Add an experimental method to get the WebView cookies

This is intended to be used by the webapps container, in the attempt to reduce the number of web logins required to the user.

Add an experimental method to get the WebView cookies

This is intended to be used by the webapps container, in the attempt to reduce the number of web logins required to the user.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/signon-ui-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ui-ci/43/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks fine, my only concern is security. We need to make sure this can only be used by the webapps container. I guess we need an apparmor profile for that. Has that been discussed yet?

review: Needs Information

[Alberto Mardegan (mardy)]

> Looks fine, my only concern is security. We need to make sure this can only
> be used by the webapps container. I guess we need an apparmor profile for
> that. Has that been discussed yet?

Well, click packages cannot access this interface, and unconfined processes can directly read the cookies.db file anyway. :-)

[Alexandre Abreu (abreu-alexandre)]

Random question:
L63: can't we have a more reliable information about the timestamp (than the last time the cookie file was touched which seems quite arbitrary)?

[Alberto Mardegan (mardy)]

On 12/11/2013 10:37 AM, Alexandre Abreu wrote:
> Random question:
> L63: can't we have a more reliable information about the timestamp (than the last time the cookie file was touched which seems quite arbitrary)?

I'm afraid not (or I don't have a better idea). We can try to find a
better way when Oxyde is taken into use, maybe.

[Alexandre Abreu (abreu-alexandre)]

I am wondering, since the interface basically changed ... shouldn't there be (even a minor) bump in the dbus if or something?

review: Needs Information

[Alberto Mardegan (mardy)]

> I am wondering, since the interface basically changed ... shouldn't there be
> (even a minor) bump in the dbus if or something?

I wouldn't be so strict about this addition, it's not meant to be used by anyone other than the webapp container, and I'd like to be able to change/remove it as needed.
If you prefer, I could move it under a new interface ("com.ubuntu.SignonUi.experimental"?); I wouldn't do it if it were for me, but strictly speaking it would be the right thing to do.

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'src/cookie-jar-manager.cpp'
--- src/cookie-jar-manager.cpp	2013-04-24 08:36:41 +0000
+++ src/cookie-jar-manager.cpp	2013-12-09 11:50:35 +0000
@@ -151,6 +151,7 @@
 {
     Q_D(CookieJarManager);
 
+    qRegisterMetaType<RawCookies>("RawCookies");
     qDBusRegisterMetaType<RawCookies>();
     qRegisterMetaTypeStreamOperators<QList<QNetworkCookie> >("QList<QNetworkCookie>");
 

=== modified file 'src/service.cpp'
--- src/service.cpp	2013-05-01 22:53:03 +0000
+++ src/service.cpp	2013-12-09 11:50:35 +0000
@@ -25,6 +25,11 @@
 #include "request.h"
 
 #include <QDBusArgument>
+#include <QDateTime>
+#include <QFileInfo>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QStandardPaths>
 #include <QQueue>
 
 using namespace SignOnUi;
@@ -78,6 +83,7 @@
     void runQueue(RequestQueue &queue);
     void cancelUiRequest(const QString &requestId);
     void removeIdentityData(quint32 id);
+    RawCookies cookiesForIdentity(quint32 id, qint64 &timestamp) const;
 
 private Q_SLOTS:
     void onRequestCompleted();
@@ -94,6 +100,8 @@
     QObject(service),
     q_ptr(service)
 {
+    // This registers the RawCookies metatype with DBus
+    CookieJarManager::instance();
 }
 
 ServicePrivate::~ServicePrivate()
@@ -198,6 +206,35 @@
     CookieJarManager::instance()->removeForIdentity(id);
 }
 
+RawCookies ServicePrivate::cookiesForIdentity(quint32 id,
+                                              qint64 &timestamp) const
+{
+    RawCookies cookies;
+    timestamp = 0;
+
+    QString cachePath =
+        QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+    QString cookiesDBFile =
+        QString("%1/id-%2/.local/share/browser-process/.QtWebKit/cookies.db")
+        .arg(cachePath).arg(id);
+
+    QFileInfo fileInfo(cookiesDBFile);
+    if (!fileInfo.exists()) return cookies;
+    timestamp = fileInfo.lastModified().toMSecsSinceEpoch() / 1000;
+
+    QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
+    db.setDatabaseName(cookiesDBFile);
+    if (!db.open()) return cookies;
+
+    QSqlQuery q(db);
+    q.exec("SELECT cookieId, cookie FROM cookies;");
+    while (q.next()) {
+        cookies.insert(q.value(0).toString(), q.value(1).toString());
+    }
+
+    return cookies;
+}
+
 Service::Service(QObject *parent):
     QObject(parent),
     d_ptr(new ServicePrivate(this))
@@ -254,4 +291,11 @@
     d->removeIdentityData(id);
 }
 
+void Service::cookiesForIdentity(quint32 id,
+                                 RawCookies &cookies, qint64 &timestamp)
+{
+    Q_D(const Service);
+    cookies = d->cookiesForIdentity(id, timestamp);
+}
+
 #include "service.moc"

=== modified file 'src/service.h'
--- src/service.h	2013-04-24 08:36:41 +0000
+++ src/service.h	2013-12-09 11:50:35 +0000
@@ -21,6 +21,8 @@
 #ifndef SIGNON_UI_SERVICE_H
 #define SIGNON_UI_SERVICE_H
 
+#include "cookie-jar-manager.h"
+
 #include <QDBusContext>
 #include <QObject>
 #include <QVariantMap>
@@ -47,6 +49,15 @@
     Q_NOREPLY void cancelUiRequest(const QString &requestId);
     void removeIdentityData(quint32 id);
 
+    /*
+     * This is not officially part of the interface; it's an Ubuntu-specific
+     * experimental method, and we reserve the right to remove or change it in
+     * future releases.
+     */
+    void cookiesForIdentity(quint32 id,
+                            // Output parameters
+                            RawCookies &cookies, qint64 &timestamp);
+
 Q_SIGNALS:
     void isIdleChanged();
 

=== modified file 'src/signon-ui.pro'
--- src/signon-ui.pro	2013-10-04 17:15:49 +0000
+++ src/signon-ui.pro	2013-12-09 11:50:35 +0000
@@ -16,6 +16,7 @@
     dbus \
     gui \
     network \
+    sql \
     webkit
 
 PKGCONFIG += \