From 378fbbcbc9c65d1462ea6994f1f680412531a043 Mon Sep 17 00:00:00 2001
From: Paulo Pinheiro <paulovap.os@gmail.com>
Date: Wed, 25 Feb 2015 22:00:57 -0300
Subject: Quick: Fix handling of multiple certificate errors per request

This patch enables Quick API to handle multiple certificate errors per
requests and update the example projects. Chromium 40 branch raise an
certificate error for every resource loaded in a request (.js, .css, .html)
instead of only one (previous behavior), so requests with more than one
certificate error were automatically rejected.

Change-Id: Ibaa3027cd6e7f22b5dc51dcd52f76ccf5ea162d3
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
---
 tests/quicktestbrowser/BrowserWindow.qml | 57 ++++++++++++++++++++++++++------
 tests/quicktestbrowser/utils.h           |  6 ++++
 2 files changed, 52 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml
index 2c8e9e1ea..b111edb6c 100644
--- a/tests/quicktestbrowser/BrowserWindow.qml
+++ b/tests/quicktestbrowser/BrowserWindow.qml
@@ -357,10 +357,12 @@ ApplicationWindow {
                     ]
 
                     onCertificateError: {
-                        sslDialog.certError = error
-                        sslDialog.text = "Certificate Error: " + error.description
-                        sslDialog.visible = true
-                        error.defer()
+                        if (!acceptedCertificates.shouldAutoAccept(error)){
+                            error.defer()
+                            sslDialog.enqueue(error)
+                        } else{
+                            error.ignoreCertificateError()
+                        }
                     }
 
                     onNewViewRequested: {
@@ -440,17 +442,50 @@ ApplicationWindow {
         }
     }
 
+    QtObject{
+        id:acceptedCertificates
+
+        property var acceptedUrls : []
+
+        function shouldAutoAccept(certificateError){
+            var domain = utils.domainFromString(certificateError.url)
+            return acceptedUrls.indexOf(domain) >= 0
+        }
+    }
+
     MessageDialog {
         id: sslDialog
 
-        property var certError
-
-        standardButtons: StandardButton.Cancel | StandardButton.Ok
-        visible: false
-        title: "Do you want to accept this certificate?"
+        property var certErrors: []
+        icon: StandardIcon.Warning
+        standardButtons: StandardButton.No | StandardButton.Yes
+        title: "Server's certificate not trusted"
+        text: "Do you wish to continue?"
+        detailedText: "If you wish so, you may continue with an unverified certificate. " +
+                      "Accepting an unverified certificate means " +
+                      "you may not be connected with the host you tried to connect to.\n" +
+                      "Do you wish to override the security check and continue?"
+        onYes: {
+            var cert = certErrors.shift()
+            var domain = utils.domainFromString(cert.url)
+            acceptedCertificates.acceptedUrls.push(domain)
+            cert.ignoreCertificateError()
+            presentError()
+        }
+        onNo: reject()
+        onRejected: reject()
 
-        onAccepted: certError.ignoreCertificateError()
-        onRejected: certError.rejectCertificate()
+        function reject(){
+            certErrors.shift().rejectCertificate()
+            presentError()
+        }
+        function enqueue(error){
+            certErrors.push(error)
+            presentError()
+        }
+        function presentError(){
+            visible = certErrors.length > 0
+        }
     }
 
     DownloadView {
diff --git a/tests/quicktestbrowser/utils.h b/tests/quicktestbrowser/utils.h
index 0f4460dfe..52025b7e4 100644
--- a/tests/quicktestbrowser/utils.h
+++ b/tests/quicktestbrowser/utils.h
@@ -48,6 +48,7 @@ class Utils : public QObject {
     Q_OBJECT
 public:
     Q_INVOKABLE static QUrl fromUserInput(const QString& userInput);
+    Q_INVOKABLE static QString domainFromString(const QString& urlString);
 };
 
 inline QUrl Utils::fromUserInput(const QString& userInput)
@@ -58,4 +59,9 @@ inline QUrl Utils::fromUserInput(const QString& userInput)
     return QUrl::fromUserInput(userInput);
 }
 
+inline QString Utils::domainFromString(const QString& urlString)
+{
+    return QUrl::fromUserInput(urlString).host();
+}
+
 #endif // UTILS_H
-- 
cgit v1.2.3