Add Qt WebEngine Quick API for allowing certificate errors

This adds API for overriding some certificate errors. Once overridden
any identical error for the same hostname and certificate will use
the same override.

Change-Id: Idf9e968edca18751cbdab744880480750d0c1bd4
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

5 files changed, 284 insertions, 4 deletions

diff --git a/src/webengine/api/qquickwebenginecertificateerror.cpp b/src/webengine/api/qquickwebenginecertificateerror.cpp
new file mode 100644
index 000000000..37b92727a
--- /dev/null
+++ b/src/webengine/api/qquickwebenginecertificateerror.cpp
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qquickwebenginecertificateerror_p.h>
+#include "certificate_error_controller.h"
+QT_BEGIN_NAMESPACE
+
+class QQuickWebEngineCertificateErrorPrivate {
+public:
+    QQuickWebEngineCertificateErrorPrivate(const QSharedPointer<CertificateErrorController> &controller)
+        : weakRefCertErrorController(controller),
+          error(static_cast<QQuickWebEngineCertificateError::Error>(static_cast<int>(controller->error()))),
+          description(controller->errorString()),
+          overridable(controller->overridable()),
+          async(false)
+    {
+    }
+
+    const QWeakPointer<CertificateErrorController> weakRefCertErrorController;
+    QQuickWebEngineCertificateError::Error error;
+    QString description;
+    bool overridable;
+    bool async;
+};
+
+
+
+/*!
+    \qmltype WebEngineCertificateError
+    \instantiates QQuickWebEngineCertificateError
+    \inqmlmodule QtWebEngine 1.1
+    \since QtWebEngine 1.1
+
+    \brief A utility class for accepting or denying certificate exceptions when a certificate error occurs.
+
+    This class contains information about a certificate error that happened and provides a way to accept or
+    deny a certificate exception.
+
+    \sa WebEngineView::certificateError
+*/
+QQuickWebEngineCertificateError::QQuickWebEngineCertificateError(const QSharedPointer<CertificateErrorController> &controller, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new QQuickWebEngineCertificateErrorPrivate(controller))
+{
+}
+
+QQuickWebEngineCertificateError::~QQuickWebEngineCertificateError()
+{
+    rejectCertificate();
+}
+
+
+/*!
+  \qmlmethod void WebEngineCertificateError::defer()
+
+  This function should be called when there is a need to postpone the decision to ignore or not the certificate error. This is useful to
+  wait for user input. When called it will pause the url request until WebEngineCertificateError::ignoreCertificateError() or
+  WebEngineCertificateError::rejectCertificate() is called.
+ */
+void QQuickWebEngineCertificateError::defer()
+{
+    Q_D(QQuickWebEngineCertificateError);
+    d->async = true;
+}
+/*!
+  \qmlmethod void WebEngineCertificateError::ignoreCertificateError()
+
+  The certificate error is ignored and the WebEngineView continues to load the requested url.
+ */
+void QQuickWebEngineCertificateError::ignoreCertificateError()
+{
+    Q_D(const QQuickWebEngineCertificateError);
+
+    QSharedPointer<CertificateErrorController> strongRefCert = d->weakRefCertErrorController.toStrongRef();
+    if (strongRefCert)
+        strongRefCert->accept(true);
+}
+
+/*!
+  \qmlmethod void WebEngineCertificateError::rejectCertificate()
+
+  The WebEngineView stops loading the requested url.
+ */
+void QQuickWebEngineCertificateError::rejectCertificate()
+{
+    Q_D(const QQuickWebEngineCertificateError);
+
+    QSharedPointer<CertificateErrorController> strongRefCert = d->weakRefCertErrorController.toStrongRef();
+    if (strongRefCert)
+        strongRefCert->accept(false);
+}
+
+/*!
+    \qmlproperty url WebEngineCertificateError::url
+    \brief The URL of the certificate error.
+ */
+QUrl QQuickWebEngineCertificateError::url() const
+{
+    Q_D(const QQuickWebEngineCertificateError);
+    QSharedPointer<CertificateErrorController> strongRefCert = d->weakRefCertErrorController.toStrongRef();
+    if (strongRefCert)
+        return strongRefCert->url();
+    return QUrl();
+}
+
+/*!
+    \qmlproperty enumeration WebEngineCertificateError::error
+*/
+QQuickWebEngineCertificateError::Error QQuickWebEngineCertificateError::error() const
+{
+    Q_D(const QQuickWebEngineCertificateError);
+    return d->error;
+}
+
+/*!
+    \qmlproperty string WebEngineCertificateError::description
+*/
+QString QQuickWebEngineCertificateError::description() const
+{
+    Q_D(const QQuickWebEngineCertificateError);
+    return d->description;
+}
+
+/*!
+    \qmlproperty bool WebEngineCertificateError::overridable
+*/
+bool QQuickWebEngineCertificateError::overridable() const
+{
+    Q_D(const QQuickWebEngineCertificateError);
+    return d->overridable;
+}
+
+bool QQuickWebEngineCertificateError::deferred() const
+{
+    Q_D(const QQuickWebEngineCertificateError);
+    return d->async;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/webengine/api/qquickwebenginecertificateerror_p.h b/src/webengine/api/qquickwebenginecertificateerror_p.h
new file mode 100644
index 000000000..735cc8705
--- /dev/null
+++ b/src/webengine/api/qquickwebenginecertificateerror_p.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKWEBENGINECERTIFICATEERROR_P_H
+#define QQUICKWEBENGINECERTIFICATEERROR_P_H
+
+#include <QObject>
+#include "qquickwebengineview_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QQuickWebEngineCertificateErrorPrivate;
+class CertificateErrorController;
+
+class Q_WEBENGINE_EXPORT QQuickWebEngineCertificateError : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QUrl url READ url)
+    Q_PROPERTY(Error error READ error)
+    Q_PROPERTY(QString description READ description)
+    Q_PROPERTY(bool overridable READ overridable)
+    Q_ENUMS(Error)
+
+public:
+
+    // Keep this identical to CertificateErrorController::CertificateError, or add mapping layer.
+    enum Error {
+        SslPinnedKeyNotInCertificateChain = -150,
+        CertificateCommonNameInvalid = -200,
+        CertificateDateInvalid = -201,
+        CertificateAuthorityInvalid = -202,
+        CertificateContainsErrors = -203,
+        CertificateNoRevocationMechanism = -204,
+        CertificateUnableToCheckRevocation = -205,
+        CertificateRevoked = -206,
+        CertificateInvalid = -207,
+        CertificateWeakSignatureAlgorithm = -208,
+        CertificateNonUniqueName = -210,
+        CertificateWeakKey = -211,
+        CertificateNameConstraintViolation = -212,
+    };
+
+    QQuickWebEngineCertificateError(const QSharedPointer<CertificateErrorController> &controller, QObject *parent = 0);
+    ~QQuickWebEngineCertificateError();
+
+    Q_INVOKABLE void defer();
+    Q_INVOKABLE void ignoreCertificateError();
+    Q_INVOKABLE void rejectCertificate();
+    QUrl url() const;
+    Error error() const;
+    QString description() const;
+    bool overridable() const;
+    bool deferred() const;
+
+private:
+    Q_DISABLE_COPY(QQuickWebEngineCertificateError)
+    Q_DECLARE_PRIVATE(QQuickWebEngineCertificateError)
+    QScopedPointer<QQuickWebEngineCertificateErrorPrivate> d_ptr;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QQuickWebEngineCertificateError)
+
+#endif // QQUICKWEBENGINECERTIFICATEERROR_P_H
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index dbafd9655..460caa4d7 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -41,6 +41,7 @@
 #include "certificate_error_controller.h"
 #include "javascript_dialog_controller.h"
 #include "qquickwebenginehistory_p.h"
