Merge lp:~mardy/webbrowser-app/force-cookie-refresh into lp:webbrowser-app

[Alberto Mardegan]

Allow webapps to specify a maximum lifetime for cookies

After this period has expired, the container will ask OA to use an interactive login, which should get us new cookies.

[lp:~mardy/webbrowser-app/force-cookie-refresh]

880. By Alberto Mardegan on 2015-02-06

No need to use a specialized method to compute time diffs

881. By Alberto Mardegan on 2015-02-06

Misc fixes

882. By Alberto Mardegan on 2015-02-06

From trunk

[ Olivier Tilloy ]
* Update translation template.
* Revert the UA override for m.youtube.com as it was causing a lot of
  stuttering (due to very high CPU usage) on krillin. In the meantime,
  the issue with videos not playing that this update was meant to
  address (bug #1415107) was resolved on youtube’s side. (LP:
  #1417258, #1415107)
[ Florian Boucault ]
* Make splashscreen white instead of the default black. (LP: #1378379)
[ Niklas Wenzel ]
* Add the ability to open a link in a new background tab (LP:
  #1339437)
[ Olivier Tilloy ]
* Use the new restoreState API in oxide 1.4 to properly save and
  restore navigation state across sessions. (LP: #1353143)
* Add a UA override for youtube.com on desktop to fix video playback.
  (LP: #1412880)
[ CI Train Bot ]
* Resync trunk
[ Alexandre Abreu ]
* Add support for intent:// schemes in the container. (LP: #1407709)
[ Ubuntu daily release ]
* New rebuild forced
[ Olivier Tilloy ]
* Update the m.youtube.com UA override to fix video playback. (LP:
  #1415107)

883. By Alberto Mardegan on 2015-02-06

Don't start browsing if are are to talk to OA

884. By Alberto Mardegan on 2015-03-04

from trunk

[ Olivier Tilloy ]
* Remove all references to private Qt headers, now that we require Qt
  5.4.
* Specify the cache path on the web context, to avoid caching data
  under ~/.local/share/. (LP: #1424726)
* Update translation template.
[ CI Train Bot ]
* New rebuild forced.
[ Olivier Tilloy ]
* Use the new Item::grabToImage() API (new in Qt 5.4) to replace the
  custom ItemCapture element. (LP: #1401581, #1425550)
[ Robert Bruce Park ]
* Launchpad automatic translations update.
[ Olivier Tilloy ]
* Fix a flaky autopilot test. (LP: #1423115)
* Use Qt::AA_ShareOpenGLContexts when building with Qt >= 5.4. (LP:
  #1387537)
[ Riccardo Padovani ]
* Fixed design of multiselection in history view (LP: #1412732)
[ CI Train Bot ]
* New rebuild forced.
[ Olivier Tilloy ]
* Honour Window.close() requests.
* Work around autopilot test failure by ensuring that the selection is
  cleared before clicking on the action button. (LP: #1417118)
* Add a config option to allow users to turn off automatic session
  restore.
* No-change rebuild against Qt 5.4.0.

885. By Alberto Mardegan on 2015-03-05

Use RequestPasswordPolicy

886. By Alberto Mardegan on 2015-03-11

From trunk

Unmerged revisions

886. By Alberto Mardegan on 2015-03-11

From trunk

885. By Alberto Mardegan on 2015-03-05

Use RequestPasswordPolicy

884. By Alberto Mardegan on 2015-03-04

from trunk

[ Olivier Tilloy ]
* Remove all references to private Qt headers, now that we require Qt
  5.4.
* Specify the cache path on the web context, to avoid caching data
  under ~/.local/share/. (LP: #1424726)
* Update translation template.
[ CI Train Bot ]
* New rebuild forced.
[ Olivier Tilloy ]
* Use the new Item::grabToImage() API (new in Qt 5.4) to replace the
  custom ItemCapture element. (LP: #1401581, #1425550)
[ Robert Bruce Park ]
* Launchpad automatic translations update.
[ Olivier Tilloy ]
* Fix a flaky autopilot test. (LP: #1423115)
* Use Qt::AA_ShareOpenGLContexts when building with Qt >= 5.4. (LP:
  #1387537)
[ Riccardo Padovani ]
* Fixed design of multiselection in history view (LP: #1412732)
[ CI Train Bot ]
* New rebuild forced.
[ Olivier Tilloy ]
* Honour Window.close() requests.
* Work around autopilot test failure by ensuring that the selection is
  cleared before clicking on the action button. (LP: #1417118)
* Add a config option to allow users to turn off automatic session
  restore.
* No-change rebuild against Qt 5.4.0.

883. By Alberto Mardegan on 2015-02-06

Don't start browsing if are are to talk to OA

882. By Alberto Mardegan on 2015-02-06

From trunk

[ Olivier Tilloy ]
* Update translation template.
* Revert the UA override for m.youtube.com as it was causing a lot of
  stuttering (due to very high CPU usage) on krillin. In the meantime,
  the issue with videos not playing that this update was meant to
  address (bug #1415107) was resolved on youtube’s side. (LP:
  #1417258, #1415107)
[ Florian Boucault ]
* Make splashscreen white instead of the default black. (LP: #1378379)
[ Niklas Wenzel ]
* Add the ability to open a link in a new background tab (LP:
  #1339437)
[ Olivier Tilloy ]
* Use the new restoreState API in oxide 1.4 to properly save and
  restore navigation state across sessions. (LP: #1353143)
* Add a UA override for youtube.com on desktop to fix video playback.
  (LP: #1412880)
[ CI Train Bot ]
* Resync trunk
[ Alexandre Abreu ]
* Add support for intent:// schemes in the container. (LP: #1407709)
[ Ubuntu daily release ]
* New rebuild forced
[ Olivier Tilloy ]
* Update the m.youtube.com UA override to fix video playback. (LP:
  #1415107)

881. By Alberto Mardegan on 2015-02-06

Misc fixes

880. By Alberto Mardegan on 2015-02-06

No need to use a specialized method to compute time diffs

879. By Alberto Mardegan on 2015-02-03

WIP

=== modified file 'src/app/webcontainer/AccountsLoginPage.qml'
--- src/app/webcontainer/AccountsLoginPage.qml	2014-10-06 12:52:34 +0000
+++ src/app/webcontainer/AccountsLoginPage.qml	2015-03-11 14:46:44 +0000
@@ -28,7 +28,10 @@
     property string accountProvider: ""
     property string applicationName: ""
 
-    signal done(variant credentialsId)
+    signal accountSelected(var credentialsId)
+    signal done(bool successful)
+
+    property var __account: null
 
     Timer {
         id: checkTimer
@@ -66,7 +69,11 @@
         if (accountsModel.count === 0) {
             accountsModel.createNewAccount()
         } else {
-            doLogin(accountsModel.model.get(0, "accountServiceHandle"))
+            var accountHandle = accountsModel.model.get(0, "accountServiceHandle")
+            __account = accountComponent.createObject(root, {
+                objectHandle: accountHandle
+            })
+            root.accountSelected(__account.authData.credentialsId)
         }
 
         // Note: Disable the account selection for now until we have a clearer view of
@@ -163,6 +170,7 @@
         }
     }
 
+    /*
     Component {
         id: accountsSelectionViewComponent
         AccountsView {
@@ -173,23 +181,29 @@
             onAccountSelected: doLogin(accountServiceHandle)
         }
     }
-
-    function doLogin(accountHandle) {
-        var account = accountComponent.createObject(root, {objectHandle: accountHandle});
-
+    */
+
+    function login(forceCookieRefresh) {
         function authenticatedCallback() {
-            account.authenticated.disconnect(authenticatedCallback);
-            done(account.authData.credentialsId);
+            console.log("Authenticated!")
+            __account.authenticated.disconnect(authenticatedCallback)
+            root.done(true)
         }
-        account.authenticated.connect(authenticatedCallback);
+        __account.authenticated.connect(authenticatedCallback)
 
         function errorCallback() {
-            account.authenticationError.disconnect(errorCallback);
-            done(null);
-        }
-        account.authenticationError.connect(errorCallback);
-
-        account.authenticate(null);
+            console.log("Authentication error!")
+            __account.authenticationError.disconnect(errorCallback)
+            root.done(false)
+        }
+        __account.authenticationError.connect(errorCallback)
+
+        var params = {}
+        if (forceCookieRefresh) {
+            params["UiPolicy"] = 1 // RequestPasswordPolicy
+        }
+
+        __account.authenticate(params)
     }
 
     Component {

=== modified file 'src/app/webcontainer/AccountsPage.qml'
--- src/app/webcontainer/AccountsPage.qml	2014-10-02 18:03:46 +0000
+++ src/app/webcontainer/AccountsPage.qml	2015-03-11 14:46:44 +0000
@@ -25,8 +25,10 @@
 
     property alias accountProvider: accountsLogin.accountProvider
     property alias applicationName: accountsLogin.applicationName
+    property int selectedAccount: -1
 
-    signal done(bool successful, var credentialsId)
+    signal accountSelected(var credentialsId)
+    signal done(bool successful)
 
     visible: true
     anchors.fill: parent
@@ -36,10 +38,11 @@
 
         anchors.fill: parent
 
-        onDone: {
-            if (!accountsPage.visible)
-                return
-            accountsPage.done(credentialsId != null, credentialsId)
-        }
+        onAccountSelected: accountsPage.selectedAccount = credentialsId
+        onDone: accountsPage.done(successful)
+    }
+
+    function login(forceCookieRefresh) {
+        accountsLogin.login(forceCookieRefresh)
     }
 }

=== modified file 'src/app/webcontainer/chrome-cookie-store.cpp'
--- src/app/webcontainer/chrome-cookie-store.cpp	2014-10-08 07:08:49 +0000
+++ src/app/webcontainer/chrome-cookie-store.cpp	2015-03-11 14:46:44 +0000
@@ -21,11 +21,15 @@
 
 #include <QDebug>
 #include <QFileInfo>
+#include <QSettings>
 #include <QStandardPaths>
 
+const QString keyLastMovedTimeStamp = QStringLiteral("CookiesLastMoved");
+
 ChromeCookieStore::ChromeCookieStore(QObject* parent):
     CookieStore(parent),
-    m_cookieHelper(new OxideCookieHelper(this))
+    m_cookieHelper(new OxideCookieHelper(this)),
+    m_settings(0)
 {
     QObject::connect(m_cookieHelper, SIGNAL(oxideStoreBackendChanged()),
                      this, SIGNAL(oxideStoreBackendChanged()));
@@ -73,7 +77,7 @@
 
 QDateTime ChromeCookieStore::lastUpdateTimeStamp() const
 {
-    QFileInfo dbFileInfo(m_dbPath);
+    QFileInfo dbFileInfo(m_dbPath + "/cookies.sqlite");
     return dbFileInfo.lastModified();
 }
 
@@ -93,6 +97,8 @@
             return;
         }
         m_dbPath = normalizedPath;
+        delete m_settings;
+        m_settings = new QSettings(m_dbPath + "/uoa.ini", QSettings::IniFormat);
         Q_EMIT dbPathChanged();
     }
 }
@@ -101,3 +107,20 @@
 {
     return m_dbPath;
 }
+
+void ChromeCookieStore::setLastMovedTimeStamp(const QDateTime &timeStamp)
+{
+    if (Q_UNLIKELY(!m_settings)) {
+        qWarning() << "dbPath not set!";
+        return;
+    }
+    m_settings->setValue(keyLastMovedTimeStamp, timeStamp.toString(Qt::ISODate));
+    m_settings->sync();
+    Q_EMIT lastMovedTimeStampChanged();
+}
+
+QDateTime ChromeCookieStore::lastMovedTimeStamp() const
+{
+    return m_settings ?
+        m_settings->value(keyLastMovedTimeStamp).toDateTime() : QDateTime();
+}

=== modified file 'src/app/webcontainer/chrome-cookie-store.h'
--- src/app/webcontainer/chrome-cookie-store.h	2014-10-08 07:08:49 +0000
+++ src/app/webcontainer/chrome-cookie-store.h	2015-03-11 14:46:44 +0000
@@ -25,6 +25,7 @@
 #include <QUrl>
 
 class OxideCookieHelper;
+class QSettings;
 
 class ChromeCookieStore : public CookieStore
 {
@@ -32,6 +33,8 @@
 
     Q_PROPERTY(QString dbPath READ dbPath WRITE setDbPath NOTIFY dbPathChanged)
     Q_PROPERTY(QObject* oxideStoreBackend READ oxideStoreBackend WRITE setOxideStoreBackend NOTIFY oxideStoreBackendChanged)
+    Q_PROPERTY(QDateTime lastMovedTimeStamp READ lastMovedTimeStamp \
+               WRITE setLastMovedTimeStamp NOTIFY lastMovedTimeStampChanged)
 
 public:
     ChromeCookieStore(QObject* parent = 0);
@@ -47,9 +50,13 @@
     // CookieStore overrides
     QDateTime lastUpdateTimeStamp() const Q_DECL_OVERRIDE;
 
+    void setLastMovedTimeStamp(const QDateTime &timeStamp);
+    QDateTime lastMovedTimeStamp() const;
+
 Q_SIGNALS:
     void dbPathChanged();
     void oxideStoreBackendChanged();
+    void lastMovedTimeStampChanged();
 
 private Q_SLOTS:
     void oxideCookiesReceived(int requestId, const QVariant& cookies);
@@ -62,6 +69,7 @@
 private:
     OxideCookieHelper* m_cookieHelper;
     QString m_dbPath;
+    QSettings *m_settings;
 };
 
 #endif // CHROME_COOKIE_STORE_H

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2015-02-27 09:28:41 +0000
+++ src/app/webcontainer/webapp-container.cpp	2015-03-11 14:46:44 +0000
@@ -115,6 +115,7 @@
     m_backForwardButtonsVisible(false),
     m_addressBarVisible(false),
     m_localWebappManifest(false),
+    m_cookieRefreshInterval(0),
     m_webappContainerHelper(new WebappContainerHelper())
 {
 }
@@ -145,6 +146,7 @@
         m_window->setProperty("backForwardButtonsVisible", m_backForwardButtonsVisible);
         m_window->setProperty("chromeVisible", m_addressBarVisible);
         m_window->setProperty("accountProvider", m_accountProvider);
+        m_window->setProperty("cookieRefreshInterval", m_cookieRefreshInterval);
 
         qDebug() << "Using" << (m_withOxide ? "Oxide" : "QtWebkit") << "as the web engine backend";
         m_window->setProperty("oxide", m_withOxide);
@@ -287,6 +289,7 @@
        " [--enable-addressbar]"
        " [--store-session-cookies]"
        " [--user-agent-string=USER_AGENT]"
+       " [--cookie-refresh-interval=DAYS]"
        " [URL]" << endl;
     out << "Options:" << endl;
     out << "  -h, --help                          display this help message and exit" << endl;
@@ -305,6 +308,7 @@
     out << "Chrome options (if none specified, no chrome is shown by default):" << endl;
     out << "  --enable-back-forward               enable the display of the back and forward buttons (implies --enable-addressbar)" << endl;
     out << "  --enable-addressbar                 enable the display of a minimal chrome (favicon and title)" << endl;
+    out << "  --cookie-refresh-interval           the maximum number of days between manual logins" << endl;
 }
 
 void WebappContainer::parseCommandLine()
@@ -348,6 +352,8 @@
             m_localCookieStoreDbPath = argument.split("--local-cookie-db-path=")[1];
         } else if (argument.startsWith("--user-agent-string=")) {
             m_userAgentOverride = argument.split("--user-agent-string=")[1];
+        } else if (argument.startsWith("--cookie-refresh-interval=")) {
+            m_cookieRefreshInterval = argument.split("--cookie-refresh-interval=")[1].toInt();
         }
     }
 }

=== modified file 'src/app/webcontainer/webapp-container.h'
--- src/app/webcontainer/webapp-container.h	2015-01-26 14:53:18 +0000
+++ src/app/webcontainer/webapp-container.h	2015-03-11 14:46:44 +0000
@@ -68,6 +68,7 @@
     QString m_popupRedirectionUrlPrefixPattern;
     QString m_localCookieStoreDbPath;
     QString m_userAgentOverride;
+    int m_cookieRefreshInterval;
     QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
     QScopedPointer<IntentFilter> m_intentFilter;
 

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2015-02-02 13:55:49 +0000
+++ src/app/webcontainer/webapp-container.qml	2015-03-11 14:46:44 +0000
@@ -42,8 +42,10 @@
     property string popupRedirectionUrlPrefixPattern: ""
     property url webviewOverrideFile: ""
     property var __webappCookieStore: null
+    property var __sourceCookieStore: null
     property string localUserAgentOverride: ""
     property bool blockOpenExternalUrls: false
+    property int cookieRefreshInterval: 0
 
     currentWebview: webappViewLoader.item ? webappViewLoader.item.currentWebview : null
 
@@ -164,9 +166,10 @@
             if (status == Loader.Error) {
                 // Happens on the desktop, if Ubuntu.OnlineAccounts.Client
                 // can't be imported
-                loadWebAppView()
+                loadWebAppView(true)
             } else if (status == Loader.Ready) {
                 item.visible = true
+                initializeForAccount(item.selectedAccount)
             }
         }
     }
@@ -177,48 +180,81 @@
         }
         if (!result) {
             console.log("Cookies were not moved")
+        } else {
+            console.log("cookies moved, timestamp = " + __sourceCookieStore.lastUpdateTimeStamp)
+            __webappCookieStore.lastMovedTimeStamp = __sourceCookieStore.lastUpdateTimeStamp
         }
         webappViewLoader.item.url = root.url
     }
 
     function moveCookies(credentialsId) {
+        console.log("moving cookies for id " + credentialsId)
+        var storeComponent = localCookieStoreDbPath.length !== 0 ?
+                    localCookieStoreComponent : onlineAccountStoreComponent
+
+        __sourceCookieStore = storeComponent.createObject(root, { "accountId": credentialsId })
+        __webappCookieStore.moved.connect(onCookiesMoved)
+        __webappCookieStore.moveFrom(__sourceCookieStore)
+    }
+
+    function doLogin() {
         if (!__webappCookieStore) {
             var context = webappViewLoader.item.currentWebview.context
             __webappCookieStore = oxideCookieStoreComponent.createObject(this, {
                 "oxideStoreBackend": context.cookieManager,
-                "dbPath": context.dataPath + "/cookies.sqlite"
+                "dbPath": context.dataPath
             })
         }
 
-        var storeComponent = localCookieStoreDbPath.length !== 0 ?
-                    localCookieStoreComponent : onlineAccountStoreComponent
-
-        var instance = storeComponent.createObject(root, { "accountId": credentialsId })
-        __webappCookieStore.moved.connect(onCookiesMoved)
-        __webappCookieStore.moveFrom(instance)
+        /* Check the date of the cookies; if it's older than
+         * "cookieRefreshInterval" days, set the "forceCookieRefresh" flag so
+         * that Online Accounts will use an interactive login (and hopefully
+         * get new cookies). */
+        var forceCookieRefresh = false
+        if (cookieRefreshInterval > 0) {
+            var elapsedMs = Date.now() - __webappCookieStore.lastMovedTimeStamp
+            // convert days to milliseconds
+            if (elapsedMs > cookieRefreshInterval * 86400000) {
+                forceCookieRefresh = true
+            }
+        }
+        console.log("Preparing for login, forced = " + forceCookieRefresh)
+        accountsPageComponentLoader.item.login(forceCookieRefresh)
+    }
+
+    function initializeForAccount(credentialsId) {
+        console.log("Account selected, creds: " + credentialsId)
+        if (credentialsId < 0) return
+
+        if (credentialsId > 0) {
+            webappViewLoader.loaded.connect(function () {
+                if (webappViewLoader.status == Loader.Ready) {
+                    doLogin()
+                }
+            });
+            webappViewLoader.credentialsId = credentialsId
+            // If we need to preserve session cookies, make sure that the
+            // mode is "restored" and not "persistent", or the cookies
+            // transferred from OA would be lost.
+            // We check if the webContextSessionCookieMode is defined and, if so,
+            // we override it in the webapp loader.
+            if (typeof webContextSessionCookieMode === "string") {
+                webappViewLoader.webContextSessionCookieMode = "restored"
+            }
+        }
+
+        loadWebAppView(credentialsId == 0)
     }
 
     Connections {
         target: accountsPageComponentLoader.item
+        onSelectedAccountChanged: initializeForAccount(accountsPageComponentLoader.item.selectedAccount)
         onDone: {
+            console.log("Authentication done, successful = " + successful)
             if (successful) {
-                webappViewLoader.loaded.connect(function () {
-                    if (webappViewLoader.status == Loader.Ready) {
-                        moveCookies(webappViewLoader.credentialsId)
-                    }
-                });
-                webappViewLoader.credentialsId = credentialsId
-                // If we need to preserve session cookies, make sure that the
-                // mode is "restored" and not "persistent", or the cookies
-                // transferred from OA would be lost.
-                // We check if the webContextSessionCookieMode is defined and, if so,
-                // we override it in the webapp loader.
-                if (typeof webContextSessionCookieMode === "string") {
-                    webappViewLoader.webContextSessionCookieMode = "restored"
-                }
+                moveCookies(webappViewLoader.credentialsId)
             }
-
-            loadWebAppView()
+            // FIXME else?
         }
     }
 
@@ -243,7 +279,7 @@
         if (accountProvider.length !== 0 && oxide) {
             loadLoginView();
         } else {
-            loadWebAppView();
+            loadWebAppView(true);
         }
     }
 
@@ -259,22 +295,24 @@
         })
     }
 
-    function loadWebAppView() {
+    function loadWebAppView(startBrowsing) {
         if (accountsPageComponentLoader.item)
             accountsPageComponentLoader.item.visible = false
 
-        webappViewLoader.loaded.connect(function () {
-            if (webappViewLoader.status === Loader.Ready) {
-                // As we use StateSaver to restore the URL, we need to check first if
-                // it has not been set previously before setting the URL to the default property 
-                // homepage.
-                var webView = webappViewLoader.item.currentWebview
-                var current_url = webView.url.toString();
-                if (!current_url || current_url.length === 0) {
-                    webView.url = root.url
+        if (startBrowsing) {
+            webappViewLoader.loaded.connect(function () {
+                if (webappViewLoader.status === Loader.Ready) {
+                    // As we use StateSaver to restore the URL, we need to check first if
+                    // it has not been set previously before setting the URL to the default property 
+                    // homepage.
+                    var webView = webappViewLoader.item.currentWebview
+                    var current_url = webView.url.toString();
+                    if (!current_url || current_url.length === 0) {
+                        webView.url = root.url
+                    }
                 }
-            }
-        });
+            });
+        }
         webappViewLoader.sourceComponent = webappViewComponent
     }