Merge lp:~mardy/signon-ui/ignore-ssl-errors into lp:signon-ui

[Alberto Mardegan]

Add flag to ignore SSL errors

Add the possibility of ignoring SSL errors. While this won't be used by
ordinary accounts, we need this for our integration tests: we'll run a local
webserver and test the OAuth 2.0 authentication, which always happens over
HTTPS.

Add flag to ignore SSL errors

Add the possibility of ignoring SSL errors. While this won't be used by
ordinary accounts, we need this for our integration tests: we'll run a local
webserver and test the OAuth 2.0 authentication, which always happens over
HTTPS.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-raring-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-raring-armhf-ci/3

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Please update debian/changelog

review: Needs Fixing

[lp:~mardy/signon-ui/ignore-ssl-errors]

88. By Alberto Mardegan on 2013-05-10

Update from trunk

89. By Alberto Mardegan on 2013-05-10

Add a flag to disable SSL errors (to be used for integration tests).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-raring-amd64-ci/19

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-02 20:48:13 +0000
+++ debian/changelog	2013-05-10 14:47:26 +0000
@@ -1,3 +1,9 @@
+signon-ui (0.14daily13.05.10.1ubuntu.unity.next-0ubuntu2) UNRELEASED; urgency=low
+
+  * Add a flag to disable SSL errors (to be used for integration tests).
+
+ -- Alberto Mardegan <[e-mail]>  Fri, 10 May 2013 17:42:04 +0300
+
 signon-ui (0.14daily13.05.02.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   * Automatic snapshot from revision 95 (ubuntu-unity/next)

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2013-04-24 09:16:03 +0000
+++ src/browser-request.cpp	2013-05-10 14:47:26 +0000
@@ -30,12 +30,14 @@
 #include <QDesktopServices>
 #include <QLabel>
 #include <QNetworkCookie>
+#include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QPointer>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QRegExp>
 #include <QSettings>
+#include <QSslError>
 #include <QStackedLayout>
 #include <QTimer>
 #include <QVBoxLayout>
@@ -68,6 +70,7 @@
 /* Additional session-data keys we support. */
 static const QString keyCookies = QString("Cookies");
 static const QString keyAllowedSchemes = QString("AllowedSchemes");
+static const QString keyIgnoreSslErrors = QString("IgnoreSslErrors");
 
 class WebPage: public QWebPage
 {
@@ -237,6 +240,7 @@
     void start();
 
 private Q_SLOTS:
+    void onSslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
     void onUrlChanged(const QUrl &url);
     void onLoadProgress();
     void onLoadFinished(bool ok);
@@ -280,6 +284,7 @@
     QString m_username;
     QString m_password;
     int m_loginCount;
+    bool m_ignoreSslErrors;
     QTimer m_failTimer;
 };
 
@@ -293,7 +298,8 @@
     m_webView(0),
     m_animationLabel(0),
     m_settings(0),
-    m_loginCount(0)
+    m_loginCount(0),
+    m_ignoreSslErrors(false)
 {
     m_failTimer.setSingleShot(true);
     m_failTimer.setInterval(3000);
@@ -306,6 +312,15 @@
     delete m_dialog;
 }
 
+void BrowserRequestPrivate::onSslErrors(QNetworkReply *reply,
+                                        const QList<QSslError> &errors)
+{
+    TRACE() << errors;
+    if (m_ignoreSslErrors) {
+        reply->ignoreSslErrors();
+    }
+}
+
 void BrowserRequestPrivate::onUrlChanged(const QUrl &url)
 {
     Q_Q(BrowserRequest);
@@ -431,6 +446,9 @@
     WebPage *page = new WebPage(this);
     QObject::connect(page, SIGNAL(contentsChanged()),
                      this, SLOT(onContentsChanged()));
+    QObject::connect(page->networkAccessManager(),
+                     SIGNAL(sslErrors(QNetworkReply*,const QList<QSslError> &)),
+                     this, SLOT(onSslErrors(QNetworkReply*,const QList<QSslError> &)));
     m_webView->setPage(page);
 
     /* The following couple of lines serve to instruct the QWebPage not to load
@@ -459,6 +477,8 @@
         page->setAllowedSchemes(QStringList("https"));
     }
 
+    m_ignoreSslErrors = clientData.value(keyIgnoreSslErrors, false).toBool();
+
     QUrl url(params.value(SSOUI_KEY_OPENURL).toString());
     setupViewForUrl(url);
     QObject::connect(m_webView, SIGNAL(urlChanged(const QUrl&)),