+#include "qquickwebenginecertificateerror_p.h"
 #include "qquickwebengineloadrequest_p.h"
 #include "qquickwebenginenavigationrequest_p.h"
 #include "qquickwebenginenewviewrequest_p.h"
@@ -220,10 +221,16 @@ void QQuickWebEngineViewPrivate::javascriptDialog(QSharedPointer<JavaScriptDialo
     ui()->showDialog(dialog);
 }
 
-void QQuickWebEngineViewPrivate::allowCertificateError(const QExplicitlySharedDataPointer<CertificateErrorController> &errorController)
+void QQuickWebEngineViewPrivate::allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController)
 {
-    // ### Implement a way to export this to QML
-    Q_UNUSED(errorController);
+    Q_Q(QQuickWebEngineView);
+
+    m_certificateErrorController = errorController;
+    QQuickWebEngineCertificateError *quickController = new QQuickWebEngineCertificateError(errorController);
+    QQmlEngine::setObjectOwnership(quickController, QQmlEngine::JavaScriptOwnership);
+    Q_EMIT q->certificateError(quickController);
+    if (!quickController->deferred())
+        quickController->rejectCertificate();
 }
 
 void QQuickWebEngineViewPrivate::runGeolocationPermissionRequest(const QUrl &url)
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 72620b0f7..983cc90a6 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -42,6 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
+class QQuickWebEngineCertificateError;
 class QQuickWebEngineLoadRequest;
 class QQuickWebEngineNavigationRequest;
 class QQuickWebEngineNewViewRequest;
@@ -157,6 +158,7 @@ Q_SIGNALS:
     void navigationRequested(QQuickWebEngineNavigationRequest *request);
     void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID);
     void zoomFactorChanged(qreal arg);
+    void certificateError(QQuickWebEngineCertificateError *error);
     Q_REVISION(1) void newViewRequested(QQuickWebEngineNewViewRequest *request);
 
 protected:
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index cdd6b1955..1c1334ee6 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -176,7 +176,7 @@ public:
     virtual QObject *accessibilityParentObject() Q_DECL_OVERRIDE;
 #endif // QT_NO_ACCESSIBILITY
     virtual WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE;
-    virtual void allowCertificateError(const QExplicitlySharedDataPointer<CertificateErrorController> &errorController);
+    virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController);
     virtual void runGeolocationPermissionRequest(QUrl const&) Q_DECL_OVERRIDE;
 
     virtual BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE;
@@ -200,6 +200,7 @@ public:
     bool isLoading;
     qreal devicePixelRatio;
     QMap<quint64, QJSValue> m_callbacks;
+    QSharedPointer<CertificateErrorController> m_certificateErrorController;
 
 private:
     QScopedPointer<UIDelegatesManager> m_uIDelegatesManager;