Merge lp:~online-accounts/signon-plugin-oauth2/packaging into lp:signon-plugin-oauth2

[Alberto Mardegan]

Merge from upstream

  - Proceed with the normal authentication if an error occurs when using the
    RefreshToken (LP: #1420934)
  - Remove the unused "type" query parameters which breaks DropBox

Merge from upstream

  - Proceed with the normal authentication if an error occurs when using the
    RefreshToken (LP: #1420934)
  - Remove the unused "type" query parameters which breaks DropBox

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/signon-plugin-oauth2-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-plugin-oauth2-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-plugin-oauth2-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/signon-plugin-oauth2-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-plugin-oauth2-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-plugin-oauth2-ci/17/rebuild

review: Approve (continuous-integration)

[lp:~online-accounts/signon-plugin-oauth2/packaging]

72. By Alberto Mardegan on 2015-03-19

Remove dependency on signon-ui. Fixes: #1362640
Approved by: PS Jenkins bot, David Barth

73. By CI Train Bot Account on 2015-03-19

Releasing 0.21+15.04.20150319-0ubuntu1

74. By Alberto Mardegan on 2015-03-27

Merge from upstream

  - Proceed with the normal authentication if an error occurs when using the
    RefreshToken (LP: #1420934)
  - Remove the unused "type" query parameters which breaks DropBox
 Fixes: #1420934
Approved by: PS Jenkins bot

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-28 17:16:29 +0000
+++ debian/changelog	2015-02-16 15:55:13 +0000
@@ -1,3 +1,12 @@
+signon-plugin-oauth2 (0.21+15.04.20150128-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge from upstream
+    - Proceed with the normal authentication if an error occurs when using the
+      RefreshToken (LP: #1420934)
+    - Remove the unused "type" query parameters which breaks DropBox
+
+ -- Alberto Mardegan <[e-mail]>  Mon, 16 Feb 2015 17:51:01 +0200
+
 signon-plugin-oauth2 (0.21+15.04.20150128-0ubuntu1) vivid; urgency=medium
 
   [ Alberto Mardegan ]

=== modified file 'src/base-plugin.cpp'
--- src/base-plugin.cpp	2012-11-21 13:34:54 +0000
+++ src/base-plugin.cpp	2015-02-16 15:55:13 +0000
@@ -40,25 +40,39 @@
 
 class BasePluginPrivate
 {
+    Q_DECLARE_PUBLIC(BasePlugin)
+
 public:
-    BasePluginPrivate();
+    BasePluginPrivate(BasePlugin *q);
     ~BasePluginPrivate();
 
+    void disposeReply();
+
     QNetworkAccessManager *m_networkAccessManager;
     QNetworkReply *m_reply;
+    mutable BasePlugin *q_ptr;
 }; //Private
 
 } //namespace OAuth2PluginNS
 
-BasePluginPrivate::BasePluginPrivate():
+BasePluginPrivate::BasePluginPrivate(BasePlugin *q):
     m_networkAccessManager(0),
-    m_reply(0)
+    m_reply(0),
+    q_ptr(q)
 {
 }
 
 BasePluginPrivate::~BasePluginPrivate()
 {
+    disposeReply();
+}
+
+void BasePluginPrivate::disposeReply()
+{
+    Q_Q(BasePlugin);
+
     if (m_reply != 0) {
+        QObject::disconnect(m_reply, 0, q, 0);
         m_reply->deleteLater();
         m_reply = 0;
     }
@@ -66,7 +80,7 @@
 
 BasePlugin::BasePlugin(QObject *parent):
     QObject(parent),
-    d_ptr(new BasePluginPrivate())
+    d_ptr(new BasePluginPrivate(this))
 {
 }
 
@@ -113,7 +127,7 @@
     connect(d->m_reply, SIGNAL(finished()),
             this, SLOT(onPostFinished()));
     connect(d->m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
-            this, SLOT(handleNetworkError(QNetworkReply::NetworkError)));
+            this, SLOT(onNetworkError(QNetworkReply::NetworkError)));
     connect(d->m_reply, SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(handleSslErrors(QList<QSslError>)));
 }
@@ -131,24 +145,34 @@
     QNetworkReply *reply = (QNetworkReply*)sender();
 
     TRACE() << "Finished signal received";
+
+    d->disposeReply();
+
     if (reply->error() != QNetworkReply::NoError) {
-        if (handleNetworkError(reply->error()))
+        if (handleNetworkError(reply, reply->error()))
             return;
     }
 
-    if (d->m_reply) {
-        d->m_reply->deleteLater();
-        d->m_reply = 0;
-    }
-
     serverReply(reply);
 }
 
-bool BasePlugin::handleNetworkError(QNetworkReply::NetworkError err)
-{
-    Q_D(BasePlugin);
-
-    TRACE() << "error signal received:" << err;
+void BasePlugin::onNetworkError(QNetworkReply::NetworkError err)
+{
+    Q_D(BasePlugin);
+
+    QNetworkReply *reply = (QNetworkReply*)sender();
+
+    TRACE() << "Network error:" << err;
+
+    handleNetworkError(reply, err);
+    d->disposeReply();
+}
+
+bool BasePlugin::handleNetworkError(QNetworkReply *reply,
+                                    QNetworkReply::NetworkError err)
+{
+    Q_D(BasePlugin);
+
     /* Has been handled by handleSslErrors already */
     if (err == QNetworkReply::SslHandshakeFailedError) {
         return true;
@@ -162,11 +186,7 @@
     if (err <= QNetworkReply::UnknownNetworkError)
         type = Error::NoConnection;
     QString errorString = "";
-    if (d->m_reply) {
-        errorString = d->m_reply->errorString();
-        d->m_reply->deleteLater();
-        d->m_reply = 0;
-    }
+    errorString = reply->errorString();
     emit error(Error(type, errorString));
     return true;
 }

=== modified file 'src/base-plugin.h'
--- src/base-plugin.h	2012-07-20 06:29:22 +0000
+++ src/base-plugin.h	2015-02-16 15:55:13 +0000
@@ -64,10 +64,15 @@
                      const QByteArray &data);
 
     virtual void serverReply(QNetworkReply *reply);
+    /*!
+     * Returns true if processing of the reply must stop.
+     */
+    virtual bool handleNetworkError(QNetworkReply *reply,
+                                    QNetworkReply::NetworkError err);
 
 protected Q_SLOTS:
     void onPostFinished();
-    virtual bool handleNetworkError(QNetworkReply::NetworkError err);
+    void onNetworkError(QNetworkReply::NetworkError err);
     virtual void handleSslErrors(QList<QSslError> errorList);
 
 Q_SIGNALS:

=== modified file 'src/oauth2plugin.cpp'
--- src/oauth2plugin.cpp	2015-01-28 10:14:40 +0000
+++ src/oauth2plugin.cpp	2015-02-16 15:55:13 +0000
@@ -140,7 +140,6 @@
     if (!d->m_oauth2Data.Display().isEmpty()) {
         url.addQueryItem(DISPLAY, d->m_oauth2Data.Display());
     }
-    url.addQueryItem(QString("type"), d->m_mechanism);
     if (!d->m_oauth2Data.Scope().empty()) {
         QString separator = QLatin1String(" ");
 
@@ -520,6 +519,18 @@
     }
 }
 
+bool OAuth2Plugin::handleNetworkError(QNetworkReply *reply,
+                                      QNetworkReply::NetworkError err)
+{
+    if (err >= QNetworkReply::ContentAccessDenied) {
+        QByteArray replyContent = reply->readAll();
+        TRACE() << replyContent;
+        handleOAuth2Error(replyContent);
+        return true;
+    }
+    return BasePlugin::handleNetworkError(reply, err);
+}
+
 void OAuth2Plugin::handleOAuth2Error(const QByteArray &reply)
 {
     Q_D(OAuth2Plugin);

=== modified file 'src/oauth2plugin.h'
--- src/oauth2plugin.h	2015-01-28 10:14:40 +0000
+++ src/oauth2plugin.h	2015-02-16 15:55:13 +0000
@@ -65,6 +65,8 @@
 
 protected:
     void serverReply(QNetworkReply *);
+    bool handleNetworkError(QNetworkReply *reply,
+                            QNetworkReply::NetworkError err);
 
 private:
     void sendOAuth2AuthRequest();

=== modified file 'tests/oauth2plugintest.cpp'
--- tests/oauth2plugintest.cpp	2015-01-28 10:14:40 +0000
+++ tests/oauth2plugintest.cpp	2015-02-16 15:55:13 +0000
@@ -95,8 +95,12 @@
         m_offset(0)
     {}
 
-    void setError(NetworkError errorCode, const QString &errorString) {
+    void setError(NetworkError errorCode, const QString &errorString,
+                  int delay = -1) {
         QNetworkReply::setError(errorCode, errorString);
+        if (delay > 0) {
+            QTimer::singleShot(delay, this, SLOT(fail()));
+        }
     }
 
     void setRawHeader(const QByteArray &headerName, const QByteArray &value) {
@@ -124,6 +128,7 @@
 
 public Q_SLOTS:
     void finish() { setFinished(true); Q_EMIT finished(); }
+    void fail() { Q_EMIT error(error()); }
 
 protected:
     void abort() Q_DECL_OVERRIDE {}
@@ -1358,6 +1363,98 @@
     delete nam;
 }
 
+void OAuth2PluginTest::testRefreshTokenError_data()
+{
+    QTest::addColumn<int>("replyErrorCode");
+    QTest::addColumn<int>("replyStatusCode");
+    QTest::addColumn<QString>("replyContents");
+    QTest::addColumn<int>("expectedError");
+
+    QTest::newRow("invalid grant, 400") <<
+        int(QNetworkReply::ProtocolInvalidOperationError) <<
+        int(400) <<
+        "{ \"error\":\"invalid_grant\" }" <<
+        int(-1);
+
+    QTest::newRow("invalid grant, 401") <<
+        int(QNetworkReply::ContentAccessDenied) <<
+        int(401) <<
+        "{ \"error\":\"invalid_grant\" }" <<
+        int(-1);
+
+    QTest::newRow("invalid grant, 401, no error signal") <<
+        int(-1) <<
+        int(401) <<
+        "{ \"error\":\"invalid_grant\" }" <<
+        int(-1);
+
+    QTest::newRow("temporary network failure") <<
+        int(QNetworkReply::TemporaryNetworkFailureError) <<
+        int(-1) <<
+        "" <<
+        int(Error::NoConnection);
+}
+
+void OAuth2PluginTest::testRefreshTokenError()
+{
+    QFETCH(int, replyErrorCode);
+    QFETCH(int, replyStatusCode);
+    QFETCH(QString, replyContents);
+    QFETCH(int, expectedError);
+
+    OAuth2PluginData data;
+    data.setHost("localhost");
+    data.setAuthPath("authorize");
+    data.setTokenPath("access_token");
+    data.setClientId("104660106251471");
+    data.setClientSecret("fa28f40b5a1f8c1d5628963d880636fbkjkjkj");
+    data.setRedirectUri("http://localhost/resp.html");
+
+    QVariantMap tokens;
+    QVariantMap token;
+    token.insert("Token", QLatin1String("tokenfromtest"));
+    token.insert("timestamp", QDateTime::currentDateTime().toTime_t() - 10000);
+    token.insert("Expiry", 1000);
+    token.insert("refresh_token", QString("r3fr3sh"));
+    tokens.insert(data.ClientId(), QVariant::fromValue(token));
+    data.m_data.insert("Tokens", tokens);
+
+    SignOn::UiSessionData info;
+
+    QObject::connect(m_testPlugin, SIGNAL(result(const SignOn::SessionData&)),
+                  this, SLOT(result(const SignOn::SessionData&)),
+                  Qt::QueuedConnection);
+    QObject::connect(m_testPlugin, SIGNAL(error(const SignOn::Error & )),
+                  this, SLOT(pluginError(const SignOn::Error &)),
+                  Qt::QueuedConnection);
+    QObject::connect(m_testPlugin, SIGNAL(userActionRequired(const SignOn::UiSessionData&)),
+                  this, SLOT(uiRequest(const SignOn::UiSessionData&)),
+                  Qt::QueuedConnection);
+    QTimer::singleShot(10*1000, &m_loop, SLOT(quit()));
+
+    TestNetworkAccessManager *nam = new TestNetworkAccessManager;
+    m_testPlugin->m_networkAccessManager = nam;
+    TestNetworkReply *reply = new TestNetworkReply(this);
+    if (replyErrorCode >= 0) {
+        reply->setError(QNetworkReply::NetworkError(replyErrorCode),
+                        "Dummy error", 5);
+    }
+    reply->setStatusCode(replyStatusCode);
+    reply->setContentType("application/json");
+    reply->setContent(replyContents.toUtf8());
+    nam->setNextReply(reply);
+
+    m_testPlugin->process(data, QString("web_server"));
+    m_loop.exec();
+
+    QCOMPARE(m_error.type(), expectedError);
+    if (expectedError < 0) {
+        QCOMPARE(m_uiResponse.UrlResponse(), QString("UI request received"));
+    }
+
+    delete nam;
+}
+
 void OAuth2PluginTest::testClientAuthentication_data()
 {
     QTest::addColumn<QString>("clientSecret");

=== modified file 'tests/oauth2plugintest.h'
--- tests/oauth2plugintest.h	2014-10-31 08:09:57 +0000
+++ tests/oauth2plugintest.h	2015-02-16 15:55:13 +0000
@@ -66,6 +66,8 @@
     void testOAuth2Errors();
     void testRefreshToken_data();
     void testRefreshToken();
+    void testRefreshTokenError_data();
+    void testRefreshTokenError();
     void testClientAuthentication_data();
     void testClientAuthentication();